diff --git a/.erb-lint.yml b/.erb-lint.yml index 7dc513d45ec3..e812b208f7bb 100644 --- a/.erb-lint.yml +++ b/.erb-lint.yml @@ -32,4 +32,4 @@ linters: Lint/UselessAssignment: Enabled: false Rails/OutputSafety: - Enabled: false + Enabled: true diff --git a/.erb-linters/erblint-github.rb b/.erb_linters/erblint-github.rb similarity index 100% rename from .erb-linters/erblint-github.rb rename to .erb_linters/erblint-github.rb diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index eab13d3a371e..be8948af8a72 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -17,7 +17,7 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.4' + ruby-version: '3.4.1' - uses: MeilCli/danger-action@v6 with: danger_file: 'Dangerfile' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index d730336dadf5..8332dcfd6d83 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -53,9 +53,13 @@ jobs: VERSION=${TAG_REF#v} echo "Version: $VERSION" + echo "Checkout REF: $CHECKOUT_REF" echo "version=$VERSION" >> "$GITHUB_OUTPUT" echo "checkout_ref=$CHECKOUT_REF" >> "$GITHUB_OUTPUT" - - uses: actions/checkout@v4 + - name: Checkout + uses: actions/checkout@v4 + with: + ref: ${{ steps.extract_version.outputs.checkout_ref }} - name: Cache NPM uses: runs-on/cache@v4 with: @@ -136,9 +140,9 @@ jobs: runner: runner=4cpu-linux-x64 steps: - name: Checkout + uses: actions/checkout@v4 with: ref: ${{ needs.setup.outputs.checkout_ref }} - uses: actions/checkout@v4 - name: Prepare docker files run: | cp ./docker/prod/Dockerfile ./Dockerfile diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 85171d8123a8..ae765ec999bd 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -7,6 +7,7 @@ on: - release/* paths: - 'docs/**' + - 'config/static_links.yml' permissions: contents: read diff --git a/.github/workflows/eslint-core.yml b/.github/workflows/eslint-core.yml index 9c24db416359..9d02166efc80 100644 --- a/.github/workflows/eslint-core.yml +++ b/.github/workflows/eslint-core.yml @@ -19,7 +19,7 @@ jobs: fetch-depth: 0 - uses: actions/setup-node@v4 with: - node-version: '18.13' + node-version: '20.9' cache: npm cache-dependency-path: frontend/package-lock.json - uses: reviewdog/action-eslint@v1 diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml index 23364897f05f..aba0a76f525f 100644 --- a/.github/workflows/pullpreview.yml +++ b/.github/workflows/pullpreview.yml @@ -33,7 +33,6 @@ jobs: echo "OPENPROJECT_FEATURE__SHOW__CHANGES__ACTIVE=true" >> .env.pullpreview echo "OPENPROJECT_LOOKBOOK__ENABLED=true" >> .env.pullpreview echo "OPENPROJECT_HSTS=false" >> .env.pullpreview - echo "OPENPROJECT_FEATURE_PRIMERIZED_WORK_PACKAGE_ACTIVITIES_ACTIVE=true" >> .env.pullpreview echo "OPENPROJECT_NOTIFICATIONS_POLLING_INTERVAL=10000" >> .env.pullpreview - name: Boot as BIM edition if: contains(github.ref, 'bim/') || contains(github.head_ref, 'bim/') diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml index 32a1b04da2cd..dc827243e436 100644 --- a/.github/workflows/rubocop-core.yml +++ b/.github/workflows/rubocop-core.yml @@ -10,9 +10,12 @@ jobs: name: rubocop runs-on: ubuntu-latest steps: - - uses: actions/checkout@v4 - - uses: ruby/setup-ruby@v1 - - uses: reviewdog/action-rubocop@v2 + - name: Checkout code + uses: actions/checkout@v4 + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + - name: Run Rubocop + uses: reviewdog/action-rubocop@v2 with: github_token: ${{ secrets.github_token }} rubocop_version: gemfile @@ -26,3 +29,11 @@ jobs: rubocop-rspec_rails:gemfile reporter: github-pr-check only_changed: true + - name: Install erb_lint + run: gem install -N erb_lint erblint-github + - name: Run erb-lint + uses: tk0miya/action-erblint@v1 + with: + github_token: ${{ secrets.github_token }} + reporter: github-pr-check + fail_on_error: true diff --git a/.github/workflows/test-frontend-unit.yml b/.github/workflows/test-frontend-unit.yml new file mode 100644 index 000000000000..a8002d46aa31 --- /dev/null +++ b/.github/workflows/test-frontend-unit.yml @@ -0,0 +1,54 @@ +name: "Frontend test suite" + +on: + workflow_dispatch: + push: + branches: + - dev + - release/* + paths: + - '**/frontend/**/*.ts' + - '**/frontend/**/*.js' + - '**/frontend/**/*.json' + + pull_request: + types: [opened, reopened, synchronize] + paths: + - '**/frontend/**/*.ts' + - '**/frontend/**/*.js' + - '**/frontend/**/*.json' + +permissions: + contents: read + +defaults: + run: + working-directory: ./frontend + +jobs: + units: + name: Units + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v4 + with: + fetch-depth: 0 + + - uses: actions/setup-node@v4 + with: + node-version: '20.9' + cache: npm + cache-dependency-path: frontend/package-lock.json + + - name: Install Dependencies + id: npm-i + run: npm i + + - name: Register plugins + id: npm-run-ci-plugins-register-frontend + run: npm run ci:plugins:register_frontend + + - name: Test (Angular) + id: npm-test + run: npm test -- --code-coverage diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml index a29d660332e0..65cf0186a54a 100644 --- a/.github/workflows/version-check.yml +++ b/.github/workflows/version-check.yml @@ -2,7 +2,7 @@ name: Check work package version on: pull_request: - types: [labeled, synchronize] + types: [labeled, synchronize, ready_for_review] permissions: contents: read # to fetch code (actions/checkout) @@ -10,7 +10,7 @@ permissions: jobs: version-check: - if: contains(github.event.pull_request.labels.*.name, 'needs review') + if: github.event.pull_request.draft == false runs-on: ubuntu-latest steps: diff --git a/.pkgr.yml b/.pkgr.yml index 62354658845f..9c2820aaed0d 100644 --- a/.pkgr.yml +++ b/.pkgr.yml @@ -21,7 +21,7 @@ targets: <<: *debian ubuntu-22.04: <<: *debian - centos-8: ¢os8 + centos-9: env: - NODE_ENV=production - NPM_CONFIG_PRODUCTION=false @@ -30,11 +30,6 @@ targets: - ImageMagick - unzip - poppler-utils - centos-9: - <<: *centos8 - env: - - NODE_ENV=production - - NPM_CONFIG_PRODUCTION=false sles-15: build_dependencies: - sqlite3-devel diff --git a/.rubocop.yml b/.rubocop.yml index d45f3c613d7b..367f25ae1742 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -19,12 +19,18 @@ inherit_mode: - Exclude AllCops: - TargetRubyVersion: 3.3 + TargetRubyVersion: 3.4 # Enable any new cops in new versions by default NewCops: enable Exclude: - '**/node_modules/**/*' +# Disable it as it is deprecated +# From https://docs.rubocop.org/rubocop-capybara/cops_capybara.html#capybaraclicklinkorbuttonstyle +# "This cop is deprecated. We plan to remove this in the next major version update to 3.0." +Capybara/ClickLinkOrButtonStyle: + Enabled: false + FactoryBot/ConsistentParenthesesStyle: Enabled: false @@ -326,9 +332,6 @@ Style/ColonMethodCall: Style/CommentAnnotation: Enabled: false -Style/PreferredHashMethods: - Enabled: false - Style/Documentation: Enabled: false @@ -341,6 +344,9 @@ Style/EachWithObject: Style/EmptyLiteral: Enabled: false +Style/EndlessMethod: + Enabled: true + Style/EvenOdd: Enabled: false @@ -401,6 +407,9 @@ Style/PercentLiteralDelimiters: Style/PerlBackrefs: Enabled: false +Style/PreferredHashMethods: + Enabled: false + Style/Proc: Enabled: false @@ -453,7 +462,8 @@ Style/WordArray: Enabled: false Style/FrozenStringLiteralComment: - Enabled: false + Enabled: true + EnforcedStyle: always_true Style/NumericLiterals: Enabled: false diff --git a/.ruby-version b/.ruby-version index a0891f563f38..47b322c971c3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.4 +3.4.1 diff --git a/Gemfile b/Gemfile index b604d3d3c9f8..73259809213f 100644 --- a/Gemfile +++ b/Gemfile @@ -74,7 +74,7 @@ gem "addressable", "~> 2.8.0" gem "auto_strip_attributes", "~> 2.5" # Provide timezone info for TZInfo used by AR -gem "tzinfo-data", "~> 1.2024.1" +gem "tzinfo-data", "~> 1.2025.1" # to generate html-diffs (e.g. for wiki comparison) gem "htmldiff" @@ -83,7 +83,7 @@ gem "htmldiff" gem "stringex", "~> 2.8.5" # CommonMark markdown parser with GFM extension -gem "commonmarker", "~> 1.1.3" +gem "commonmarker", "~> 2.0.2" # HTML pipeline for transformations on text formatter output # such as sanitization or additional features @@ -95,7 +95,7 @@ gem "escape_utils", "~> 1.3" # Syntax highlighting used in html-pipeline with rouge gem "rouge", "~> 4.5.1" # HTML sanitization used for html-pipeline -gem "sanitize", "~> 6.1.0" +gem "sanitize", "~> 7.0.0" # HTML autolinking for mails and urls (replaces autolink) gem "rinku", "~> 2.0.4", require: %w[rinku rails_rinku] # Version parsing with semver @@ -126,7 +126,7 @@ gem "multi_json", "~> 1.15.0" gem "oj", "~> 3.16.0" gem "daemons" -gem "good_job", "= 3.26.2" # update should be done manually in sync with saas-openproject version. +gem "good_job", "= 3.99.1" # update should be done manually in sync with saas-openproject version. gem "rack-protection", "~> 3.2.0" @@ -137,7 +137,7 @@ gem "rack-protection", "~> 3.2.0" gem "rack-attack", "~> 6.7.0" # CSP headers -gem "secure_headers", "~> 7.0.0" +gem "secure_headers", "~> 7.1.0" # Browser detection for incompatibility checks gem "browser", "~> 6.2.0" @@ -158,7 +158,7 @@ gem "structured_warnings", "~> 0.4.0" gem "airbrake", "~> 13.0.0", require: false gem "markly", "~> 0.10" # another markdown parser like commonmarker, but with AST support used in PDF export -gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388" +gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "965034bdd4b119c7233ea4ecd62d3964d3dec11d" gem "prawn", "~> 2.4" gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved. @@ -191,7 +191,7 @@ gem "puma", "~> 6.5" gem "puma-plugin-statsd", "~> 2.0" gem "rack-timeout", "~> 0.7.0", require: "rack/timeout/base" -gem "nokogiri", "~> 1.17.0" +gem "nokogiri", "~> 1.18.1" gem "carrierwave", "~> 1.3.4" gem "carrierwave_direct", "~> 2.1.0" @@ -218,7 +218,7 @@ gem "dry-monads" gem "dry-validation" # ActiveRecord extension which adds typecasting to store accessors -gem "store_attribute", "~> 1.0" +gem "store_attribute", "~> 2.0" # Appsignal integration gem "appsignal", "~> 3.10.0", require: false @@ -237,9 +237,12 @@ gem "turbo-rails", "~> 2.0.0" gem "httpx" +# Brings actual deep freezing to most ruby objects +gem "ice_nine" + group :test do - gem "launchy", "~> 3.0.0" - gem "rack-test", "~> 2.1.0" + gem "launchy", "~> 3.1.0" + gem "rack-test", "~> 2.2.0" gem "shoulda-context", "~> 2.0" # Test prof provides factories from code @@ -275,6 +278,7 @@ group :test do gem "capybara_accessible_selectors", git: "https://github.com/citizensadvice/capybara_accessible_selectors", tag: "v0.12.0" gem "capybara-screenshot", "~> 1.0.17" gem "cuprite", "~> 0.15.0" + gem "ferrum", github: "toy/ferrum", ref: "mouse-events-buttons-property-0.15" gem "rspec-wait" gem "selenium-devtools" gem "selenium-webdriver", "~> 4.20" @@ -330,11 +334,11 @@ group :development, :test do # Output a stack trace anytime, useful when a process is stuck gem "rbtrace" - # REPL with debug commands - gem "debug" + # REPL with debug commands, Debug changed to byebug due to the issue below + # https://github.com/puma/puma/issues/2835#issuecomment-2302133927 + gem "byebug" gem "pry-byebug", "~> 3.10.0", platforms: [:mri] - gem "pry-doc" gem "pry-rails", "~> 0.3.6" gem "pry-rescue", "~> 1.6.0" @@ -353,7 +357,7 @@ group :development, :test do gem "erblint-github", require: false # Brakeman scanner - gem "brakeman", "~> 6.2.0" + gem "brakeman", "~> 7.0.0" # i18n-tasks helps find and manage missing and unused translations. gem "i18n-tasks", "~> 1.0.13", require: false @@ -403,4 +407,4 @@ end gem "openproject-octicons", "~>19.20.0 " gem "openproject-octicons_helper", "~>19.20.0 " -gem "openproject-primer_view_components", "~>0.52.0" +gem "openproject-primer_view_components", "~>0.54.0" diff --git a/Gemfile.lock b/Gemfile.lock index 2ff8ccffa25d..f9c47bccf644 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,16 +8,16 @@ GIT GIT remote: https://github.com/opf/md-to-pdf - revision: fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388 - ref: fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388 + revision: 965034bdd4b119c7233ea4ecd62d3964d3dec11d + ref: 965034bdd4b119c7233ea4ecd62d3964d3dec11d specs: - md_to_pdf (0.1.2) + md_to_pdf (0.1.5) color_conversion (~> 0.1) front_matter_parser (~> 1.0) json-schema (~> 4.3) markly (~> 0.10) matrix (~> 0.4) - nokogiri (~> 1.16) + nokogiri (~> 1.18) prawn (~> 2.4) prawn-table (~> 0.2) text-hyphen (~> 1.5) @@ -33,10 +33,10 @@ GIT GIT remote: https://github.com/opf/omniauth-openid-connect.git - revision: d63f5967514d10db9ddece798dadfa2ac532cbe0 - ref: d63f5967514d10db9ddece798dadfa2ac532cbe0 + revision: 3d5fec65072fb4566fb975a9cbe401d758d22317 + ref: 3d5fec65072fb4566fb975a9cbe401d758d22317 specs: - omniauth-openid-connect (0.4.0) + omniauth-openid-connect (0.4.1) addressable (~> 2.5) omniauth (~> 1.6) openid_connect (~> 2.2.0) @@ -58,6 +58,17 @@ GIT parallel_tests (>= 3.3.0, < 5) rspec (>= 3.10) +GIT + remote: https://github.com/toy/ferrum.git + revision: 889b29926f017530a0e087b1db0bc02747e437b1 + ref: mouse-events-buttons-property-0.15 + specs: + ferrum (0.15) + addressable (~> 2.5) + concurrent-ruby (~> 1.1) + webrick (~> 1.7) + websocket-driver (~> 0.7) + PATH remote: modules/auth_plugins specs: @@ -206,7 +217,7 @@ PATH remote: modules/two_factor_authentication specs: openproject-two_factor_authentication (1.0.0) - aws-sdk-sns (~> 1.92.0) + aws-sdk-sns (~> 1.94.0) messagebird-rest (~> 1.4.2) rotp (~> 6.1) webauthn (~> 3.0) @@ -344,23 +355,23 @@ GEM awesome_nested_set (3.8.0) activerecord (>= 4.0.0, < 8.1) aws-eventstream (1.3.0) - aws-partitions (1.1023.0) - aws-sdk-core (3.214.0) + aws-partitions (1.1044.0) + aws-sdk-core (3.217.1) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.96.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-kms (1.97.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.176.1) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-s3 (1.179.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sns (1.92.0) - aws-sdk-core (~> 3, >= 3.210.0) + aws-sdk-sns (1.94.0) + aws-sdk-core (~> 3, >= 3.216.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.10.1) + aws-sigv4 (1.11.0) aws-eventstream (~> 1, >= 1.0.2) axe-core-api (4.10.2) dumb_delegator @@ -385,11 +396,11 @@ GEM erubi (~> 1.4) parser (>= 2.4) smart_properties - bigdecimal (3.1.8) + bigdecimal (3.1.9) bindata (2.5.0) bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (6.2.2) + brakeman (7.0.0) racc browser (6.2.0) builder (3.3.0) @@ -426,13 +437,13 @@ GEM coercible (1.0.0) descendants_tracker (~> 0.0.1) color_conversion (0.1.2) - colored2 (4.0.0) - commonmarker (1.1.5) + colored2 (4.0.3) + commonmarker (2.0.4) rb_sys (~> 0.9) compare-xml (0.66) nokogiri (~> 1.8) - concurrent-ruby (1.3.4) - connection_pool (2.4.1) + concurrent-ruby (1.3.5) + connection_pool (2.5.0) cookiejar (0.3.4) cose (1.3.1) cbor (~> 0.5.9) @@ -443,7 +454,7 @@ GEM crass (1.0.6) css_parser (1.21.0) addressable - csv (3.3.1) + csv (3.3.2) cuprite (0.15.1) capybara (~> 3.0) ferrum (~> 0.15.0) @@ -453,9 +464,6 @@ GEM date_validator (0.12.0) activemodel (>= 3) activesupport (>= 3) - debug (1.9.2) - irb (~> 1.10) - reline (>= 0.3.8) deckar01-task_list (2.3.4) html-pipeline (~> 2.0) declarative (0.0.20) @@ -472,50 +480,51 @@ GEM dotenv (= 3.1.7) railties (>= 6.1) drb (2.2.1) - dry-auto_inject (1.0.1) - dry-core (~> 1.0) + dry-auto_inject (1.1.0) + dry-core (~> 1.1) zeitwerk (~> 2.6) - dry-configurable (1.2.0) - dry-core (~> 1.0, < 2) + dry-configurable (1.3.0) + dry-core (~> 1.1) zeitwerk (~> 2.6) dry-container (0.11.0) concurrent-ruby (~> 1.0) - dry-core (1.0.2) + dry-core (1.1.0) concurrent-ruby (~> 1.0) logger zeitwerk (~> 2.6) - dry-inflector (1.1.0) - dry-initializer (3.1.1) - dry-logic (1.5.0) + dry-inflector (1.2.0) + dry-initializer (3.2.0) + dry-logic (1.6.0) + bigdecimal concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) + dry-core (~> 1.1) zeitwerk (~> 2.6) - dry-monads (1.6.0) + dry-monads (1.7.1) concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) + dry-core (~> 1.1) zeitwerk (~> 2.6) - dry-schema (1.13.4) + dry-schema (1.14.0) concurrent-ruby (~> 1.0) dry-configurable (~> 1.0, >= 1.0.1) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-logic (>= 1.4, < 2) - dry-types (>= 1.7, < 2) + dry-core (~> 1.1) + dry-initializer (~> 3.2) + dry-logic (~> 1.5) + dry-types (~> 1.8) zeitwerk (~> 2.6) - dry-types (1.7.2) + dry-types (1.8.1) bigdecimal (~> 3.0) concurrent-ruby (~> 1.0) dry-core (~> 1.0) dry-inflector (~> 1.0) dry-logic (~> 1.4) zeitwerk (~> 2.6) - dry-validation (1.10.0) + dry-validation (1.11.1) concurrent-ruby (~> 1.0) - dry-core (~> 1.0, < 2) - dry-initializer (~> 3.0) - dry-schema (>= 1.12, < 2) + dry-core (~> 1.1) + dry-initializer (~> 3.2) + dry-schema (~> 1.14) zeitwerk (~> 2.6) - dumb_delegator (1.0.0) + dumb_delegator (1.1.0) em-http-request (1.1.7) addressable (>= 2.3.4) cookiejar (!= 0.3.1) @@ -531,7 +540,7 @@ GEM activemodel equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erb_lint (0.7.0) + erb_lint (0.9.0) activesupport better_html (>= 2.0.1) parser (>= 2.7.1.4) @@ -539,15 +548,15 @@ GEM rubocop (>= 1) smart_properties erblint-github (1.0.1) - erubi (1.13.0) + erubi (1.13.1) escape_utils (1.3.0) et-orbi (1.2.11) tzinfo eventmachine (1.2.7) eventmachine_httpserver (0.2.1) - excon (1.2.2) - factory_bot (6.5.0) - activesupport (>= 5.0.0) + excon (1.2.3) + factory_bot (6.5.1) + activesupport (>= 6.1.0) factory_bot_rails (6.4.4) factory_bot (~> 6.5) railties (>= 5.0.0) @@ -560,12 +569,7 @@ GEM faraday-net_http (3.4.0) net-http (>= 0.5.0) fastimage (2.3.1) - ferrum (0.15) - addressable (~> 2.5) - concurrent-ruby (~> 1.1) - webrick (~> 1.7) - websocket-driver (~> 0.7) - ffi (1.17.0) + ffi (1.17.1) flamegraph (0.9.5) fog-aws (3.30.0) base64 (~> 0.2.0) @@ -580,7 +584,7 @@ GEM fog-json (1.2.0) fog-core multi_json (~> 1.10) - fog-xml (0.1.4) + fog-xml (0.1.5) fog-core nokogiri (>= 1.5.11, < 2.0.0) formatador (1.1.0) @@ -601,14 +605,14 @@ GEM i18n (>= 0.7) multi_json request_store (>= 1.0) - good_job (3.26.2) + good_job (3.99.1) activejob (>= 6.0.0) activerecord (>= 6.0.0) concurrent-ruby (>= 1.0.2) fugit (>= 1.1) railties (>= 6.0.0) thor (>= 0.14.1) - google-apis-core (0.15.1) + google-apis-core (0.16.0) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) httpclient (>= 2.8.3, < 3.a) @@ -621,7 +625,7 @@ GEM google-cloud-env (2.2.1) faraday (>= 1.0, < 3.a) google-logging-utils (0.1.0) - googleauth (1.12.1) + googleauth (1.13.1) faraday (>= 1.0, < 3.a) google-cloud-env (~> 2.2) google-logging-utils (~> 0.1) @@ -643,7 +647,7 @@ GEM hashdiff (1.1.2) hashery (2.1.2) hashie (3.6.0) - highline (3.1.1) + highline (3.1.2) reline html-pipeline (2.14.3) activesupport (>= 2) @@ -656,7 +660,7 @@ GEM httpclient (2.8.3) httpx (1.4.0) http-2 (>= 1.0.0) - i18n (1.14.6) + i18n (1.14.7) concurrent-ruby (~> 1.0) i18n-js (4.2.3) glob (>= 0.4.0) @@ -678,7 +682,8 @@ GEM ice_nine (0.11.2) interception (0.5) io-console (0.8.0) - irb (1.14.2) + irb (1.15.1) + pp (>= 0.6.0) rdoc (>= 4.0.0) reline (>= 0.4.2) iso8601 (0.13.0) @@ -701,15 +706,16 @@ GEM json_spec (1.1.5) multi_json (~> 1.0) rspec (>= 2.0, < 4.0) - jwt (2.9.3) + jwt (2.10.1) base64 ladle (1.0.1) open4 (~> 1.0) - language_server-protocol (3.17.0.3) - launchy (3.0.1) + language_server-protocol (3.17.0.4) + launchy (3.1.0) addressable (~> 2.8) childprocess (~> 5.0) - lefthook (1.10.0) + logger (~> 1.6) + lefthook (1.10.10) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -724,13 +730,13 @@ GEM omniauth (~> 1.1) omniauth-openid-connect (>= 0.2.1) rails (>= 3.2.21) - logger (1.6.4) + logger (1.6.5) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) railties (>= 4) request_store (~> 1.0) - loofah (2.23.1) + loofah (2.24.0) crass (~> 1.0.2) nokogiri (>= 1.12.0) lookbook (2.3.4) @@ -760,7 +766,7 @@ GEM mime-types (3.6.0) logger mime-types-data (~> 3.2015) - mime-types-data (3.2024.1203) + mime-types-data (3.2025.0107) mini_magick (5.0.1) mini_mime (1.1.5) mini_portile2 (2.8.8) @@ -774,7 +780,7 @@ GEM mutex_m (0.3.0) net-http (0.6.0) uri - net-imap (0.5.1) + net-imap (0.5.5) date net-protocol net-ldap (0.19.0) @@ -785,13 +791,13 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.4) - nokogiri (1.17.2) + nokogiri (1.18.2) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.16.8) + oj (3.16.9) bigdecimal (>= 3.0) ostruct (>= 0.2) - okcomputer (1.18.5) + okcomputer (1.18.6) omniauth-saml (1.10.5) omniauth (~> 1.3, >= 1.3.2) ruby-saml (~> 1.17) @@ -814,27 +820,28 @@ GEM actionview openproject-octicons (= 19.20.0) railties - openproject-primer_view_components (0.52.0) + openproject-primer_view_components (0.54.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) openproject-octicons (>= 19.20.0) view_component (>= 3.1, < 4.0) openproject-token (4.0.0) activemodel - openssl (3.2.0) + openssl (3.3.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) optimist (3.2.0) os (1.1.4) ostruct (0.6.1) - ox (2.14.18) + ox (2.14.21) + bigdecimal (>= 3.0) paper_trail (15.2.0) activerecord (>= 6.1) request_store (~> 1.4) parallel (1.26.3) - parallel_tests (4.7.2) + parallel_tests (4.9.0) parallel - parser (3.3.6.0) + parser (3.3.7.0) ast (~> 2.4.1) racc pdf-core (0.9.0) @@ -851,26 +858,26 @@ GEM activesupport (> 2.2.1) nokogiri (~> 1.10, >= 1.10.4) rubyzip (>= 1.2.0) + pp (0.6.2) + prettyprint prawn (2.4.0) pdf-core (~> 0.9.0) ttfunk (~> 1.7) prawn-table (0.2.2) prawn (>= 1.3.0, < 3.0.0) + prettyprint (0.2.0) pry (0.14.2) coderay (~> 1.1) method_source (~> 1.0) pry-byebug (3.10.1) byebug (~> 11.0) pry (>= 0.13, < 0.15) - pry-doc (1.5.0) - pry (~> 0.11) - yard (~> 0.9.11) pry-rails (0.3.11) pry (>= 0.13.0) pry-rescue (1.6.0) interception (>= 0.5) pry (>= 0.12.0) - psych (5.2.2) + psych (5.2.3) date stringio public_suffix (6.0.1) @@ -882,7 +889,7 @@ GEM eventmachine_httpserver http_parser.rb (~> 0.6.0) multi_json - puma (6.5.0) + puma (6.6.0) nio4r (~> 2.0) puma-plugin-statsd (2.6.0) puma (>= 5.0, < 7) @@ -907,7 +914,7 @@ GEM rack (~> 2.2, >= 2.2.4) rack-session (1.0.2) rack (< 3) - rack-test (2.1.0) + rack-test (2.2.0) rack (>= 1.3) rack-timeout (0.7.0) rack_session_access (0.2.0) @@ -957,21 +964,21 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rb_sys (0.9.103) + rb_sys (0.9.108) rbtrace (0.5.1) ffi (>= 1.0.6) msgpack (>= 0.4.3) optimist (>= 3.0.0) rbtree3 (0.7.1) - rdoc (6.9.1) + rdoc (6.11.0) psych (>= 4.0.0) - recaptcha (5.18.0) + recaptcha (5.19.0) redcarpet (3.6.0) redis (5.3.0) redis-client (>= 0.22.0) - redis-client (0.23.0) + redis-client (0.23.2) connection_pool - regexp_parser (2.9.3) + regexp_parser (2.10.0) reline (0.6.0) io-console (~> 0.5) representable (3.2.0) @@ -1015,17 +1022,17 @@ GEM rspec-support (3.13.2) rspec-wait (1.0.1) rspec (>= 3.4) - rubocop (1.69.2) + rubocop (1.71.2) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.36.2, < 2.0) + rubocop-ast (>= 1.38.0, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) - rubocop-ast (1.37.0) + rubocop-ast (1.38.0) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) @@ -1033,15 +1040,15 @@ GEM rubocop (~> 1.61) rubocop-openproject (0.2.0) rubocop - rubocop-performance (1.23.0) + rubocop-performance (1.23.1) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.27.0) + rubocop-rails (2.29.1) activesupport (>= 4.2.0) rack (>= 1.1) rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.3.0) + rubocop-rspec (3.4.0) rubocop (~> 1.61) rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) @@ -1063,14 +1070,14 @@ GEM rubyzip (2.3.2) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (6.1.3) + sanitize (7.0.0) crass (~> 1.0.2) - nokogiri (>= 1.12.0) - secure_headers (7.0.0) + nokogiri (>= 1.16.8) + secure_headers (7.1.0) securerandom (0.4.1) - selenium-devtools (0.131.0) + selenium-devtools (0.132.0) selenium-webdriver (~> 4.2) - selenium-webdriver (4.27.0) + selenium-webdriver (4.28.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -1104,8 +1111,8 @@ GEM activesupport (>= 6.1) sprockets (>= 3.0.0) ssrf_filter (1.0.8) - stackprof (0.2.26) - store_attribute (1.3.1) + stackprof (0.2.27) + store_attribute (2.0.0) activerecord (>= 6.1) stringex (2.8.6) stringio (3.1.2) @@ -1121,7 +1128,7 @@ GEM table_print (1.5.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - test-prof (1.4.3) + test-prof (1.4.4) text-hyphen (1.5.0) thor (1.3.2) thread_safe (0.3.6) @@ -1142,7 +1149,7 @@ GEM rails (>= 5.0.4) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.2) + tzinfo-data (1.2025.1) tzinfo (>= 1.0.0) uber (0.1.0) unicode-display_width (2.6.0) @@ -1156,7 +1163,7 @@ GEM vcr (6.3.1) base64 vernier (1.5.0) - view_component (3.20.0) + view_component (3.21.0) activesupport (>= 5.2.0, < 8.1) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1180,13 +1187,14 @@ GEM activesupport faraday (~> 2.0) faraday-follow_redirects - webmock (3.24.0) + webmock (3.25.0) addressable (>= 2.8.0) crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.9.1) websocket (1.2.11) - websocket-driver (0.7.6) + websocket-driver (0.7.7) + base64 websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) will_paginate (4.0.1) @@ -1219,9 +1227,10 @@ DEPENDENCIES axe-core-rspec bcrypt (~> 3.1.6) bootsnap (~> 1.18.0) - brakeman (~> 6.2.0) + brakeman (~> 7.0.0) browser (~> 6.2.0) budgets! + byebug capybara (~> 3.40.0) capybara-screenshot (~> 1.0.17) capybara_accessible_selectors! @@ -1230,7 +1239,7 @@ DEPENDENCIES climate_control closure_tree (~> 7.4.0) colored2 - commonmarker (~> 1.1.3) + commonmarker (~> 2.0.2) compare-xml (~> 0.66) costs! csv (~> 3.3) @@ -1239,7 +1248,6 @@ DEPENDENCIES dalli (~> 3.2.0) dashboards! date_validator (~> 0.12.0) - debug deckar01-task_list (~> 2.3.1) disposable (~> 0.6.2) doorkeeper (~> 5.8.0) @@ -1255,13 +1263,14 @@ DEPENDENCIES escape_utils (~> 1.3) factory_bot (~> 6.5.0) factory_bot_rails (~> 6.4.4) + ferrum! ffi (~> 1.15) flamegraph fog-aws friendly_id (~> 5.5.0) fuubar (~> 2.5.0) gon (~> 6.4.0) - good_job (= 3.26.2) + good_job (= 3.99.1) google-apis-gmail_v1 googleauth grape (~> 2.2.0) @@ -1273,10 +1282,11 @@ DEPENDENCIES i18n-js (~> 4.2.3) i18n-tasks (~> 1.0.13) ice_cube (~> 0.17.0) + ice_nine json_schemer (~> 2.3.0) json_spec (~> 1.1.4) ladle - launchy (~> 3.0.0) + launchy (~> 3.1.0) lefthook letter_opener_web listen (~> 3.9.0) @@ -1291,7 +1301,7 @@ DEPENDENCIES multi_json (~> 1.15.0) my_page! net-ldap (~> 0.19.0) - nokogiri (~> 1.17.0) + nokogiri (~> 1.18.1) oj (~> 3.16.0) okcomputer (~> 1.18.1) omniauth! @@ -1316,7 +1326,7 @@ DEPENDENCIES openproject-octicons (~> 19.20.0) openproject-octicons_helper (~> 19.20.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.52.0) + openproject-primer_view_components (~> 0.54.0) openproject-recaptcha! openproject-reporting! openproject-storages! @@ -1334,7 +1344,6 @@ DEPENDENCIES plaintext (~> 0.3.2) prawn (~> 2.4) pry-byebug (~> 3.10.0) - pry-doc pry-rails (~> 0.3.6) pry-rescue (~> 1.6.0) puffing-billy (~> 4.0.0) @@ -1344,7 +1353,7 @@ DEPENDENCIES rack-cors (~> 2.0.2) rack-mini-profiler rack-protection (~> 3.2.0) - rack-test (~> 2.1.0) + rack-test (~> 2.2.0) rack-timeout (~> 0.7.0) rack_session_access rails (~> 7.1.3) @@ -1375,8 +1384,8 @@ DEPENDENCIES ruby-prof ruby-progressbar (~> 1.13.0) rubytree (~> 2.1.0) - sanitize (~> 6.1.0) - secure_headers (~> 7.0.0) + sanitize (~> 7.0.0) + secure_headers (~> 7.1.0) selenium-devtools selenium-webdriver (~> 4.20) semantic (~> 1.6.1) @@ -1388,7 +1397,7 @@ DEPENDENCIES sprockets (~> 3.7.2) sprockets-rails (~> 3.5.1) stackprof - store_attribute (~> 1.0) + store_attribute (~> 2.0) stringex (~> 2.8.5) structured_warnings (~> 0.4.0) svg-graph (~> 2.2.0) @@ -1401,7 +1410,7 @@ DEPENDENCIES turbo_power (~> 0.7.0) turbo_tests! typed_dag (~> 2.0.2) - tzinfo-data (~> 1.2024.1) + tzinfo-data (~> 1.2025.1) validate_url vcr vernier @@ -1413,7 +1422,7 @@ DEPENDENCIES with_advisory_lock (~> 5.1.0) RUBY VERSION - ruby 3.3.4p94 + ruby 3.4.1p0 BUNDLED WITH - 2.5.13 + 2.6.3 diff --git a/Gemfile.modules b/Gemfile.modules index 1689af163585..dbea2ec4b178 100644 --- a/Gemfile.modules +++ b/Gemfile.modules @@ -14,7 +14,7 @@ gem 'omniauth-openid_connect-providers', gem 'omniauth-openid-connect', git: 'https://github.com/opf/omniauth-openid-connect.git', - ref: 'd63f5967514d10db9ddece798dadfa2ac532cbe0' + ref: '3d5fec65072fb4566fb975a9cbe401d758d22317' group :opf_plugins do # included so that engines can reference OpenProject::Version diff --git a/app/components/_index.sass b/app/components/_index.sass index 59f6c3cdfa43..42597cf0ed83 100644 --- a/app/components/_index.sass +++ b/app/components/_index.sass @@ -2,6 +2,7 @@ @import "work_packages/activities_tab/journals/new_component" @import "work_packages/activities_tab/journals/index_component" @import "work_packages/activities_tab/journals/item_component" +@import "work_packages/activities_tab/journals/revision_component" @import "work_packages/activities_tab/journals/item_component/details" @import "work_packages/activities_tab/journals/item_component/add_reactions" @import "work_packages/activities_tab/journals/item_component/reactions" @@ -19,5 +20,7 @@ @import "op_primer/border_box_table_component" @import "work_packages/exports/modal_dialog_component" @import "work_package_relations_tab/index_component" +@import "work_package_relations_tab/relation_component" @import "users/hover_card_component" @import "enterprise_edition/banner_component" +@import "work_packages/types/pattern_input" diff --git a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb index 6c2d6b0e2b29..f9735c0fe9ec 100644 --- a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb +++ b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.html.erb @@ -28,27 +28,16 @@ See COPYRIGHT and LICENSE files for more details. ++#%> <%= - render(Primer::Alpha::Dialog.new(id: DIALOG_ID, title: "Delete item", test_selector: TEST_SELECTOR)) do |dialog| - dialog.with_header(variant: :large) - dialog.with_body do - "Are you sure you want to delete this item from the current hierarchy level?" - end - - dialog.with_footer do - concat(render(Primer::ButtonComponent.new(data: { "close-dialog-id": DIALOG_ID })) do - I18n.t(:button_cancel) - end) - - concat(primer_form_with( - model: @custom_field, - url: custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id), - method: :delete, - data: { turbo: true } - ) do - render(Primer::ButtonComponent.new(scheme: :danger, type: :submit, data: { "close-dialog-id": DIALOG_ID })) do - I18n.t(:button_delete) - end - end) + render(Primer::OpenProject::DangerDialog.new( + title: I18n.t("custom_fields.admin.items.delete_dialog.title"), + form_arguments:, + size: :large, + test_selector: TEST_SELECTOR + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { I18n.t("custom_fields.admin.items.delete_dialog.heading") } + message.with_description_content(I18n.t("custom_fields.admin.items.delete_dialog.description")) end + dialog.with_confirmation_check_box_content(I18n.t(:text_permanent_delete_confirmation_checkbox_label)) end %> diff --git a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb index 851116a4ee48..ce3a9ac0b739 100644 --- a/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb +++ b/app/components/admin/custom_fields/hierarchy/delete_item_dialog_component.rb @@ -34,7 +34,6 @@ module Hierarchy class DeleteItemDialogComponent < ApplicationComponent include OpTurbo::Streamable - DIALOG_ID = "op-hierarchy-item--deletion-confirmation" TEST_SELECTOR = "op-custom-fields--delete-item-dialog" def initialize(custom_field:, hierarchy_item:) @@ -42,6 +41,13 @@ def initialize(custom_field:, hierarchy_item:) @custom_field = custom_field @hierarchy_item = hierarchy_item end + + def form_arguments + { + action: custom_field_item_path(custom_field_id: @custom_field.id, id: @hierarchy_item.id), + method: :delete + } + end end end end diff --git a/app/components/enterprise_edition/banner_component.rb b/app/components/enterprise_edition/banner_component.rb index f7ac7ed39bab..713116aed544 100644 --- a/app/components/enterprise_edition/banner_component.rb +++ b/app/components/enterprise_edition/banner_component.rb @@ -29,9 +29,9 @@ # ++ module EnterpriseEdition - # Add a general description of component here - # Add additional usage considerations or best practices that may aid the user to use the component correctly. - # @accessibility Add any accessibility considerations + # A banner indicating that a given feature requires the enterprise edition of OpenProject. + # This component uses conventional names for translation keys or URL look-ups based on the feature_key passed in. + # It will only be rendered if necessary. class BannerComponent < ApplicationComponent include OpPrimer::ComponentHelpers @@ -50,6 +50,7 @@ def initialize(feature_key, **system_arguments) @system_arguments = system_arguments @system_arguments[:tag] = "div" + @system_arguments[:test_selector] = "op-ee-banner-#{feature_key.to_s.tr('_', '-')}" super @feature_key = feature_key diff --git a/app/components/enumerations/table_component.rb b/app/components/enumerations/table_component.rb index 177f8510186c..ffde9e733b78 100644 --- a/app/components/enumerations/table_component.rb +++ b/app/components/enumerations/table_component.rb @@ -30,12 +30,15 @@ module Enumerations class TableComponent < ::TableComponent + attr_reader :enumeration + + def initialize(enumeration:, rows: [], **) + super(rows: rows, **) + @enumeration = enumeration + end + def columns - %i[name is_default active sort].tap do |default| - if with_colors - default.insert 3, :color - end - end + headers.map(&:first) end def sortable? @@ -43,16 +46,13 @@ def sortable? end def headers - [ + @headers ||= [ ["name", { caption: Enumeration.human_attribute_name(:name) }], - ["is_default", { caption: Enumeration.human_attribute_name(:is_default) }], + enumeration.can_have_default_value? ? ["is_default", { caption: Enumeration.human_attribute_name(:is_default) }] : nil, ["active", { caption: Enumeration.human_attribute_name(:active) }], + with_colors ? ["color", { caption: Enumeration.human_attribute_name(:color) }] : nil, ["sort", { caption: I18n.t(:label_sort) }] - ].tap do |default| - if with_colors - default.insert 3, ["color", { caption: Enumeration.human_attribute_name(:color) }] - end - end + ].compact end def with_colors diff --git a/app/components/filter/filter_component.rb b/app/components/filter/filter_component.rb index 6b625627b2d3..ac75e571bf68 100644 --- a/app/components/filter/filter_component.rb +++ b/app/components/filter/filter_component.rb @@ -67,18 +67,40 @@ def additional_filter_attributes(filter) case filter when Queries::Filters::Shared::ProjectFilter::Required, Queries::Filters::Shared::ProjectFilter::Optional - { - autocomplete_options: { - component: "opce-project-autocompleter", - resource: "projects", - filters: [ - { name: "active", operator: "=", values: ["t"] } - ] - } - } + { autocomplete_options: project_autocomplete_options } + when Queries::Filters::Shared::CustomFields::User + { autocomplete_options: user_autocomplete_options } else {} end end + + def project_autocomplete_options + { + component: "opce-project-autocompleter", + resource: "projects", + filters: [ + { name: "active", operator: "=", values: ["t"] } + ] + } + end + + def user_autocomplete_options + { + component: "opce-user-autocompleter", + hideSelected: true, + defaultData: false, + placeholder: I18n.t(:label_user_search), + resource: "principals", + url: ::API::V3::Utilities::PathHelper::ApiV3Path.principals, + filters: [ + { name: "type", operator: "=", values: ["User"] }, + { name: "status", operator: "!", values: [Principal.statuses["locked"].to_s] }, + { name: "member", operator: "=", values: Project.visible.pluck(:id) } + ], + searchKey: "any_name_attribute", + focusDirectly: false + } + end end end diff --git a/app/components/my/access_token/access_token_created_dialog_component.html.erb b/app/components/my/access_token/access_token_created_dialog_component.html.erb index 395e20e6b180..ad570b7a3def 100644 --- a/app/components/my/access_token/access_token_created_dialog_component.html.erb +++ b/app/components/my/access_token/access_token_created_dialog_component.html.erb @@ -29,10 +29,10 @@ See COPYRIGHT and LICENSE files for more details. <%= render(Primer::OpenProject::FeedbackDialog.new( - id:, - title: nil, - size: :large - )) do |dialog| + id:, + title: I18n.t("my.access_token.create_dialog.title"), + size: :large + )) do |dialog| dialog.with_feedback_message do |message| message.with_heading(tag: :h2) { I18n.t("my.access_token.create_dialog.header", type: "API") } end diff --git a/app/components/my/access_token/new_access_token_form_component.html.erb b/app/components/my/access_token/new_access_token_form_component.html.erb index e179d484ec29..0e190a811394 100644 --- a/app/components/my/access_token/new_access_token_form_component.html.erb +++ b/app/components/my/access_token/new_access_token_form_component.html.erb @@ -39,7 +39,7 @@ See COPYRIGHT and LICENSE files for more details. collection.with_component(Primer::Alpha::Dialog::Body.new( aria: { label: I18n.t("my.access_token.new_access_token_dialog_title") } )) do - flex_layout(my: 3) do |body| + flex_layout(mb: 3) do |body| body.with_row do render(Primer::Alpha::Banner.new(scheme: :warning)) do I18n.t("my.access_token.new_access_token_dialog_attention_text") diff --git a/app/components/open_project/common/attribute_component.html.erb b/app/components/open_project/common/attribute_component.html.erb index 5fa17c497919..b3a9cde40089 100644 --- a/app/components/open_project/common/attribute_component.html.erb +++ b/app/components/open_project/common/attribute_component.html.erb @@ -41,7 +41,7 @@ }, title: name, size: :large)) do |component| - component.with_body(mt: 2) { full_text } + component.with_body { full_text } component.with_header(variant: :large) end %> diff --git a/app/components/projects/configure_view_modal_component.html.erb b/app/components/projects/configure_view_modal_component.html.erb index bc7b0a84c24e..e1a868d1e37a 100644 --- a/app/components/projects/configure_view_modal_component.html.erb +++ b/app/components/projects/configure_view_modal_component.html.erb @@ -5,7 +5,7 @@ # enough height to display all options. # This is necessary as long as ng-select does not support popovers. style: "min-height: 480px")) do |d| %> - <% d.with_header(variant: :large, mb: 3) %> + <% d.with_header(variant: :large) %> <%= render(Primer::Alpha::Dialog::Body.new) do %> <%= primer_form_with( url: projects_path, diff --git a/app/components/projects/delete_list_modal_component.html.erb b/app/components/projects/delete_list_modal_component.html.erb index c57d5e8ee1d0..3d850d1f68fb 100644 --- a/app/components/projects/delete_list_modal_component.html.erb +++ b/app/components/projects/delete_list_modal_component.html.erb @@ -2,7 +2,7 @@ size: :large, id: MODAL_ID, data: { 'test-selector': MODAL_ID })) do |d| %> - <% d.with_header(variant: :large, mb: 2) %> + <% d.with_header(variant: :large) %> <% d.with_body { t(:'projects.lists.delete_modal.text') } %> <% d.with_footer do %> <%= render(Primer::Beta::Button.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %> diff --git a/app/components/projects/settings/life_cycle_steps/index_component.html.erb b/app/components/projects/settings/life_cycle_steps/index_component.html.erb index 8ab58ef17910..1f6ee9ecb67b 100644 --- a/app/components/projects/settings/life_cycle_steps/index_component.html.erb +++ b/app/components/projects/settings/life_cycle_steps/index_component.html.erb @@ -31,7 +31,7 @@ end end header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container| - actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do + actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'hideWhenFiltering' }) do render(Primer::Beta::Button.new( tag: :a, href: enable_all_project_settings_life_cycle_steps_path(project_id: project), @@ -45,7 +45,7 @@ t('projects.settings.actions.label_enable_all') end end - actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do + actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'hideWhenFiltering' }) do render(Primer::Beta::Button.new( tag: :a, href: disable_all_project_settings_life_cycle_steps_path(project_id: project), diff --git a/app/components/projects/settings/life_cycle_steps/step_component.html.erb b/app/components/projects/settings/life_cycle_steps/step_component.html.erb index 9eda07459e3c..6da353ef3d7b 100644 --- a/app/components/projects/settings/life_cycle_steps/step_component.html.erb +++ b/app/components/projects/settings/life_cycle_steps/step_component.html.erb @@ -1,11 +1,11 @@ <%= flex_layout(align_items: :center, justify_content: :space_between) do |step_container| - step_container.with_column(flex_layout: true) do |title_container| - title_container.with_column(pt: 1, mr: 3) do + step_container.with_column(flex_layout: true, mr: 2, classes: "min-width-0") do |title_container| + title_container.with_column(pt: 1, mr: 3, classes: "ellipsis") do render(Primer::Beta::Text.new(classes: 'filter-target-visible-text')) { definition.name } end - title_container.with_column(pt: 1) do + title_container.with_column(pt: 1, classes: "no-wrap") do render(Projects::LifeCycleTypeComponent.new(definition)) end end diff --git a/app/components/projects/settings/project_custom_field_sections/show_component.html.erb b/app/components/projects/settings/project_custom_field_sections/show_component.html.erb index f2c5ee4e3a7f..d2164ada4f9f 100644 --- a/app/components/projects/settings/project_custom_field_sections/show_component.html.erb +++ b/app/components/projects/settings/project_custom_field_sections/show_component.html.erb @@ -13,7 +13,7 @@ end end section_header_container.with_column(flex_layout: true, justify_content: :flex_end) do |actions_container| - actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do + actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'hideWhenFiltering' }) do render(Primer::Beta::Button.new( tag: :a, href: enable_all_of_section_project_settings_project_custom_fields_path( @@ -32,7 +32,7 @@ t('projects.settings.actions.label_enable_all') end end - actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'bulkActionContainer' }) do + actions_container.with_column(data: { 'projects--settings--border-box-filter-target': 'hideWhenFiltering' }) do render(Primer::Beta::Button.new( tag: :a, href: disable_all_of_section_project_settings_project_custom_fields_path( diff --git a/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb b/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb index a45d6a52cb20..f6f9ed27f753 100644 --- a/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb +++ b/app/components/settings/project_custom_field_sections/dialog_body_form_component.html.erb @@ -3,7 +3,7 @@ primer_form_with(**form_config) do |f| component_collection do |collection| collection.with_component(Primer::BaseComponent.new(tag: :div)) do - flex_layout(my: 3) do |modal_body| + flex_layout(mb: 3) do |modal_body| modal_body.with_row do render(ProjectCustomFieldSections::NameForm.new(f)) end diff --git a/app/components/settings/project_life_cycle_step_definitions/form_header_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/form_header_component.html.erb new file mode 100644 index 000000000000..4e2a4029b5de --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/form_header_component.html.erb @@ -0,0 +1,34 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= render Primer::OpenProject::PageHeader.new do |header| + header.with_title { t("settings.project_life_cycle_step_definitions.#{heading_scope}.heading") } + header.with_description { t("settings.project_life_cycle_step_definitions.new.description") } + header.with_breadcrumbs(breadcrumbs_items) +end %> diff --git a/app/components/settings/project_life_cycle_step_definitions/form_header_component.rb b/app/components/settings/project_life_cycle_step_definitions/form_header_component.rb new file mode 100644 index 000000000000..8fa4442ce8d6 --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/form_header_component.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Settings + module ProjectLifeCycleStepDefinitions + class FormHeaderComponent < ApplicationComponent + options :heading_scope + + def breadcrumbs_items + [ + { + href: admin_index_path, + text: t("label_administration") + }, + { + href: admin_settings_project_custom_fields_path, + text: t("label_project_plural") + }, + { + href: admin_settings_project_life_cycle_step_definitions_path, + text: t("settings.project_life_cycle_step_definitions.heading") + }, + t("settings.project_life_cycle_step_definitions.#{heading_scope}.heading") + ] + end + end + end +end diff --git a/app/components/settings/project_life_cycle_step_definitions/index_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/index_component.html.erb new file mode 100644 index 000000000000..05f8a68de371 --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/index_component.html.erb @@ -0,0 +1,128 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + component_wrapper do + flex_layout(data: wrapper_data_attributes) do |flex| + flex.with_row do + if allowed_to_customize_life_cycle? + render(Primer::OpenProject::SubHeader.new) do |subheader| + subheader.with_filter_input( + name: "border-box-filter", + label: t("settings.project_life_cycle_step_definitions.filter.label"), + visually_hide_label: true, + placeholder: t("settings.project_life_cycle_step_definitions.filter.label"), + leading_visual: { + icon: :search, + size: :small + }, + show_clear_button: true, + data: { + action: "input->projects--settings--border-box-filter#filterLists", + "projects--settings--border-box-filter-target": "filter" + } + ) + subheader.with_action_component do + render(Primer::Alpha::ActionMenu.new( + anchor_align: :end) + ) do |menu| + menu.with_show_button( + scheme: :primary, + aria: { label: I18n.t("settings.project_life_cycle_step_definitions.label_add_description") }, + ) do |button| + button.with_leading_visual_icon(icon: :plus) + button.with_trailing_action_icon(icon: :"triangle-down") + I18n.t("settings.project_life_cycle_step_definitions.label_add") + end + + menu.with_item( + label: I18n.t("settings.project_life_cycle_step_definitions.label_add_stage"), + href: new_stage_admin_settings_project_life_cycle_step_definitions_path + ) do |item| + item.with_leading_visual_icon(icon: "git-commit") + end + + menu.with_item( + label: I18n.t("settings.project_life_cycle_step_definitions.label_add_gate"), + href: new_gate_admin_settings_project_life_cycle_step_definitions_path + ) do |item| + item.with_leading_visual_icon(icon: "diamond") + end + end + end + end + else + render EnterpriseEdition::BannerComponent.new(:customize_life_cycle, mb: 3) + end + end + + flex.with_row do + render(border_box_container(mb: 3, data: drop_target_config)) do |component| + component.with_header(font_weight: :bold, py: 2) do + flex_layout(justify_content: :space_between, align_items: :center) do |header_container| + header_container.with_column do + render(Primer::Beta::Text.new(font_weight: :bold)) do + I18n.t("settings.project_life_cycle_step_definitions.section_header") + end + end + end + end + if definitions.empty? + component.with_row do + render(Primer::Beta::Text.new(color: :subtle)) do + t("settings.project_life_cycle_step_definitions.non_defined") + end + end + else + definitions.each do |definition| + component.with_row( + data: { + "projects--settings--border-box-filter-target": "searchItem", + test_selector: "project-life-cycle-step-definition", + **draggable_item_config(definition) + } + ) do + render(Settings::ProjectLifeCycleStepDefinitions::RowComponent.new( + definition, + first?: definition == definitions.first, + last?: definition == definitions.last, + )) + end + end + end + end + end + flex.with_row(display: :none, data: { "projects--settings--border-box-filter-target": "noResultsText" }) do + render Primer::Beta::Text.new do + I18n.t("js.autocompleter.notFoundText") + end + end + end + end +%> diff --git a/app/components/settings/project_life_cycle_step_definitions/index_component.rb b/app/components/settings/project_life_cycle_step_definitions/index_component.rb new file mode 100644 index 000000000000..f2e6d2b064bd --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/index_component.rb @@ -0,0 +1,65 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Settings + module ProjectLifeCycleStepDefinitions + class IndexComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + include Projects::LifeCycleDefinitionHelper + + options :definitions + + private + + def wrapper_data_attributes + { + controller: "projects--settings--border-box-filter generic-drag-and-drop", + "application-target": "dynamic" + } + end + + def drop_target_config + { + "is-drag-and-drop-target": true, + "target-container-accessor": "& > ul", + "target-allowed-drag-type": "life-cycle-step-definition" + } + end + + def draggable_item_config(definition) + { + "draggable-type": "life-cycle-step-definition", + "drop-url": drop_admin_settings_project_life_cycle_step_definition_path(definition) + } + end + end + end +end diff --git a/app/components/settings/project_life_cycle_step_definitions/index_header_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/index_header_component.html.erb new file mode 100644 index 000000000000..5d9996081ec8 --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/index_header_component.html.erb @@ -0,0 +1,36 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render Primer::OpenProject::PageHeader.new do |header| + header.with_title { t("settings.project_life_cycle_step_definitions.heading") } + header.with_description { t("settings.project_life_cycle_step_definitions.heading_description") } + header.with_breadcrumbs(breadcrumbs_items) + end +%> diff --git a/app/components/settings/project_life_cycle_step_definitions/index_header_component.rb b/app/components/settings/project_life_cycle_step_definitions/index_header_component.rb new file mode 100644 index 000000000000..df21b4805b98 --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/index_header_component.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Settings + module ProjectLifeCycleStepDefinitions + class IndexHeaderComponent < ApplicationComponent + def breadcrumbs_items + [ + { href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_project_custom_fields_path, text: t("label_project_plural") }, + t("settings.project_life_cycle_step_definitions.heading") + ] + end + end + end +end diff --git a/app/components/settings/project_life_cycle_step_definitions/row_component.html.erb b/app/components/settings/project_life_cycle_step_definitions/row_component.html.erb new file mode 100644 index 000000000000..645d282ed373 --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/row_component.html.erb @@ -0,0 +1,103 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + flex_layout(align_items: :center, justify_content: :space_between) do |row_container| + row_container.with_column(flex_layout: true, classes: "gap-2 min-width-0") do |title_container| + if allowed_to_customize_life_cycle? + title_container.with_column do + render(Primer::OpenProject::DragHandle.new( + data: { "projects--settings--border-box-filter-target": "hideWhenFiltering" } + )) + end + end + title_container.with_column(classes: "ellipsis", test_selector: "project-life-cycle-step-definition-name") do + render( + if allowed_to_customize_life_cycle? + Primer::Beta::Link.new( + classes: "filter-target-visible-text", + href: edit_admin_settings_project_life_cycle_step_definition_path(definition), + font_weight: :bold + ) + else + Primer::Beta::Text.new( + font_weight: :bold + ) + end + ) do + definition.name + end + end + title_container.with_column do + render(Projects::LifeCycleTypeComponent.new(definition)) + end + title_container.with_column(classes: "no-wrap") do + render(Primer::Beta::Text.new) { t("project.count", count: definition.project_count) } + end + end + + if allowed_to_customize_life_cycle? + row_container.with_column do + render(Primer::Alpha::ActionMenu.new) do |menu| + menu.with_show_button(icon: "kebab-horizontal", "aria-label": t(:button_actions), scheme: :invisible) + + menu.with_item( + label: t(:label_edit), + href: edit_admin_settings_project_life_cycle_step_definition_path(definition) + ) do |item| + item.with_leading_visual_icon(icon: :pencil) + end + + unless first? + move_action(menu:, move_to: :highest, label: t("label_agenda_item_move_to_top"), icon: "move-to-top") + move_action(menu:, move_to: :higher, label: t("label_agenda_item_move_up"), icon: "chevron-up") + end + unless last? + move_action(menu:, move_to: :lower, label: t("label_agenda_item_move_down"), icon: "chevron-down") + move_action(menu:, move_to: :lowest, label: t("label_agenda_item_move_to_bottom"), icon: "move-to-bottom") + end + + menu.with_item( + label: t(:text_destroy), + scheme: :danger, + href: admin_settings_project_life_cycle_step_definition_path(definition), + form_arguments: { + method: :delete, + data: { + confirm: t("text_are_you_sure_with_project_life_cycle_step") + } + } + ) do |item| + item.with_leading_visual_icon(icon: :trash) + end + end + end + end + end +%> diff --git a/app/components/settings/project_life_cycle_step_definitions/row_component.rb b/app/components/settings/project_life_cycle_step_definitions/row_component.rb new file mode 100644 index 000000000000..1e6de58ad6ab --- /dev/null +++ b/app/components/settings/project_life_cycle_step_definitions/row_component.rb @@ -0,0 +1,60 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Settings + module ProjectLifeCycleStepDefinitions + class RowComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include Projects::LifeCycleDefinitionHelper + + alias_method :definition, :model + + options :first?, + :last? + + private + + def move_action(menu:, move_to:, label:, icon:) + menu.with_item( + label:, + href: move_admin_settings_project_life_cycle_step_definition_path(definition, move_to:), + form_arguments: { + method: :patch + }, + data: { + "projects--settings--border-box-filter-target": "hideWhenFiltering" + } + ) do |item| + item.with_leading_visual_icon(icon:) + end + end + end + end +end diff --git a/app/components/shares/invite_user_form_component.html.erb b/app/components/shares/invite_user_form_component.html.erb index f1bc280c58b9..dea952c59aa6 100644 --- a/app/components/shares/invite_user_form_component.html.erb +++ b/app/components/shares/invite_user_form_component.html.erb @@ -10,7 +10,7 @@ ) do |form| grid_layout('invite-user-form', tag: :div) do |invite_form| invite_form.with_area('invitee') do - render(Shares::Invitee.new(form, allow_hover_cards:)) + render(Shares::Invitee.new(form)) end invite_form.with_area('permission') do diff --git a/app/components/shares/invite_user_form_component.rb b/app/components/shares/invite_user_form_component.rb index 07f5559506f2..f8d40024bae9 100644 --- a/app/components/shares/invite_user_form_component.rb +++ b/app/components/shares/invite_user_form_component.rb @@ -32,15 +32,14 @@ class InviteUserFormComponent < ApplicationComponent # rubocop:disable OpenProje include OpTurbo::Streamable include OpPrimer::ComponentHelpers - attr_reader :entity, :strategy, :errors, :allow_hover_cards + attr_reader :entity, :strategy, :errors - def initialize(strategy:, errors: nil, allow_hover_cards: false) + def initialize(strategy:, errors: nil) super @strategy = strategy @entity = strategy.entity @errors = errors - @allow_hover_cards = allow_hover_cards end def new_share diff --git a/app/components/shares/manage_shares_component.html.erb b/app/components/shares/manage_shares_component.html.erb index af18bb5f4229..4412dbce2ae8 100644 --- a/app/components/shares/manage_shares_component.html.erb +++ b/app/components/shares/manage_shares_component.html.erb @@ -1,7 +1,7 @@ <%= if strategy.manageable? modal_content.with_row do - render(Shares::InviteUserFormComponent.new(strategy:, errors:, allow_hover_cards:)) + render(Shares::InviteUserFormComponent.new(strategy:, errors:)) end end @@ -100,15 +100,9 @@ end else strategy.shares.each do |share| - render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box, allow_hover_cards:)) + render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box)) end end end end - - if allow_hover_cards - modal_content.with_row do - helpers.angular_component_tag 'opce-custom-modal-overlay', class: 'op-user-share-modal-overlay' - end - end %> diff --git a/app/components/shares/manage_shares_component.rb b/app/components/shares/manage_shares_component.rb index 22246aed01a3..fa61c6afdd57 100644 --- a/app/components/shares/manage_shares_component.rb +++ b/app/components/shares/manage_shares_component.rb @@ -36,7 +36,6 @@ class ManageSharesComponent < ApplicationComponent # rubocop:disable OpenProject attr_reader :strategy, :entity, :errors, - :allow_hover_cards, :modal_content def initialize(strategy:, modal_content:, errors: nil) @@ -46,7 +45,6 @@ def initialize(strategy:, modal_content:, errors: nil) @entity = strategy.entity @errors = errors @modal_content = modal_content - @allow_hover_cards = strategy.allow_hover_cards? end def self.wrapper_key diff --git a/app/components/shares/share_dialog_component.html.erb b/app/components/shares/share_dialog_component.html.erb index d3c7f2732650..d976bc8ac7eb 100644 --- a/app/components/shares/share_dialog_component.html.erb +++ b/app/components/shares/share_dialog_component.html.erb @@ -1,6 +1,6 @@ <%= render(Primer::Alpha::Dialog.new(title: strategy.title, id: 'sharing-modal', data: { 'keep-open-on-submit': true }, size: :xlarge, open: open)) do |d| - d.with_header(variant: :large, mb: 3) + d.with_header(variant: :large) d.with_body do render(strategy.modal_body_component(errors)) end diff --git a/app/components/shares/share_row_component.html.erb b/app/components/shares/share_row_component.html.erb index 47c931db3e76..b0a929c9d3ce 100644 --- a/app/components/shares/share_row_component.html.erb +++ b/app/components/shares/share_row_component.html.erb @@ -14,7 +14,7 @@ user_row_grid.with_area(:avatar, tag: :div) do render(Users::AvatarComponent.new(user: principal, show_name: false, size: :medium, - hover_card: { active: allow_hover_cards, target: :custom })) + hover_card: { active: true })) end user_row_grid.with_area(:user_details, tag: :div, classes: 'ellipsis') do diff --git a/app/components/shares/share_row_component.rb b/app/components/shares/share_row_component.rb index ae3b98457683..45df3ab20e0b 100644 --- a/app/components/shares/share_row_component.rb +++ b/app/components/shares/share_row_component.rb @@ -36,7 +36,7 @@ class ShareRowComponent < ApplicationComponent # rubocop:disable OpenProject/Add include OpTurbo::Streamable include OpPrimer::ComponentHelpers - def initialize(share:, strategy:, container: nil, allow_hover_cards: false) + def initialize(share:, strategy:, container: nil) super @share = share @@ -45,7 +45,6 @@ def initialize(share:, strategy:, container: nil, allow_hover_cards: false) @principal = share.principal @available_roles = strategy.available_roles @container = container - @allow_hover_cards = allow_hover_cards end def wrapper_uniq_by @@ -54,7 +53,7 @@ def wrapper_uniq_by private - attr_reader :share, :entity, :principal, :container, :available_roles, :strategy, :allow_hover_cards + attr_reader :share, :entity, :principal, :container, :available_roles, :strategy def share_editable? @share_editable ||= User.current != share.principal && sharing_manageable? diff --git a/app/components/shares/user_details_component.html.erb b/app/components/shares/user_details_component.html.erb index 4a42f623ee81..bc829adc120e 100644 --- a/app/components/shares/user_details_component.html.erb +++ b/app/components/shares/user_details_component.html.erb @@ -1,12 +1,8 @@ -<%= component_wrapper do +<%= +component_wrapper do flex_layout do |flex| flex.with_row do - render( - Primer::Beta::Link.new( - font_weight: :semibold, - href: principal_show_path, - ) - ) { user.name } + helpers.primer_link_to_user(user, font_weight: :semibold, href: principal_show_path) end flex.with_row(classes: "ellipsis") do @@ -24,7 +20,8 @@ concat( form_with(url: resend_invite_path, method: :post) do render(Primer::Beta::Button.new(type: :submit, px: 0, scheme: :link)) { I18n.t("sharing.user_details.resend_invite") } - end) + end + ) end end else @@ -35,4 +32,5 @@ end end end -end %> +end +%> diff --git a/app/components/table_component.rb b/app/components/table_component.rb index 5a3c186661ab..fd5d0ba28d0b 100644 --- a/app/components/table_component.rb +++ b/app/components/table_component.rb @@ -146,7 +146,7 @@ def paginate_collection(query) end def test_selector - self.class.name.dasherize + options.fetch(:test_selector) { self.class.name.dasherize } end def rows diff --git a/app/components/users/avatar_component.rb b/app/components/users/avatar_component.rb index c0c84ed78e65..8ea7218065f5 100644 --- a/app/components/users/avatar_component.rb +++ b/app/components/users/avatar_component.rb @@ -33,7 +33,7 @@ class AvatarComponent < ApplicationComponent include OpPrimer::ComponentHelpers def initialize(user:, show_name: true, link: true, size: "default", classes: "", title: nil, name_classes: "", - hover_card: { active: true, target: :default }) + hover_card: { active: true }) super @user = user diff --git a/app/components/users/row_component.rb b/app/components/users/row_component.rb index 5b88c1c61960..6b5d34c8d6fe 100644 --- a/app/components/users/row_component.rb +++ b/app/components/users/row_component.rb @@ -46,7 +46,10 @@ def row_css_class def login icon = helpers.avatar user, size: :mini - link = link_to h(user.login), helpers.allowed_management_user_profile_path(user), class: "op-principal--name" + link = helpers.link_to_user(user, + class: "op-principal--name", + name: user.login, + href: helpers.allowed_management_user_profile_path(user)) icon + link end diff --git a/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb b/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb index cd3345e9a12a..737701162f4a 100644 --- a/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb +++ b/app/components/work_package_relations_tab/add_work_package_child_form_component.html.erb @@ -1,7 +1,7 @@ <%= component_wrapper do %> <%= primer_form_with( id: FORM_ID, - model: WorkPackage.new, + model: @child, **submit_url_options, data: { turbo: true, @@ -9,7 +9,7 @@ } ) do |f| %> <%# Form fields section %> - <%= flex_layout(my: 3) do |flex| + <%= flex_layout(mb: 3) do |flex| flex.with_row do if @base_errors&.any? render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") } @@ -23,6 +23,7 @@ my_form.work_package_autocompleter( name: :id, label: WorkPackage.model_name.human, + required: true, visually_hide_label: false, autocomplete_options: { resource: 'work_packages', diff --git a/app/components/work_package_relations_tab/add_work_package_child_form_component.rb b/app/components/work_package_relations_tab/add_work_package_child_form_component.rb index 8ad85664a9c8..b6d2a7cef414 100644 --- a/app/components/work_package_relations_tab/add_work_package_child_form_component.rb +++ b/app/components/work_package_relations_tab/add_work_package_child_form_component.rb @@ -38,10 +38,11 @@ class WorkPackageRelationsTab::AddWorkPackageChildFormComponent < ApplicationCom ID_FIELD_TEST_SELECTOR = "work-package-child-form-id" I18N_NAMESPACE = "work_package_relations_tab" - def initialize(work_package:, base_errors: nil) + def initialize(work_package:, child: nil, base_errors: nil) super() @work_package = work_package + @child = child.presence || WorkPackage.new @base_errors = base_errors end diff --git a/app/components/work_package_relations_tab/index_component.html.erb b/app/components/work_package_relations_tab/index_component.html.erb index 15d71639e656..a114b1be1ead 100644 --- a/app/components/work_package_relations_tab/index_component.html.erb +++ b/app/components/work_package_relations_tab/index_component.html.erb @@ -18,6 +18,8 @@ t(:label_relation) end + render_child_menu_items(menu) + if should_render_add_relations? Relation::TYPES.each do |relation_type, type_configuration_hash| label_key = "#{I18N_NAMESPACE}.relations.#{type_configuration_hash[:name]}_singular" @@ -33,19 +35,6 @@ end end end - - if should_render_add_child? - menu.with_item( - label: t("#{I18N_NAMESPACE}.relations.label_child_singular").upcase_first, - href: new_work_package_children_relation_path(@work_package), - test_selector: new_button_test_selector(relation_type: :child), - content_arguments: { - data: { turbo_stream: true } - } - ) do |item| - item.with_description.with_content(t("#{I18N_NAMESPACE}.relations.child_description")) - end - end end end end @@ -58,34 +47,47 @@ key_namespace = "#{I18N_NAMESPACE}.relations" # Relations - directionally_aware_grouped_relations.each do |relation_type, relations_of_type| - base_key = "#{key_namespace}.label_#{relation_type}" + directionally_aware_grouped_relations.each do |relation_group| + base_key = "#{I18N_NAMESPACE}.relations.label_#{relation_group.type}" + + # Combine visible and invisible relations into a single list + all_relations = relation_group.visible_relations.map { |r| [r, :visible] } + + relation_group.ghost_relations.map { |r| [r, :ghost] } flex.with_row(mb: 4) do render_relation_group( title: t("#{base_key}_plural").upcase_first, - relation_type:, - items: relations_of_type - ) do |relation| - render(WorkPackageRelationsTab::RelationComponent.new(work_package:, - relation:)) + relation_type: relation_group.type, + items: all_relations + ) do |relation, visibility| + # Render each relation with its visibility + render(WorkPackageRelationsTab::RelationComponent.new( + work_package: work_package, + relation: relation, + visibility: visibility + )) end end end # Children - if children.any? + if any_children? base_key = "#{key_namespace}.label_child" + # Combine visible and invisible children into a single list + all_children = visible_children.map { |r| [r, :visible] } + + ghost_children.map { |r| [r, :ghost] } + flex.with_row do render_relation_group( title: t("#{base_key}_plural").upcase_first, relation_type: :children, - items: children - ) do |child| + items: all_children + ) do |child, visibility| render(WorkPackageRelationsTab::RelationComponent.new(work_package:, relation: nil, - child:)) + child:, + visibility: visibility)) end end end diff --git a/app/components/work_package_relations_tab/index_component.rb b/app/components/work_package_relations_tab/index_component.rb index 247cc5195945..2187bf677556 100644 --- a/app/components/work_package_relations_tab/index_component.rb +++ b/app/components/work_package_relations_tab/index_component.rb @@ -9,27 +9,31 @@ class WorkPackageRelationsTab::IndexComponent < ApplicationComponent FRAME_ID = "work-package-relations-tab-content" NEW_RELATION_ACTION_MENU = "new-relation-action-menu" + NEW_CHILD_ACTION_MENU = "new-child-action-menu" I18N_NAMESPACE = "work_package_relations_tab" include ApplicationHelper include OpPrimer::ComponentHelpers include Turbo::FramesHelper include OpTurbo::Streamable - attr_reader :work_package, :relations, :children, :directionally_aware_grouped_relations, :relation_to_scroll_to + attr_reader :relations_mediator, :relation_to_scroll_to + + delegate :work_package, + :visible_children, + :ghost_children, + :directionally_aware_grouped_relations, + :any_relations?, + :any_children?, + to: :relations_mediator # Initialize the component with required data # # @param work_package [WorkPackage] The work package whose relations are being displayed - # @param relations [Array] The relations associated with this work package - # @param children [Array] Child work packages # @param relation_to_scroll_to [Relation, WorkPackage, nil] Optional relation or child to scroll to when rendering - def initialize(work_package:, relations:, children:, relation_to_scroll_to: nil) + def initialize(work_package: nil, relation_to_scroll_to: nil) super() - @work_package = work_package - @relations = relations - @children = children - @directionally_aware_grouped_relations = group_relations_by_directional_context + @relations_mediator = WorkPackageRelationsTab::RelationsMediator.new(work_package:) @relation_to_scroll_to = relation_to_scroll_to end @@ -40,57 +44,96 @@ def self.wrapper_key private def should_render_add_child? - return false if @work_package.milestone? + return false if work_package.milestone? - helpers.current_user.allowed_in_project?(:manage_subtasks, @work_package.project) + helpers.current_user.allowed_in_project?(:manage_subtasks, work_package.project) end def should_render_add_relations? - helpers.current_user.allowed_in_project?(:manage_work_package_relations, @work_package.project) + helpers.current_user.allowed_in_project?(:manage_work_package_relations, work_package.project) end def should_render_create_button? should_render_add_child? || should_render_add_relations? end - def group_relations_by_directional_context - relations.group_by do |relation| - relation.relation_type_for(work_package) - end - end - - def any_relations? = relations.any? || children.any? - def render_relation_group(title:, relation_type:, items:, &_block) render(border_box_container( padding: :condensed, data: { test_selector: "op-relation-group-#{relation_type}" } )) do |border_box| - render_header(border_box, title, items) + if relation_type == :children && should_render_add_child? + render_children_header(border_box, title, items) + else + render_header(border_box, title, items) + end + render_items(border_box, items, &_block) end end def render_header(border_box, title, items) border_box.with_header(py: 3) do - flex_layout(align_items: :center) do |flex| - flex.with_column(mr: 2) do - render(Primer::Beta::Text.new(font_size: :normal, font_weight: :bold)) { title } + concat render(Primer::Beta::Text.new(mr: 2, font_size: :normal, font_weight: :bold)) { title } + concat render(Primer::Beta::Counter.new(count: items.size, round: true, scheme: :primary)) + end + end + + def render_children_header(border_box, title, items) # rubocop:disable Metrics/AbcSize + border_box.with_header(py: 3) do + flex_layout(justify_content: :space_between, align_items: :center) do |header| + header.with_column(mr: 2) do + concat render(Primer::Beta::Text.new(mr: 2, font_size: :normal, font_weight: :bold)) { title } + concat render(Primer::Beta::Counter.new(count: items.size, round: true, scheme: :primary)) end - flex.with_column do - render(Primer::Beta::Counter.new(count: items.size, round: true, scheme: :primary)) + header.with_column do + render(Primer::Alpha::ActionMenu.new(menu_id: NEW_CHILD_ACTION_MENU)) do |menu| + menu.with_show_button do |button| + button.with_leading_visual_icon(icon: :plus) + button.with_trailing_action_icon(icon: :"triangle-down") + t("work_package_relations_tab.label_add_child_button") + end + + render_child_menu_items(menu) + end end end end end + def render_child_menu_items(menu) # rubocop:disable Metrics/AbcSize + return unless should_render_add_child? + + if helpers.current_user.allowed_in_project?(:add_work_packages, work_package.project) + menu.with_item( + label: t("work_package_relations_tab.relations.new_child"), + href: new_project_work_packages_dialog_path(work_package.project, parent_id: work_package.id), + content_arguments: { + data: { turbo_stream: true } + } + ) do |item| + item.with_description.with_content(t("work_package_relations_tab.relations.new_child_text")) + end + end + + menu.with_item( + label: t("work_package_relations_tab.relations.existing_child"), + href: new_work_package_children_relation_path(work_package), + content_arguments: { + data: { turbo_stream: true } + } + ) do |item| + item.with_description.with_content(t("work_package_relations_tab.relations.child_description")) + end + end + def render_items(border_box, items) - items.each do |item| + items.each do |relation, visibility| border_box.with_row( - test_selector: row_test_selector(item), - data: data_attribute(item) + test_selector: row_test_selector(relation, visibility), + data: data_attribute(relation) ) do - yield(item) + yield(relation, visibility) end end end @@ -125,9 +168,9 @@ def new_button_test_selector(relation_type:) "op-new-relation-button-#{relation_type}" end - def row_test_selector(item) + def row_test_selector(item, visibility) related_work_package_id = find_related_work_package_id(item) - "op-relation-row-#{related_work_package_id}" + "op-relation-row-#{visibility}-#{related_work_package_id}" end def find_related_work_package_id(item) diff --git a/app/components/work_package_relations_tab/index_component.sass b/app/components/work_package_relations_tab/index_component.sass index 32a1e670cced..ae2778fdeb95 100644 --- a/app/components/work_package_relations_tab/index_component.sass +++ b/app/components/work_package_relations_tab/index_component.sass @@ -1,5 +1,6 @@ // We reference an ID as one is required to be specified for the action menu list. // It can't be nested inside the BEM model as it's placed as a #top-layer element. -#new-relation-action-menu-list +#new-relation-action-menu-list, +#new-child-action-menu-list max-height: 450px max-width: 280px diff --git a/app/components/work_package_relations_tab/relation_component.html.erb b/app/components/work_package_relations_tab/relation_component.html.erb index b4cdd78822b4..8abb42f131e6 100644 --- a/app/components/work_package_relations_tab/relation_component.html.erb +++ b/app/components/work_package_relations_tab/relation_component.html.erb @@ -1,104 +1,97 @@ <%= -flex_layout do |flex| - flex.with_row(flex_layout: true, justify_content: :space_between, align_items: :center) do |row| - row.with_column do - render(WorkPackages::InfoLineComponent.new(work_package: related_work_package)) - end + flex_layout do |flex| + if visible? + flex.with_row(flex_layout: true, justify_content: :space_between, align_items: :center) do |row| + row.with_column do + render(WorkPackages::InfoLineComponent.new(work_package: related_work_package)) + end - if should_render_action_menu? - row.with_column do - render(Primer::Alpha::ActionMenu.new(test_selector: action_menu_test_selector)) do |menu| - menu.with_show_button(icon: "kebab-horizontal", - "aria-label": I18n.t(:label_relation_actions), - scheme: :invisible, - ml: 2) + if should_render_action_menu? + row.with_column do + render(Primer::Alpha::ActionMenu.new(test_selector: action_menu_test_selector)) do |menu| + menu.with_show_button(icon: "kebab-horizontal", + "aria-label": I18n.t(:label_relation_actions), + scheme: :invisible, + ml: 2) - if should_render_edit_option? - menu.with_item(label: "Edit relation", - href: edit_path, - test_selector: edit_button_test_selector, - content_arguments: { - data: { turbo_stream: true } - }) do |item| - item.with_leading_visual_icon(icon: :pencil) - end - end + if should_render_edit_option? + menu.with_item(label: I18n.t(:label_relation_edit), + href: edit_path, + test_selector: edit_button_test_selector, + content_arguments: { + data: { turbo_stream: true } + }) do |item| + item.with_leading_visual_icon(icon: :pencil) + end + end - menu.with_item(label: "Delete relation", - scheme: :danger, - href: destroy_path, - form_arguments: { - method: :delete, - data: { - confirm: t("text_are_you_sure"), - turbo_stream: true, - update_work_package: true - } - }, - test_selector: delete_button_test_selector) do |item| - item.with_leading_visual_icon(icon: :trash) + menu.with_item(label: I18n.t(:label_relation_delete), + scheme: :danger, + href: destroy_path, + form_arguments: { + method: :delete, + data: { + confirm: t("text_are_you_sure"), + turbo_stream: true, + update_work_package: true + } + }, + test_selector: delete_button_test_selector) do |item| + item.with_leading_visual_icon(icon: :trash) + end + end end end end - end - end - flex.with_row(mb: 2) do - render(Primer::Beta::Link.new(href: work_package_path(related_work_package), - color: :default, - underline: false, - font_size: :normal, - font_weight: :bold, - target: "_blank")) { related_work_package.subject } - end - - if should_display_description? - flex.with_row(mb: 2) do - render(Primer::Beta::Text.new(font_size: :small, color: :muted)) { format_text(relation, :description) } - end - end + flex.with_row(mb: 2, classes: "relation-row--subject") do + render(Primer::Beta::Link.new(href: work_package_path(related_work_package), + color: :default, + underline: false, + font_size: :normal, + font_weight: :bold, + target: "_blank")) { related_work_package.subject } + end - if should_display_dates_row? - flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |dates_row| - if precedes? && lag_present? - dates_row.with_column(mr: 1) do - render(Primer::Beta::Octicon.new(icon: "arrow-both")) + if should_display_description? + flex.with_row(mb: 2) do + render(Primer::Beta::Text.new(font_size: :small, color: :muted)) { format_text(relation, :description) } end - dates_row.with_column(mr: 3) do - render(Primer::Beta::Text.new) do - lag_as_text(relation.lag) - end + end + else + flex.with_row(mb: 2) do + render(Primer::Beta::Text.new(font_weight: :bold, color: :muted)) { I18n.t("work_package_relations_tab.relations.ghost_relation_title") } + end + flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |ghost_description_row| + ghost_description_row.with_column(mr: 1) do + render(Primer::Beta::Octicon.new(icon: "alert")) + end + ghost_description_row.with_column do + render(Primer::Beta::Text.new) { I18n.t("work_package_relations_tab.relations.ghost_relation_description") } end end + end - if related_work_package.start_date.present? || related_work_package.due_date.present? - dates_row.with_column(mr: 1) do - icon = if follows? - :calendar - elsif precedes? - :pin - end + # Show dates for both visible and ghost relation + if should_display_dates_row? + flex.with_row(flex_layout: true, align_items: :center, color: :muted, mb: 2) do |dates_row| + if precedes? && lag_present? + dates_row.with_column(mr: 1) { render(Primer::Beta::Octicon.new(icon: "arrow-both")) } + dates_row.with_column(mr: 2) { render(Primer::Beta::Text.new) { lag_as_text(relation.lag) } } + end - render(Primer::Beta::Octicon.new(icon:)) + dates_row.with_column(mr: 1) do + render(Primer::Beta::Octicon.new(icon: helpers.work_package_dates_icon(related_work_package))) end dates_row.with_column do - render(Primer::Beta::Text.new) do - "#{format_date(related_work_package.start_date)} - #{format_date(related_work_package.due_date)}" - end + render(Primer::Beta::Text.new) { helpers.work_package_formatted_dates(related_work_package) } end - end - if follows? && lag_present? - dates_row.with_column(ml: 3, mr: 1) do - render(Primer::Beta::Octicon.new(icon: "arrow-both")) - end - dates_row.with_column(mr: 1) do - render(Primer::Beta::Text.new) do - lag_as_text(relation.lag) - end + if follows? && lag_present? + dates_row.with_column(ml: 2, mr: 1) { render(Primer::Beta::Octicon.new(icon: "arrow-both")) } + dates_row.with_column(mr: 1) { render(Primer::Beta::Text.new) { lag_as_text(relation.lag) } } end end end end -end %> diff --git a/app/components/work_package_relations_tab/relation_component.rb b/app/components/work_package_relations_tab/relation_component.rb index 5df345651d22..ee85a705031f 100644 --- a/app/components/work_package_relations_tab/relation_component.rb +++ b/app/components/work_package_relations_tab/relation_component.rb @@ -2,15 +2,17 @@ class WorkPackageRelationsTab::RelationComponent < ApplicationComponent include ApplicationHelper include OpPrimer::ComponentHelpers - attr_reader :work_package, :relation, :child + attr_reader :work_package, :relation, :child, :visibility def initialize(work_package:, relation:, + visibility:, child: nil) super() @work_package = work_package @relation = relation + @visibility = visibility @child = child end @@ -47,6 +49,10 @@ def allowed_to_manage_relations? helpers.current_user.allowed_in_project?(:manage_work_package_relations, @work_package.project) end + def visible? + @visibility == :visible + end + def underlying_resource_id @underlying_resource_id ||= if parent_child_relationship? @child.id @@ -66,16 +72,18 @@ def lag_present? end def should_display_dates_row? - return false if parent_child_relationship? - - relation.follows? || relation.precedes? + parent_child_relationship? || relation.follows? || relation.precedes? end def follows? + return false if parent_child_relationship? + relation.relation_type_for(work_package) == Relation::TYPE_FOLLOWS end def precedes? + return false if parent_child_relationship? + relation.relation_type_for(work_package) == Relation::TYPE_PRECEDES end diff --git a/app/components/work_package_relations_tab/relation_component.sass b/app/components/work_package_relations_tab/relation_component.sass new file mode 100644 index 000000000000..ffb228116e57 --- /dev/null +++ b/app/components/work_package_relations_tab/relation_component.sass @@ -0,0 +1,2 @@ +.relation-row--subject + @include text-shortener(false) diff --git a/app/components/work_package_relations_tab/relations_mediator.rb b/app/components/work_package_relations_tab/relations_mediator.rb new file mode 100644 index 000000000000..358c82f2540e --- /dev/null +++ b/app/components/work_package_relations_tab/relations_mediator.rb @@ -0,0 +1,95 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class WorkPackageRelationsTab::RelationsMediator + RelationGroup = Data.define(:type, :visible_relations, :ghost_relations) + + attr_reader :work_package + + def initialize(work_package:) + @work_package = work_package + end + + def visible_relations + @visible_relations ||= work_package.relations.visible.includes(:to, :from) + end + + def visible_children + @visible_children ||= work_package.children.visible + end + + def ghost_relations + @ghost_relations = work_package.relations.includes(:to, :from).where.not(id: visible_relations.select(:id)) + end + + def ghost_children + @ghost_children ||= work_package.children.where.not(id: visible_children.select(:id)) + end + + def directionally_aware_grouped_relations + # Collect all unique relation types + all_relation_types = collect_all_relation_types + + # Group visible and invisible relations by type + all_relation_types.map do |type| + RelationGroup.new( + type: type, + visible_relations: filter_relations_by_type(visible_relations, type), + ghost_relations: filter_relations_by_type(ghost_relations, type) + ) + end + end + + def any_relations? + visible_relations.any? || ghost_relations.any? || visible_children.any? || ghost_children.any? + end + + def all_relations_count + visible_relations.count + ghost_relations.count + visible_children.count + ghost_children.count + end + + def any_children? + visible_children.any? || ghost_children.any? + end + + private + + def collect_all_relation_types + (visible_relations + ghost_relations).map do |relation| + relation.relation_type_for(work_package) + end.uniq + end + + def filter_relations_by_type(relations, type) + relations.select do |relation| + relation.relation_type_for(work_package) == type + end + end +end diff --git a/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb b/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb index 83879e8a97c6..bfd9090c7e09 100644 --- a/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb +++ b/app/components/work_package_relations_tab/work_package_relation_form_component.html.erb @@ -9,7 +9,7 @@ } ) do |f| %> <%# Form fields section %> - <%= flex_layout(my: 2) do |flex| + <%= flex_layout(mb: 3) do |flex| flex.with_row do if @base_errors&.any? render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") } @@ -20,15 +20,16 @@ # so we need to re-define them here. Figure out solution for this. relation = @relation lag_shown = show_lag? - to_id_field_value = relation.to.present? ? "#{related_work_package.type.name.upcase} ##{related_work_package.id} - #{related_work_package.subject}" : nil + field_value = displayable_field_value + relation_direction = direction url = ::API::V3::Utilities::PathHelper::ApiV3Path.work_package_available_relation_candidates(@work_package.id, type: relation.relation_type_for(@work_package)) render_inline_form(f) do |my_form| if relation.persisted? my_form.text_field( - name: :to_id, + name: relation_direction, label: WorkPackage.model_name.human, visually_hide_label: false, - value: to_id_field_value, + value: field_value, readonly: true ) else @@ -38,8 +39,9 @@ ) my_form.autocompleter( - name: :to_id, + name: relation_direction, label: WorkPackage.model_name.human, + required: true, visually_hide_label: false, autocomplete_options: { resource: 'work_packages', @@ -65,9 +67,10 @@ name: :lag, type: :number, min: 0, - label: I18n.t("work_package_relations_tab.lag.title"), + label: I18n.t("work_package_relations_tab.lag.subject"), caption: I18n.t("work_package_relations_tab.lag.caption"), input_width: :small, + trailing_visual: { text: { text: I18n.t("datetime.units.day.other") } } ) end end diff --git a/app/components/work_package_relations_tab/work_package_relation_form_component.rb b/app/components/work_package_relations_tab/work_package_relation_form_component.rb index 264d08770fab..0f4509cc23aa 100644 --- a/app/components/work_package_relations_tab/work_package_relation_form_component.rb +++ b/app/components/work_package_relations_tab/work_package_relation_form_component.rb @@ -48,13 +48,28 @@ def initialize(work_package:, relation:, base_errors: nil) def related_work_package @related_work_package ||= begin - related = @relation.to # We cannot rely on the related WorkPackage being the "to", # depending on the relation it can also be "from" - related.id == @work_package.id ? @relation.from : related + relation_to_matches_wp? ? @relation.from : @relation.to end end + def displayable_field_value + return nil if related_work_package.nil? + + if relation_to_matches_wp? + "#{related_work_package.type.name.upcase} ##{related_work_package.id} - #{related_work_package.subject}" + end + end + + def direction + relation_to_matches_wp? ? :from_id : :to_id + end + + def relation_to_matches_wp? + @relation.to == @work_package + end + def submit_url_options if @relation.persisted? { method: :patch, @@ -66,6 +81,6 @@ def submit_url_options end def show_lag? - @relation.relation_type == Relation::TYPE_PRECEDES || @relation.relation_type == Relation::TYPE_FOLLOWS + [Relation::TYPE_PRECEDES, Relation::TYPE_FOLLOWS].include?(@relation.relation_type) end end diff --git a/app/components/work_packages/activities_tab/index_component.html.erb b/app/components/work_packages/activities_tab/index_component.html.erb index 6b4492a05afe..5961bf893244 100644 --- a/app/components/work_packages/activities_tab/index_component.html.erb +++ b/app/components/work_packages/activities_tab/index_component.html.erb @@ -31,13 +31,9 @@ journals_wrapper_container.with_row( classes: "work-packages-activities-tab-index-component--input-container work-packages-activities-tab-index-component--input-container_sort-#{journal_sorting}", mt: 3, - mb: [3, nil, nil, nil, 0], pt: 2, pb: 2, pl: 3, - pr: [3, nil, nil, nil, 2], - border: [nil, nil, nil, nil, :top], - border_radius: [2, nil, nil, nil, 0], bg: :subtle ) do render( diff --git a/app/components/work_packages/activities_tab/index_component.rb b/app/components/work_packages/activities_tab/index_component.rb index 3be97f3d5cd0..6efc7f98e219 100644 --- a/app/components/work_packages/activities_tab/index_component.rb +++ b/app/components/work_packages/activities_tab/index_component.rb @@ -56,7 +56,7 @@ def wrapper_data_attributes test_selector: "op-wp-activity-tab", controller: stimulus_controller, "application-target": "dynamic", - "#{stimulus_controller}-update-streams-url-value": update_streams_work_package_activities_url(work_package), + "#{stimulus_controller}-update-streams-path-value": update_streams_work_package_activities_path(work_package), "#{stimulus_controller}-sorting-value": journal_sorting, "#{stimulus_controller}-filter-value": filter, "#{stimulus_controller}-user-id-value": User.current.id, diff --git a/app/components/work_packages/activities_tab/index_component.sass b/app/components/work_packages/activities_tab/index_component.sass index 34fe6c22fb33..ef3eed0b772a 100644 --- a/app/components/work_packages/activities_tab/index_component.sass +++ b/app/components/work_packages/activities_tab/index_component.sass @@ -1,10 +1,10 @@ -.work-packages-activities-tab-index-component +@mixin activities-tab-component($breakpoint, $input-container-padding-right: 10px, $input-container-margin-bottom: 20px) overflow-y: hidden &--errors position: absolute width: calc(100% - 22px) z-index: 11 - @media screen and (max-width: $breakpoint-xl) + @media screen and (max-width: $breakpoint) position: fixed bottom: 20px width: calc(100% - 30px) @@ -15,23 +15,42 @@ &_with-initial-input-compensation margin-bottom: 65px // initial margin-bottom, will be increased by stimulus when opening ckeditor - @media screen and (max-width: $breakpoint-xl) + @media screen and (max-width: $breakpoint) margin-bottom: -16px &_with-input-compensation margin-bottom: 180px - @media screen and (max-width: $breakpoint-xl) + @media screen and (max-width: $breakpoint) margin-bottom: -16px &--input-container z-index: 10 - @media screen and (min-width: $breakpoint-xl) + border-radius: var(--borderRadius-medium) + border: none + padding-right: 16px + margin-bottom: $input-container-margin-bottom + @media screen and (min-width: $breakpoint) position: absolute min-height: 60px bottom: 0 left: 0 right: 0 + border-radius: 0px + border-top: var(--borderWidth-thin, 1px) solid var(--borderColor-default) + padding-right: $input-container-padding-right + margin-bottom: 0px &_sort-desc - @media screen and (max-width: $breakpoint-xl) + @media screen and (max-width: $breakpoint) order: -1 + +.work-packages-activities-tab-index-component + @include activities-tab-component($breakpoint-xl) + +.work-packages-activities-tab-index-component--within-notification-center + .work-packages-activities-tab-index-component + @include activities-tab-component($breakpoint-lg, 15px) + +.work-packages-activities-tab-index-component--within-split-screen + .work-packages-activities-tab-index-component + @include activities-tab-component($breakpoint-sm, 10px, 10px) \ No newline at end of file diff --git a/app/components/work_packages/activities_tab/journals/index_component.html.erb b/app/components/work_packages/activities_tab/journals/index_component.html.erb index c541372a20a6..9ef8ded4e52b 100644 --- a/app/components/work_packages/activities_tab/journals/index_component.html.erb +++ b/app/components/work_packages/activities_tab/journals/index_component.html.erb @@ -7,7 +7,7 @@ mb: inner_container_margin_bottom ) do flex_layout(id: insert_target_modifier_id, - data: { test_selector: "op-wp-journals-container" }) do |journals_index_container| + data: { test_selector: "op-wp-journals-container" }) do |journals_index_container| if empty_state? journals_index_container.with_row(mt: 2, mb: 3) do render( @@ -22,12 +22,16 @@ end end - recent_journals.each do |journal| + recent_journals.each do |record| journals_index_container.with_row do - render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new( - journal:, filter:, - grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[journal.id] - )) + if record.is_a?(Changeset) + render(WorkPackages::ActivitiesTab::Journals::RevisionComponent.new(changeset: record, filter:)) + else + render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new( + journal: record, filter:, + grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[record.id] + )) + end end end @@ -48,12 +52,16 @@ else helpers.turbo_frame_tag("work-package-activities-tab-content-older-journals") do flex_layout do |older_journals_container| - older_journals.each do |journal| + older_journals.each do |record| older_journals_container.with_row do - render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new( - journal:, filter:, - grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[journal.id] - )) + if record.is_a?(Changeset) + render(WorkPackages::ActivitiesTab::Journals::RevisionComponent.new(changeset: record, filter:)) + else + render(WorkPackages::ActivitiesTab::Journals::ItemComponent.new( + journal: record, filter:, + grouped_emoji_reactions: wp_journals_grouped_emoji_reactions[record.id] + )) + end end end end diff --git a/app/components/work_packages/activities_tab/journals/index_component.rb b/app/components/work_packages/activities_tab/journals/index_component.rb index 469f0e3d4e11..35535014b0a1 100644 --- a/app/components/work_packages/activities_tab/journals/index_component.rb +++ b/app/components/work_packages/activities_tab/journals/index_component.rb @@ -64,47 +64,62 @@ def journal_sorting_desc? end def base_journals - work_package - .journals - .includes( - :user, - :customizable_journals, - :attachable_journals, - :storable_journals, - :notifications - ) - .reorder(version: journal_sorting) - .with_sequence_version + combine_and_sort_records(fetch_journals, fetch_revisions) + end + + def fetch_journals + API::V3::Activities::ActivityEagerLoadingWrapper.wrap( + work_package + .journals + .includes(:user, :customizable_journals, :attachable_journals, :storable_journals, :notifications) + .reorder(version: journal_sorting) + .with_sequence_version + ) + end + + def fetch_revisions + work_package.changesets.includes(:user, :repository) + end + + def combine_and_sort_records(journals, revisions) + (journals + revisions).sort_by do |record| + timestamp = record_timestamp(record) + journal_sorting_desc? ? [-timestamp, -record.id] : [timestamp, record.id] + end + end + + def record_timestamp(record) + if record.is_a?(API::V3::Activities::ActivityEagerLoadingWrapper) + record.created_at&.to_i + elsif record.is_a?(Changeset) + record.committed_on.to_i + end end def journals - API::V3::Activities::ActivityEagerLoadingWrapper.wrap(base_journals) + base_journals end def recent_journals - recent_ones = if journal_sorting_desc? - base_journals.first(MAX_RECENT_JOURNALS) - else - base_journals.last(MAX_RECENT_JOURNALS) - end - - API::V3::Activities::ActivityEagerLoadingWrapper.wrap(recent_ones) + if journal_sorting_desc? + base_journals.first(MAX_RECENT_JOURNALS) + else + base_journals.last(MAX_RECENT_JOURNALS) + end end def older_journals - older_ones = if journal_sorting_desc? - base_journals.offset(MAX_RECENT_JOURNALS) - else - total = base_journals.count - limit = [total - MAX_RECENT_JOURNALS, 0].max - base_journals.limit(limit) - end - - API::V3::Activities::ActivityEagerLoadingWrapper.wrap(older_ones) + if journal_sorting_desc? + base_journals.drop(MAX_RECENT_JOURNALS) + else + base_journals.take(base_journals.size - MAX_RECENT_JOURNALS) + end end def journal_with_notes - base_journals.where.not(notes: "") + work_package + .journals + .where.not(notes: "") end def wp_journals_grouped_emoji_reactions diff --git a/app/components/work_packages/activities_tab/journals/index_component.sass b/app/components/work_packages/activities_tab/journals/index_component.sass index 1dc5b0064eb0..25ea1149fece 100644 --- a/app/components/work_packages/activities_tab/journals/index_component.sass +++ b/app/components/work_packages/activities_tab/journals/index_component.sass @@ -2,12 +2,12 @@ &--journals-inner-container z-index: 10 &--stem-connection - @media screen and (min-width: $breakpoint-xl) + @media screen and (min-width: $breakpoint-lg) position: absolute z-index: 9 border-left: var(--borderWidth-thin, 1px) solid var(--borderColor-default) margin-left: 19px margin-top: 20px height: 100vh - @media screen and (max-width: $breakpoint-xl) + @media screen and (max-width: $breakpoint-lg) display: none diff --git a/app/components/work_packages/activities_tab/journals/item_component.html.erb b/app/components/work_packages/activities_tab/journals/item_component.html.erb index 7ea180f1a7ae..7b0bffa9dd3f 100644 --- a/app/components/work_packages/activities_tab/journals/item_component.html.erb +++ b/app/components/work_packages/activities_tab/journals/item_component.html.erb @@ -1,14 +1,17 @@ <%= component_wrapper(data: wrapper_data_attributes, class: "work-packages-activities-tab-journals-item-component") do - flex_layout(data: { + flex_layout(data: { test_selector: "op-wp-journal-entry-#{journal.id}" }) do |journal_container| if show_comment_container? journal_container.with_row do render(border_box_container( - id: "activity-anchor-#{journal.sequence_version}", padding: :condensed, - "aria-label": I18n.t("activities.work_packages.activity_tab.commented") + "aria-label": I18n.t("activities.work_packages.activity_tab.commented"), + data: { + "anchor-activity-id": journal.sequence_version, + "anchor-comment-id": journal.id, + } )) do |border_box_component| border_box_component.with_header(px: 2, py: 1, data: { test_selector: "op-journal-notes-header" }) do flex_layout(align_items: :center, justify_content: :space_between) do |header_container| @@ -28,7 +31,7 @@ end header_start_container.with_column(mr: 1, classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis hidden-for-mobile") do - truncated_user_name(journal.user) + truncated_user_name(journal.user, hover_card: true) end if journal.initial? header_start_container.with_column( @@ -41,7 +44,11 @@ end end header_start_container.with_column(mr: 1, classes: "hidden-for-mobile") do - render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) { format_time(journal.updated_at) } + if OpenProject::FeatureDecisions.work_package_comment_id_url_active? + activity_anchor_link(journal) { journal_updated_at_formatted_time(journal) } + else + journal_updated_at_formatted_time(journal) + end end end header_container.with_column(flex_layout: true, align_items: :center) do |header_end_container| @@ -55,21 +62,13 @@ )) end end - header_end_container.with_column do - render(Primer::Beta::Link.new( - href: activity_url(journal), - scheme: :secondary, - underline: false, - font_size: :small, - data: { - turbo: false, - action: "click->work-packages--activities-tab--index#setAnchor:prevent", - "work-packages--activities-tab--index-id-param": journal.sequence_version - } - )) do - "##{journal.sequence_version}" + + unless OpenProject::FeatureDecisions.work_package_comment_id_url_active? + header_end_container.with_column do + activity_anchor_link(journal) end end + header_end_container.with_column(ml: 1, classes: "work-packages-activities-tab-journals-item-component--action-menu") do render(Primer::Alpha::ActionMenu.new(data: { test_selector: "op-wp-journal-#{journal.id}-action-menu" })) do |menu| diff --git a/app/components/work_packages/activities_tab/journals/item_component/details.rb b/app/components/work_packages/activities_tab/journals/item_component/details.rb index 529fbcd6ab95..2d86cf1c0727 100644 --- a/app/components/work_packages/activities_tab/journals/item_component/details.rb +++ b/app/components/work_packages/activities_tab/journals/item_component/details.rb @@ -66,7 +66,10 @@ def render_details_header(details_container) flex_layout: true, justify_content: :space_between, classes: "work-packages-activities-tab-journals-item-component-details--journal-details-header-container", - id: "activity-anchor-#{journal.sequence_version}" + data: { + "anchor-activity-id": journal.sequence_version, + "anchor-comment-id": journal.id + } ) do |header_container| render_header_start(header_container) render_header_end(header_container) @@ -105,7 +108,7 @@ def render_user_name_for_desktop(container) mr: 1, classes: "work-packages-activities-tab-journals-item-component-details--user-name ellipsis hidden-for-mobile" ) do - truncated_user_name(journal.user) + truncated_user_name(journal.user, hover_card: true) end end @@ -160,13 +163,21 @@ def render_mobile_journal_type(container) def render_mobile_updated_time(container) container.with_column do - render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) { format_time(journal.updated_at) } + if OpenProject::FeatureDecisions.work_package_comment_id_url_active? + activity_anchor_link(journal) { journal_updated_at_formatted_time(journal) } + else + journal_updated_at_formatted_time(journal) + end end end def render_updated_time(container) container.with_column(mr: 1, classes: "hidden-for-mobile") do - render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) { format_time(journal.updated_at) } + if OpenProject::FeatureDecisions.work_package_comment_id_url_active? + activity_anchor_link(journal) { journal_updated_at_formatted_time(journal) } + else + journal_updated_at_formatted_time(journal) + end end end @@ -189,20 +200,13 @@ def render_notification_bubble(container) end def render_activity_link(container) + return if OpenProject::FeatureDecisions.work_package_comment_id_url_active? + container.with_column( pr: 3, classes: "work-packages-activities-tab-journals-item-component-details--activity-link-container" ) do - render(Primer::Beta::Link.new( - href: activity_url(journal), - scheme: :secondary, - underline: false, - font_size: :small, - data: { turbo: false, action: "click->work-packages--activities-tab--index#setAnchor:prevent", - "work-packages--activities-tab--index-id-param": journal.sequence_version } - )) do - "##{journal.sequence_version}" - end + activity_anchor_link(journal) end end diff --git a/app/components/work_packages/activities_tab/journals/new_component.html.erb b/app/components/work_packages/activities_tab/journals/new_component.html.erb index 5ec55df8e037..3cb7db5a178d 100644 --- a/app/components/work_packages/activities_tab/journals/new_component.html.erb +++ b/app/components/work_packages/activities_tab/journals/new_component.html.erb @@ -3,7 +3,7 @@ flex_layout(my: 2, data: { test_selector: "op-work-package-journal-form" }) do |new_form_container| new_form_container.with_row( display: button_row_display_value, - data: { + data: { "work-packages--activities-tab--index-target": "buttonRow" }) do flex_layout(justify_content: :space_between) do |button_row| @@ -39,10 +39,10 @@ id: "work-package-journal-form-element", # required for specs model: journal, method: :post, - data: { - turbo: true, - turbo_stream: true, - "work-packages--activities-tab--index-target": "form", + data: { + turbo: true, + turbo_stream: true, + "work-packages--activities-tab--index-target": "form", action: "submit->work-packages--activities-tab--index#onSubmit", "test_selector": "op-work-package-journal-form-element" }, @@ -61,7 +61,10 @@ icon: :"paper-airplane", "aria-label": t("activities.work_packages.activity_tab.label_submit_comment"), type: :submit, - data: { "test_selector": "op-submit-work-package-journal-form" } + data: { + "test_selector": "op-submit-work-package-journal-form", + "work-packages--activities-tab--index-target": "formSubmitButton" + } )) end end diff --git a/app/components/work_packages/activities_tab/journals/new_component.sass b/app/components/work_packages/activities_tab/journals/new_component.sass index 11b355b674b2..b3ab7ddeaedb 100644 --- a/app/components/work_packages/activities_tab/journals/new_component.sass +++ b/app/components/work_packages/activities_tab/journals/new_component.sass @@ -15,9 +15,16 @@ width: calc(100% - 40px) // specific ck editor adjustments .ck-content - &.ck-focused - max-height: 30vh - &.ck-blurred - max-height: 10vh + @media screen and (max-width: $breakpoint-sm) + height: 30vh // set content-height before hand so there's no shift + &.ck-focused + height: 30vh + &.ck-blurred + height: 10vh + @media screen and (min-width: $breakpoint-md) + &.ck-focused + max-height: 30vh + &.ck-blurred + max-height: 10vh .ck-editor__preview max-height: 30vh diff --git a/app/components/work_packages/activities_tab/journals/revision_component.html.erb b/app/components/work_packages/activities_tab/journals/revision_component.html.erb new file mode 100644 index 000000000000..be28bcec0dd7 --- /dev/null +++ b/app/components/work_packages/activities_tab/journals/revision_component.html.erb @@ -0,0 +1,81 @@ +<%= + component_wrapper(class: "work-packages-activities-tab-journals-item-component") do + flex_layout(data: { + test_selector: "op-wp-revision-entry-#{changeset.id}" + }) do |revision_container| + revision_container.with_row do + render(border_box_container( + id: "activity-anchor-r#{changeset.revision}", + padding: :condensed, + "aria-label": I18n.t("activities.work_packages.activity_tab.commented") + )) do |border_box_component| + border_box_component.with_header(px: 2, py: 1, data: { test_selector: "op-revision-header" }) do + flex_layout(align_items: :center, justify_content: :space_between, classes: "work-packages-activities-tab-revision-component--header") do |header_container| + header_container.with_column(flex_layout: true, + classes: "work-packages-activities-tab-journals-item-component--header-start-container ellipsis") do |header_start_container| + header_start_container.with_column(mr: 2) do + if changeset.user + render(Users::AvatarComponent.new(user: changeset.user, show_name: false, size: :mini)) + end + end + header_start_container.with_column(mr: 1, flex_layout: true, + classes: "work-packages-activities-tab-journals-item-component--user-name-container hidden-for-desktop") do |user_name_container| + user_name_container.with_row(classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis") do + render_user_name + end + user_name_container.with_row do + render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mr: 1)) do + committed_text = render(Primer::Beta::Link.new( + href: revision_url, + scheme: :secondary, + underline: false, + font_size: :small, + target: "_blank" + )) do + I18n.t("js.label_committed_link", revision_identifier: short_revision) + end + I18n.t("js.label_committed_at", + committed_revision_link: committed_text.html_safe, + date: format_time(changeset.committed_on)).html_safe + end + end + end + header_start_container.with_column(mr: 1, + classes: "work-packages-activities-tab-journals-item-component--user-name ellipsis hidden-for-mobile") do + render_user_name + end + header_start_container.with_column(mr: 1, classes: "hidden-for-mobile") do + render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mr: 1)) do + committed_text = render(Primer::Beta::Link.new( + href: revision_url, + scheme: :secondary, + underline: false, + font_size: :small, + target: "_blank" + )) do + I18n.t("js.label_committed_link", revision_identifier: short_revision) + end + I18n.t("js.label_committed_at", + committed_revision_link: committed_text.html_safe, + date: format_time(changeset.committed_on)).html_safe + end + end + end + end + end + border_box_component.with_body( + classes: "work-packages-activities-tab-journals-item-component--journal-notes-body", + data: { test_selector: "op-revision-notes-body" } + ) do + render(Primer::Box.new(mt: 1, classes: "op-uc-container")) do + format_text(changeset, :comments) + end + end + end + end + revision_container.with_row(flex_layout: true, classes: "work-packages-activities-tab-revision-component--stem-line-container") do |stem_line_container| + stem_line_container.with_column(border: :left, classes: "work-packages-activities-tab-revision-component--stem-line") + end + end + end +%> \ No newline at end of file diff --git a/app/components/work_packages/activities_tab/journals/revision_component.rb b/app/components/work_packages/activities_tab/journals/revision_component.rb new file mode 100644 index 000000000000..666d1df7a399 --- /dev/null +++ b/app/components/work_packages/activities_tab/journals/revision_component.rb @@ -0,0 +1,127 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2023 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +require "sanitize" + +module WorkPackages + module ActivitiesTab + module Journals + class RevisionComponent < ApplicationComponent + include ApplicationHelper + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + + def initialize(changeset:, filter:) + super + + @changeset = changeset + @filter = filter + end + + def render_committer_name(committer) + render(Primer::Beta::Text.new(font_weight: :bold, mr: 1)) do + remove_email_addresses(committer) + end + end + + def remove_email_addresses(committer) + return "" if committer.blank? + + ERB::Util.html_escape( + Sanitize.fragment( + committer.gsub(%r{<[^>]+@[^>]+>}, ""), + Sanitize::Config::RESTRICTED + ).strip + ) + end + + private + + attr_reader :changeset, :filter + + def render? + filter != :only_comments + end + + def user_name + if changeset.user + changeset.user.name + else + # Extract name from committer string (format: "name ") + changeset.committer.split("<").first.strip + end + end + + def revision_url + repository = changeset.repository + project = repository.project + + show_revision_project_repository_path(project_id: project.id, rev: changeset.revision) + end + + def short_revision + changeset.revision[0..7] + end + + def copy_url_action_item(menu) + menu.with_item(label: t("button_copy_link_to_clipboard"), + tag: :button, + content_arguments: { + data: { + action: "click->work-packages--activities-tab--item#copyActivityUrlToClipboard" + } + }) do |item| + item.with_leading_visual_icon(icon: :copy) + end + end + + def render_user_name + if changeset.user + render_user_link(changeset.user) + else + render_committer_name(changeset.committer) + end + end + + def render_user_link(user) + render(Primer::Beta::Link.new( + href: user_url(user), + target: "_blank", + scheme: :primary, + underline: false, + font_weight: :bold + )) do + changeset.user.name + end + end + end + end + end +end diff --git a/app/components/work_packages/activities_tab/journals/revision_component.sass b/app/components/work_packages/activities_tab/journals/revision_component.sass new file mode 100644 index 000000000000..cb7dd8bd956a --- /dev/null +++ b/app/components/work_packages/activities_tab/journals/revision_component.sass @@ -0,0 +1,7 @@ +.work-packages-activities-tab-revision-component + &--header + min-height: 32px + &--stem-line-container + min-height: 20px + &--stem-line + margin-left: 19px \ No newline at end of file diff --git a/app/components/work_packages/activities_tab/shared_helpers.rb b/app/components/work_packages/activities_tab/shared_helpers.rb index 4540142cf74b..c10dc1d1907a 100644 --- a/app/components/work_packages/activities_tab/shared_helpers.rb +++ b/app/components/work_packages/activities_tab/shared_helpers.rb @@ -31,15 +31,31 @@ module WorkPackages module ActivitiesTab module SharedHelpers - def truncated_user_name(user) + def truncated_user_name(user, hover_card: false) + helpers.primer_link_to_user(user, scheme: :primary, font_weight: :bold, hover_card:) + end + + def activity_anchor_link(journal) render(Primer::Beta::Link.new( - href: user_url(user), - target: "_blank", - scheme: :primary, + href: activity_url(journal), + scheme: :secondary, underline: false, - font_weight: :bold + font_size: :small, + data: { + test_selector: "activity-anchor-link", + turbo: false, + action: "click->work-packages--activities-tab--index#setAnchor:prevent", + "work-packages--activities-tab--index-id-param": journal_activity_id(journal), + "work-packages--activities-tab--index-anchor-name-param": activity_anchor_name + } )) do - user.name + block_given? ? yield : "##{journal_activity_id(journal)}" + end + end + + def journal_updated_at_formatted_time(journal) + render(Primer::Beta::Text.new(font_size: :small, color: :subtle, mt: 1)) do + format_time(journal.updated_at) end end @@ -52,7 +68,19 @@ def activity_url(journal) end def activity_anchor(journal) - "#activity-#{journal.sequence_version}" + "##{activity_anchor_name}-#{journal_activity_id(journal)}" + end + + def activity_anchor_name + OpenProject::FeatureDecisions.work_package_comment_id_url_active? ? "comment" : "activity" + end + + def journal_activity_id(journal) + if OpenProject::FeatureDecisions.work_package_comment_id_url_active? + journal.id + else + journal.sequence_version + end end end end diff --git a/app/components/work_packages/details/tab_component.rb b/app/components/work_packages/details/tab_component.rb index 741792ef3968..04164e4c72f6 100644 --- a/app/components/work_packages/details/tab_component.rb +++ b/app/components/work_packages/details/tab_component.rb @@ -26,8 +26,8 @@ def menu_items .root .children .select do |node| - allowed_node?(node, User.current, project) && visible_node?(menu, node) - end + allowed_node?(node, User.current, project) && visible_node?(menu, node) + end end def full_screen_tab diff --git a/app/components/work_packages/dialogs/create_dialog_component.html.erb b/app/components/work_packages/dialogs/create_dialog_component.html.erb new file mode 100644 index 000000000000..b4643d2d5105 --- /dev/null +++ b/app/components/work_packages/dialogs/create_dialog_component.html.erb @@ -0,0 +1,39 @@ +<%= + render(Primer::Alpha::Dialog.new( + id: "create-work-package-dialog", + title: I18n.t(:label_work_package_new), + size: :xlarge, + data: { + 'keep-open-on-submit': true, + } + )) do |dialog| + dialog.with_header(variant: :large) + dialog.with_body do + render(WorkPackages::Dialogs::CreateFormComponent.new(work_package:, project:)) + end + + dialog.with_footer do + component_collection do |modal_footer| + modal_footer.with_component( + Primer::ButtonComponent.new( + data: { 'close-dialog-id': "create-work-package-dialog" } + )) do + I18n.t(:button_cancel) + end + + modal_footer.with_component( + Primer::ButtonComponent.new( + scheme: :primary, + form: "create-work-package-form", + type: :submit + )) do + if @work_package.persisted? + I18n.t(:button_save) + else + I18n.t(:button_create) + end + end + end + end + end +%> diff --git a/app/components/work_packages/dialogs/create_dialog_component.rb b/app/components/work_packages/dialogs/create_dialog_component.rb new file mode 100644 index 000000000000..063ed886e13a --- /dev/null +++ b/app/components/work_packages/dialogs/create_dialog_component.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module WorkPackages::Dialogs + class CreateDialogComponent < ApplicationComponent + include ApplicationHelper + include OpenProject::FormTagHelper + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + attr_reader :work_package, :project + + def initialize(work_package:, project:) + super + + @work_package = work_package + @project = project + end + end +end diff --git a/app/components/work_packages/dialogs/create_form_component.html.erb b/app/components/work_packages/dialogs/create_form_component.html.erb new file mode 100644 index 000000000000..2f8a1fdb6614 --- /dev/null +++ b/app/components/work_packages/dialogs/create_form_component.html.erb @@ -0,0 +1,30 @@ +<%= + component_wrapper do + primer_form_with( + scope: :work_package, + model: work_package, + url: project_work_packages_dialog_path(project), + method: :post, + html: { + id: 'create-work-package-form', + data: { + controller: "work-packages--create-dialog", + application_target: "dynamic", + "work-packages--create-dialog-refresh-url-value": refresh_form_project_work_packages_dialog_path(project) + } + } + ) do |f| + flex_layout(mb: 3) do |modal_body| + if work_package.errors[:base].present? + modal_body.with_row do + render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { work_package.errors[:base].join("\n") } + end + end + + modal_body.with_row do + render(WorkPackages::Dialogs::CreateForm.new(f, work_package:, wrapper_id: "#create-work-package-dialog")) + end + end + end + end +%> diff --git a/app/components/work_packages/dialogs/create_form_component.rb b/app/components/work_packages/dialogs/create_form_component.rb new file mode 100644 index 000000000000..7235d65b27cb --- /dev/null +++ b/app/components/work_packages/dialogs/create_form_component.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module WorkPackages::Dialogs + class CreateFormComponent < ApplicationComponent + include ApplicationHelper + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + attr_reader :work_package, :project + + def initialize(work_package:, project:) + super + + @work_package = work_package + @project = project + end + end +end diff --git a/app/components/work_packages/hover_card_component.html.erb b/app/components/work_packages/hover_card_component.html.erb index 5b11c6009870..5b3d8c255576 100644 --- a/app/components/work_packages/hover_card_component.html.erb +++ b/app/components/work_packages/hover_card_component.html.erb @@ -15,7 +15,13 @@ grid.with_area(:assignee, tag: :div, font_size: :small, color: :muted) do if @assignee.present? - render(Users::AvatarComponent.new(user: @assignee, show_name: true, link: false, size: :mini, classes: "op-wp-hover-card--principal")) + # Render the avatar without a hover card => opening another hover card within a hover card is not supported + render(Users::AvatarComponent.new(user: @assignee, + show_name: true, + link: false, + size: :mini, + classes: "op-wp-hover-card--principal", + hover_card: { active: false })) else concat(render(Primer::Beta::Octicon.new(icon: :person, mr: 1))) concat(render(Primer::Beta::Text.new) { "-" }) diff --git a/app/components/work_packages/types/pattern_input.html.erb b/app/components/work_packages/types/pattern_input.html.erb new file mode 100644 index 000000000000..281602778d80 --- /dev/null +++ b/app/components/work_packages/types/pattern_input.html.erb @@ -0,0 +1,93 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render( + FormControl.new( + input: @input, + classes: "pattern-input", + "data-controller": "pattern-input", + "data-pattern-input-pattern-initial-value": @value, + "data-pattern-input-suggestions-initial-value": suggestions_for_stimulus + ) + ) do +%> + <%= @input.builder.hidden_field(name, value: @value, data: { "pattern-input-target": "formInput" }) %> + + + + + + + + + + <%= + render( + Primer::BaseComponent.new( + tag: :div, + contenteditable: true, + border: true, border_radius: 2, p: 1, classes: :input, + "data-pattern-input-target": "content", + data: { + action: "keydown->pattern-input#input_keydown + input->pattern-input#input_change + mouseup->pattern-input#input_mouseup + focus->pattern-input#input_focus + blur->pattern-input#input_blur" + } + ) + ) + %> + <%= render(Primer::BaseComponent.new(tag: :div, box_shadow: :medium, border_radius: 2)) do %> + + <%= render(suggestions_list_component) %> + + <% end %> +<% end %> diff --git a/app/components/work_packages/types/pattern_input.rb b/app/components/work_packages/types/pattern_input.rb new file mode 100644 index 000000000000..87c9d4cc14f7 --- /dev/null +++ b/app/components/work_packages/types/pattern_input.rb @@ -0,0 +1,57 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Types + class PatternInput < Primer::Forms::BaseComponent + delegate :name, to: :@input + + def initialize(input:, value:, suggestions:) + super() + @input = input + @value = value + @suggestions = suggestions + end + + def suggestions_for_stimulus + @suggestions_for_stimulus ||= @suggestions + .transform_keys { |key| key.to_s.humanize } + .to_json + end + + def suggestions_list_component + @suggestions_list_component ||= Primer::Alpha::ActionList.new( + role: :list, + "data-pattern-input-target": "suggestions" + ) + end + end + end +end diff --git a/app/components/work_packages/types/pattern_input.sass b/app/components/work_packages/types/pattern_input.sass new file mode 100644 index 000000000000..feafed48d007 --- /dev/null +++ b/app/components/work_packages/types/pattern_input.sass @@ -0,0 +1,4 @@ +.pattern-input + .input + white-space: pre-wrap + diff --git a/app/components/work_packages/types/settings_component.html.erb b/app/components/work_packages/types/settings_component.html.erb new file mode 100644 index 000000000000..f9c74101ee83 --- /dev/null +++ b/app/components/work_packages/types/settings_component.html.erb @@ -0,0 +1,34 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + primer_form_with(**form_options) do |f| + render(WorkPackages::Types::SettingsForm.new(f)) + end +%> diff --git a/app/components/work_packages/types/settings_component.rb b/app/components/work_packages/types/settings_component.rb new file mode 100644 index 000000000000..948af9a38df4 --- /dev/null +++ b/app/components/work_packages/types/settings_component.rb @@ -0,0 +1,63 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module WorkPackages + module Types + class SettingsComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + + def initialize(model, copy_workflow_from: nil, **) + @copy_workflow_from = copy_workflow_from + super(model, **) + end + + def form_options + if model.new_record? + create_form_options + else + update_form_options + end + end + + private + + attr_reader :copy_workflow_from + + def create_form_options + { url: types_path, method: :post, model:, copy_workflow_from: } + end + + def update_form_options + { url: type_path(id: model.id), method: :patch, model: } + end + end + end +end diff --git a/app/components/work_packages/types/subject_configuration_component.html.erb b/app/components/work_packages/types/subject_configuration_component.html.erb index 95792457632a..6597b015094e 100644 --- a/app/components/work_packages/types/subject_configuration_component.html.erb +++ b/app/components/work_packages/types/subject_configuration_component.html.erb @@ -27,6 +27,10 @@ See COPYRIGHT and LICENSE files for more details. ++#%> +<%= + render(EnterpriseEdition::BannerComponent.new(:automatic_subject_generation, mb: 3)) +%> + <%= primer_form_with(**form_options) do |f| render(WorkPackages::Types::SubjectConfigurationForm.new(f)) diff --git a/app/components/work_packages/types/subject_configuration_component.rb b/app/components/work_packages/types/subject_configuration_component.rb index 88850e1b7e9d..b4688b84f772 100644 --- a/app/components/work_packages/types/subject_configuration_component.rb +++ b/app/components/work_packages/types/subject_configuration_component.rb @@ -35,17 +35,32 @@ class SubjectConfigurationComponent < ApplicationComponent include OpTurbo::Streamable def form_options + form_model = subject_form_object + { - url: "https://example.com", + url: subject_configuration_type_path(id: model.id), method: :put, - model:, + model: form_model, data: { application_target: "dynamic", controller: "admin--subject-configuration", - admin__subject_configuration_hide_pattern_input_value: true + admin__subject_configuration_hide_pattern_input_value: form_model.subject_configuration == :manual } } end + + private + + def subject_form_object + subject_pattern = model.patterns.subject || ::Types::Pattern.new(blueprint: "", enabled: false) + + ::Types::Forms::SubjectConfigurationFormModel.new( + subject_configuration: subject_pattern.enabled ? :generated : :manual, + pattern: subject_pattern.blueprint, + suggestions: ::Types::Patterns::TokenPropertyMapper.new.tokens_for_type(model), + validation_errors: model.errors + ) + end end end end diff --git a/app/contracts/project_life_cycle_steps/base_contract.rb b/app/contracts/project_life_cycle_steps/base_contract.rb index 9e4124d06e63..62ea58b57212 100644 --- a/app/contracts/project_life_cycle_steps/base_contract.rb +++ b/app/contracts/project_life_cycle_steps/base_contract.rb @@ -31,9 +31,7 @@ class BaseContract < ::ModelContract validate :select_custom_fields_permission validate :consecutive_steps_have_increasing_dates - def valid?(context = :saving_life_cycle_steps) - super - end + def valid?(context = :saving_life_cycle_steps) = super def select_custom_fields_permission return if user.allowed_in_project?(:edit_project_stages_and_gates, model) diff --git a/app/contracts/projects/base_contract.rb b/app/contracts/projects/base_contract.rb index 8b8fa1911614..614b6acb2480 100644 --- a/app/contracts/projects/base_contract.rb +++ b/app/contracts/projects/base_contract.rb @@ -57,6 +57,8 @@ class BaseContract < ::ModelContract validate :validate_user_allowed_to_manage + def valid?(context = :saving_custom_fields) = super + def assignable_parents Project .allowed_to(user, :add_subprojects) diff --git a/app/contracts/relations/base_contract.rb b/app/contracts/relations/base_contract.rb index 82c4d5edc2ed..cf6d293eb685 100644 --- a/app/contracts/relations/base_contract.rb +++ b/app/contracts/relations/base_contract.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -34,7 +36,7 @@ class BaseContract < ::ModelContract attribute :from attribute :to - validate :manage_relations_permission? + validate :validate_user_allowed validate :validate_from_exists validate :validate_to_exists validate :validate_nodes_relatable @@ -47,16 +49,22 @@ def self.model private def validate_from_exists - errors.add :from, :error_not_found unless visible_work_packages.exists? model.from_id + errors.add :from_id, :error_not_found unless visible_work_packages.exists? model.from_id end def validate_to_exists - errors.add :to, :error_not_found unless visible_work_packages.exists? model.to_id + errors.add :to_id, :error_not_found unless visible_work_packages.exists? model.to_id end def validate_nodes_relatable - if (model.from_id_changed? || model.to_id_changed?) && - WorkPackage.relatable(model.from, model.relation_type, ignored_relation: model).where(id: model.to_id).empty? + # when creating a relation from the work package relations tab and not selecting a WorkPackage + # the to_id is not set + # in this case we only want to show the "WorkPackage can't be blank" error instead of a + # misleading circular dependencies error + # the error is added by the `validate_from_exists` and `validate_to_exists` methods + return if to_id_or_from_id_nil? + + if relation_changed? && circular_dependency? errors.add :base, I18n.t(:"activerecord.errors.messages.circular_dependency") end end @@ -67,12 +75,26 @@ def validate_accepted_type errors.add :relation_type, :inclusion end - def manage_relations_permission? + def validate_user_allowed + return if model.to_id.nil? || model.from_id.nil? + unless manage_relations? errors.add :base, :error_unauthorized end end + def to_id_or_from_id_nil? + model.to_id.nil? || model.from_id.nil? + end + + def relation_changed? + model.from_id_changed? || model.to_id_changed? + end + + def circular_dependency? + WorkPackage.relatable(model.from, model.relation_type, ignored_relation: model).where(id: model.to_id).empty? + end + def visible_work_packages ::WorkPackage.visible(user) end diff --git a/app/contracts/relations/update_contract.rb b/app/contracts/relations/update_contract.rb index 78be6df8ff63..401836b9d4a4 100644 --- a/app/contracts/relations/update_contract.rb +++ b/app/contracts/relations/update_contract.rb @@ -34,11 +34,11 @@ class UpdateContract < BaseContract private def from_immutable - errors.add :from, :error_readonly if from_id_changed_and_not_swapped? + errors.add :from_id, :error_readonly if from_id_changed_and_not_swapped? end def to_immutable - errors.add :to, :error_readonly if to_id_changed_and_not_swapped? + errors.add :to_id, :error_readonly if to_id_changed_and_not_swapped? end def from_id_changed_and_not_swapped? diff --git a/app/contracts/types/base_contract.rb b/app/contracts/types/base_contract.rb index 5f8c5b02db95..4f189e300fd2 100644 --- a/app/contracts/types/base_contract.rb +++ b/app/contracts/types/base_contract.rb @@ -42,6 +42,7 @@ def self.model attribute :project_ids attribute :description attribute :attribute_groups + attribute :patterns validate :validate_current_user_is_admin validate :validate_attribute_group_names diff --git a/app/controllers/admin/custom_fields/custom_field_projects_controller.rb b/app/controllers/admin/custom_fields/custom_field_projects_controller.rb index 3d7dbcd33702..390ad5ddf7fc 100644 --- a/app/controllers/admin/custom_fields/custom_field_projects_controller.rb +++ b/app/controllers/admin/custom_fields/custom_field_projects_controller.rb @@ -58,7 +58,7 @@ def new def create create_service = ::CustomFields::CustomFieldProjects::BulkCreateService - .new(user: current_user, projects: @projects, custom_field: @custom_field, + .new(user: current_user, projects: @projects, model: @custom_field, include_sub_projects: include_sub_projects?) .call diff --git a/app/controllers/admin/custom_fields/hierarchy/items_controller.rb b/app/controllers/admin/custom_fields/hierarchy/items_controller.rb index 2b27fba7eafd..731de1b0c886 100644 --- a/app/controllers/admin/custom_fields/hierarchy/items_controller.rb +++ b/app/controllers/admin/custom_fields/hierarchy/items_controller.rb @@ -104,7 +104,7 @@ def destroy .delete_branch(item: @active_item) .either( ->(_) { update_via_turbo_stream(component: ItemsComponent.new(item: @active_item.parent)) }, - ->(errors) { update_flash_message_via_turbo_stream(message: errors.full_messages, scheme: :danger) } + ->(errors) { render_error_flash_message_via_turbo_stream(message: errors.full_messages) } ) respond_with_turbo_streams(&:html) diff --git a/app/controllers/admin/settings/project_custom_fields_controller.rb b/app/controllers/admin/settings/project_custom_fields_controller.rb index 4c2bfce929d9..0786974f7b17 100644 --- a/app/controllers/admin/settings/project_custom_fields_controller.rb +++ b/app/controllers/admin/settings/project_custom_fields_controller.rb @@ -82,7 +82,7 @@ def new_link def link create_service = ProjectCustomFieldProjectMappings::BulkCreateService - .new(user: current_user, projects: @projects, project_custom_field: @custom_field, + .new(user: current_user, projects: @projects, model: @custom_field, include_sub_projects: include_sub_projects?) .call diff --git a/app/controllers/admin/settings/project_life_cycle_step_definitions_controller.rb b/app/controllers/admin/settings/project_life_cycle_step_definitions_controller.rb new file mode 100644 index 000000000000..363e8038a7d0 --- /dev/null +++ b/app/controllers/admin/settings/project_life_cycle_step_definitions_controller.rb @@ -0,0 +1,145 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin::Settings + class ProjectLifeCycleStepDefinitionsController < ::Admin::SettingsController + include FlashMessagesOutputSafetyHelper + include OpTurbo::ComponentStream + include Projects::LifeCycleDefinitionHelper + + menu_item :project_life_cycle_step_definitions_settings + + before_action :check_feature_flag + before_action :require_enterprise_token, except: %i[index] + + before_action :find_definitions, only: %i[index] + before_action :find_definition, only: %i[edit update destroy move drop] + + def index; end + + def new_stage + @definition = Project::StageDefinition.new + + render :form + end + + def new_gate + @definition = Project::GateDefinition.new + + render :form + end + + def edit + render :form + end + + def create + @definition = Project::LifeCycleStepDefinition.new(definition_params) + + if @definition.save + flash[:notice] = I18n.t(:notice_successful_create) + redirect_to action: :index, status: :see_other + else + render :form, status: :unprocessable_entity + end + end + + def update + if @definition.update(definition_params) + flash[:notice] = I18n.t(:notice_successful_update) + redirect_to action: :index, status: :see_other + else + render :form, status: :unprocessable_entity + end + end + + def destroy + if @definition.destroy + render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_delete)) + else + render_error_flash_message_via_turbo_stream(message: join_flash_messages(@definition.errors.full_messages)) + end + + update_definitions_via_turbo_stream + + respond_to_with_turbo_streams + end + + def move + unless @definition.update(params.permit(:move_to)) + render_error_flash_message_via_turbo_stream(message: join_flash_messages(@definition.errors.full_messages)) + end + + update_definitions_via_turbo_stream + + respond_to_with_turbo_streams + end + + def drop + unless @definition.update(params.permit(:position)) + render_error_flash_message_via_turbo_stream(message: join_flash_messages(@definition.errors.full_messages)) + end + + update_definitions_via_turbo_stream + + respond_to_with_turbo_streams + end + + private + + def check_feature_flag + render_404 unless OpenProject::FeatureDecisions.stages_and_gates_active? + end + + def require_enterprise_token + render_402 unless allowed_to_customize_life_cycle? + end + + def find_definitions + @definitions = Project::LifeCycleStepDefinition.with_project_count + end + + def find_definition + @definition = Project::LifeCycleStepDefinition.find(params[:id]) + end + + def definition_params + params.require(:project_life_cycle_step_definition).permit(:type, :name, :color_id) + end + + def update_definitions_via_turbo_stream + update_via_turbo_stream( + component: Settings::ProjectLifeCycleStepDefinitions::IndexComponent.new( + definitions: find_definitions + ) + ) + end + end +end diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 8a554ac032f1..790cdd4504a8 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -43,7 +43,7 @@ def index condition = node.condition name === :admin_overview || - (condition && !condition.call) || + (condition && !condition.call(nil)) || hidden_admin_menu_items.include?(name.to_s) end diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 609198f726f0..657e26c11165 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -345,7 +345,7 @@ def back_url params[:back_url] || request.env["HTTP_REFERER"] end - def redirect_back_or_default(default, use_escaped = true) + def redirect_back_or_default(default, use_escaped: true, status: :found) policy = RedirectPolicy.new( params[:back_url], hostname: request.host, @@ -353,7 +353,7 @@ def redirect_back_or_default(default, use_escaped = true) return_escaped: use_escaped ) - redirect_to policy.redirect_url + redirect_to(policy.redirect_url, status:) end # Picks which layout to use based on the request diff --git a/app/controllers/concerns/op_turbo/component_stream.rb b/app/controllers/concerns/op_turbo/component_stream.rb index f7cd5e1369bc..ed75e2d01139 100644 --- a/app/controllers/concerns/op_turbo/component_stream.rb +++ b/app/controllers/concerns/op_turbo/component_stream.rb @@ -75,11 +75,15 @@ def add_before_via_turbo_stream(component:, target_component:) turbo_streams << target_component.insert_as_turbo_stream(component:, view_context:, action: :before) end + def render_success_flash_message_via_turbo_stream(**) + render_flash_message_via_turbo_stream(**, scheme: :success) + end + def render_error_flash_message_via_turbo_stream(**) - update_flash_message_via_turbo_stream(**, scheme: :danger, icon: :stop) + render_flash_message_via_turbo_stream(**, scheme: :danger, icon: :stop) end - def update_flash_message_via_turbo_stream(message:, component: OpPrimer::FlashComponent, **) + def render_flash_message_via_turbo_stream(message:, component: OpPrimer::FlashComponent, **) instance = component.new(**).with_content(message) turbo_streams << instance.render_as_turbo_stream(view_context:, action: :flash) end @@ -96,6 +100,10 @@ def add_caption_to_input_element_via_turbo_stream(target, caption:, clean_other_ .render_in(view_context) end + def close_dialog_via_turbo_stream(target) + turbo_streams << OpTurbo::StreamComponent.new(action: :closeDialog, target:).render_in(view_context) + end + def turbo_streams @turbo_streams ||= [] end diff --git a/app/models/types/pattern_collection_contract.rb b/app/controllers/concerns/projects/life_cycle_definition_helper.rb similarity index 84% rename from app/models/types/pattern_collection_contract.rb rename to app/controllers/concerns/projects/life_cycle_definition_helper.rb index 2a8e7c16a1e1..76cc76672e34 100644 --- a/app/models/types/pattern_collection_contract.rb +++ b/app/controllers/concerns/projects/life_cycle_definition_helper.rb @@ -28,13 +28,10 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Types - class PatternCollectionContract < Dry::Validation::Contract - params do - required(:subject).hash do - required(:blueprint).filled(:string) - required(:enabled).filled(:bool) - end - end +module Projects::LifeCycleDefinitionHelper + private + + def allowed_to_customize_life_cycle? + EnterpriseToken.allows_to?(:customize_life_cycle) end end diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb index c46d8cb09eee..57f61b721967 100644 --- a/app/controllers/types_controller.rb +++ b/app/controllers/types_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -60,19 +62,17 @@ def edit end end - def create # rubocop:disable Metrics/AbcSize + def create CreateTypeService .new(current_user) - .call(permitted_type_params, copy_workflow_from: params[:copy_workflow_from]) do |call| + .call(permitted_type_params, copy_workflow_from: params.dig(:type, :copy_workflow_from)) do |call| @type = call.result call.on_success do redirect_to_type_tab_path(@type, t(:notice_successful_create)) end - call.on_failure do |result| - flash[:error] = result.errors.full_messages.join("\n") - load_projects_and_types + call.on_failure do render action: :new, status: :unprocessable_entity end end @@ -135,8 +135,7 @@ def load_projects_and_types def redirect_to_type_tab_path(type, notice) tab = params["tab"] || "settings" - redirect_to(edit_type_tab_path(type, tab:), - notice:) + redirect_to(edit_tab_type_path(type, tab:), notice:, status: :see_other) end def render_edit_tab(type, status: :ok) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index d667d29e9c42..cb9165920828 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -148,17 +150,17 @@ def change_status_info render_400 unless %i(activate lock unlock).include? @status_change end - def change_status + def change_status # rubocop:disable Metrics/AbcSize if @user.id == current_user.id # user is not allowed to change own status - redirect_back_or_default(action: "edit", id: @user) + redirect_back_or_default({ action: "edit", id: @user }) return end if (params[:unlock] || params[:activate]) && user_limit_reached? show_user_limit_error! - return redirect_back_or_default(action: "edit", id: @user) + return redirect_back_or_default({ action: "edit", id: @user }) end if params[:unlock] @@ -184,7 +186,7 @@ def change_status flash[:error] = I18n.t("user.error_status_change_failed", errors: @user.errors.full_messages.join(", ")) end - redirect_back_or_default(action: "edit", id: @user) + redirect_back_or_default({ action: "edit", id: @user }) end def resend_invitation diff --git a/app/controllers/wiki_menu_items_controller.rb b/app/controllers/wiki_menu_items_controller.rb index 51ad5b23af87..5a6950474d1f 100644 --- a/app/controllers/wiki_menu_items_controller.rb +++ b/app/controllers/wiki_menu_items_controller.rb @@ -101,7 +101,7 @@ def update # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity flash[:notice] = t(:notice_successful_update) end - redirect_back_or_default(action: "edit", id: @page) + redirect_back_or_default({ action: "edit", id: @page }) else respond_to do |format| format.html do diff --git a/app/controllers/work_package_children_relations_controller.rb b/app/controllers/work_package_children_relations_controller.rb index 539961766bbe..4feff06746b6 100644 --- a/app/controllers/work_package_children_relations_controller.rb +++ b/app/controllers/work_package_children_relations_controller.rb @@ -43,8 +43,16 @@ def new end def create - child = WorkPackage.find(params[:work_package][:id]) - service_result = set_relation(child:, parent: @work_package) + service_result = create_service_result + + if service_result.failure? + update_via_turbo_stream( + component: WorkPackageRelationsTab::AddWorkPackageChildFormComponent.new(work_package: @work_package, + child: service_result.result, + base_errors: service_result.errors[:base]), + status: :bad_request + ) + end respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result) end @@ -58,6 +66,17 @@ def destroy private + def create_service_result + if params[:work_package][:id].present? + child = WorkPackage.find(params[:work_package][:id]) + set_relation(child:, parent: @work_package) + else + child = WorkPackage.new + child.errors.add(:id, :blank) + ServiceResult.failure(result: child) + end + end + def set_relation(child:, parent:) WorkPackages::UpdateService.new(user: current_user, model: child) .call(parent:) @@ -66,16 +85,9 @@ def set_relation(child:, parent:) def respond_with_relations_tab_update(service_result, **) if service_result.success? @work_package.reload - component = WorkPackageRelationsTab::IndexComponent.new( - work_package: @work_package, - relations: @work_package.relations.visible, - children: @work_package.children.visible, - ** - ) + component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, **) replace_via_turbo_stream(component:) - update_flash_message_via_turbo_stream( - message: I18n.t(:notice_successful_update), scheme: :success - ) + render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_update)) respond_with_turbo_streams else diff --git a/app/controllers/work_package_relations_controller.rb b/app/controllers/work_package_relations_controller.rb index 02e7f68b0134..e949dec17589 100644 --- a/app/controllers/work_package_relations_controller.rb +++ b/app/controllers/work_package_relations_controller.rb @@ -59,17 +59,16 @@ def create service_result = Relations::CreateService.new(user: current_user) .call(create_relation_params) - if service_result.success? - @work_package.reload - component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, - relations: @work_package.relations.visible, - children: @work_package.children.visible, - relation_to_scroll_to: service_result.result) - replace_via_turbo_stream(component:) - respond_with_turbo_streams - else - respond_with_turbo_streams(status: :unprocessable_entity) + if service_result.failure? + update_via_turbo_stream( + component: WorkPackageRelationsTab::WorkPackageRelationFormComponent.new(work_package: @work_package, + relation: service_result.result, + base_errors: service_result.errors[:base]), + status: :bad_request + ) end + + respond_with_relations_tab_update(service_result, relation_to_scroll_to: service_result.result) end def update @@ -78,41 +77,39 @@ def update model: @relation) .call(update_relation_params) - if service_result.success? - @work_package.reload - component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, - relations: @work_package.relations.visible, - children: @work_package.children.visible) - replace_via_turbo_stream(component:) - respond_with_turbo_streams - else - respond_with_turbo_streams(status: :unprocessable_entity) + respond_with_relations_tab_update(service_result) + + if service_result.failure? + update_via_turbo_stream( + component: WorkPackageRelationsTab::WorkPackageRelationFormComponent.new(work_package: @work_package, + relation: service_result.result, + base_errors: service_result.errors[:base]), + status: :bad_request + ) end end def destroy service_result = Relations::DeleteService.new(user: current_user, model: @relation).call + respond_with_relations_tab_update(service_result) + end + + private + + def respond_with_relations_tab_update(service_result, **) if service_result.success? - @children = WorkPackage.where(parent_id: @work_package.id).visible - @relations = @work_package - .relations - .reload - .includes(:to, :from) - .visible - - component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, - relations: @relations, - children: @children) + @work_package.reload + component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package, **) replace_via_turbo_stream(component:) + render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_update)) + respond_with_turbo_streams else respond_with_turbo_streams(status: :unprocessable_entity) end end - private - def set_work_package @work_package = WorkPackage.find(params[:work_package_id]) end @@ -122,9 +119,15 @@ def set_relation end def create_relation_params - params.require(:relation) - .permit(:relation_type, :to_id, :description, :lag) - .merge(from_id: @work_package.id) + if params[:relation][:from_id].present? + params.require(:relation) + .permit(:relation_type, :from_id, :description, :lag) + .merge(to_id: @work_package.id) + else + params.require(:relation) + .permit(:relation_type, :to_id, :description, :lag) + .merge(from_id: @work_package.id) + end end def update_relation_params diff --git a/app/controllers/work_package_relations_tab_controller.rb b/app/controllers/work_package_relations_tab_controller.rb index f457a67fd936..097b4b8296e5 100644 --- a/app/controllers/work_package_relations_tab_controller.rb +++ b/app/controllers/work_package_relations_tab_controller.rb @@ -33,17 +33,7 @@ class WorkPackageRelationsTabController < ApplicationController before_action :authorize_global def index - @children = WorkPackage.where(parent_id: @work_package.id).visible - @relations = @work_package - .relations - .visible - .includes(:to, :from) - - component = WorkPackageRelationsTab::IndexComponent.new( - work_package: @work_package, - relations: @relations, - children: @children - ) + component = WorkPackageRelationsTab::IndexComponent.new(work_package: @work_package) respond_to do |format| format.html do diff --git a/app/controllers/work_packages/bulk_controller.rb b/app/controllers/work_packages/bulk_controller.rb index f2938d63a950..54b072003da3 100644 --- a/app/controllers/work_packages/bulk_controller.rb +++ b/app/controllers/work_packages/bulk_controller.rb @@ -48,7 +48,7 @@ def update if @call.success? flash[:notice] = t(:notice_successful_update) - redirect_back_or_default(controller: "/work_packages", action: :index, project_id: @project) + redirect_back_or_default({ controller: "/work_packages", action: :index, project_id: @project }) else flash[:error] = bulk_error_message(@work_packages, @call) setup_edit diff --git a/app/controllers/work_packages/dialogs_controller.rb b/app/controllers/work_packages/dialogs_controller.rb new file mode 100644 index 000000000000..d3fdd1fbc931 --- /dev/null +++ b/app/controllers/work_packages/dialogs_controller.rb @@ -0,0 +1,105 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class WorkPackages::DialogsController < ApplicationController + include OpTurbo::ComponentStream + include OpTurbo::DialogStreamHelper + layout false + + before_action :find_project_by_project_id + before_action :build_work_package, only: %i[new] + + authorize_with_permission :add_work_packages + + def new + respond_with_dialog WorkPackages::Dialogs::CreateDialogComponent.new(work_package: @work_package, project: @project) + end + + def create + call = WorkPackages::CreateService.new(user: current_user).call(create_params) + + if call.success? + flash[:notice] = I18n.t("work_package_relations_tab.relations.label_new_child_created") + redirect_back fallback_location: project_work_package_path(@project, call.result), status: :see_other + else + form_component = WorkPackages::Dialogs::CreateFormComponent.new(work_package: call.result, project: @project) + update_via_turbo_stream(component: form_component, status: :bad_request) + + respond_with_turbo_streams + end + end + + def refresh_form + call = WorkPackages::SetAttributesService.new( + user: current_user, + model: WorkPackage.new, + contract_class: EmptyContract + ).call(create_params) + + form_component = WorkPackages::Dialogs::CreateFormComponent.new(work_package: call.result, project: @project) + update_via_turbo_stream(component: form_component) + + respond_with_turbo_streams + end + + private + + def build_work_package + initial = WorkPackage.new(project: @project) + + call = WorkPackages::SetAttributesService + .new(model: initial, user: current_user, contract_class: WorkPackages::CreateContract) + .call(new_params.reverse_merge(default_params(initial))) + + # We ignore errors here, as we only want to build the work package + @work_package = call.result + @work_package.errors.clear + @work_package.custom_values.each { |cv| cv.errors.clear } + end + + def new_params + params.permit(*PermittedParams.permitted_attributes[:new_work_package]) + end + + def create_params + permitted_params.update_work_package.merge(project: @project) + end + + def default_params(work_package) + contract = WorkPackages::CreateContract.new(work_package, current_user) + + { + type: contract.assignable_types.first, + project: @project + } + end + + def default_breadcrumb; end +end diff --git a/app/controllers/work_packages/reminders_controller.rb b/app/controllers/work_packages/reminders_controller.rb index 7866147aea1d..0b4796824ab3 100644 --- a/app/controllers/work_packages/reminders_controller.rb +++ b/app/controllers/work_packages/reminders_controller.rb @@ -49,10 +49,7 @@ def create .call(reminder_params) if service_result.success? - update_flash_message_via_turbo_stream( - message: I18n.t("work_package.reminders.success_creation_message"), - scheme: :success - ) + render_success_flash_message_via_turbo_stream(message: I18n.t("work_package.reminders.success_creation_message")) respond_with_turbo_streams else prepare_errors_from_result(service_result) @@ -75,10 +72,7 @@ def update .call(reminder_params) if service_result.success? - update_flash_message_via_turbo_stream( - message: I18n.t("work_package.reminders.success_update_message"), - scheme: :success - ) + render_success_flash_message_via_turbo_stream(message: I18n.t("work_package.reminders.success_update_message")) respond_with_turbo_streams else prepare_errors_from_result(service_result) @@ -101,16 +95,10 @@ def destroy .call if service_result.success? - update_flash_message_via_turbo_stream( - message: I18n.t("work_package.reminders.success_deletion_message"), - scheme: :success - ) + render_success_flash_message_via_turbo_stream(message: I18n.t("work_package.reminders.success_deletion_message")) respond_with_turbo_streams else - update_flash_message_via_turbo_stream( - message: service_result.errors.full_messages, - scheme: :danger - ) + render_error_flash_message_via_turbo_stream(message: service_result.errors.full_messages) respond_with_turbo_streams(status: :unprocessable_entity) end end @@ -176,10 +164,7 @@ def find_reminder .upcoming_and_visible_to(User.current) .find(params[:id]) rescue ActiveRecord::RecordNotFound - update_flash_message_via_turbo_stream( - message: I18n.t(:error_reminder_not_found), - scheme: :danger - ) + render_error_flash_message_via_turbo_stream(message: I18n.t(:error_reminder_not_found)) respond_with_turbo_streams(status: :not_found) false end diff --git a/app/controllers/work_packages/split_view_controller.rb b/app/controllers/work_packages/split_view_controller.rb index 4a5a9057d95a..5e9389ebc26e 100644 --- a/app/controllers/work_packages/split_view_controller.rb +++ b/app/controllers/work_packages/split_view_controller.rb @@ -30,8 +30,8 @@ class WorkPackages::SplitViewController < ApplicationController # Authorization is checked in the find_work_package action - no_authorization_required! :update_counter - before_action :find_work_package, only: %i[update_counter] + no_authorization_required! :update_counter, :get_relations_counter + before_action :find_work_package def update_counter respond_to do |format| @@ -45,6 +45,10 @@ def update_counter end end + def get_relations_counter + render json: { count: WorkPackageRelationsTab::RelationsMediator.new(work_package: @work_package).all_relations_count } + end + private def find_work_package diff --git a/app/controllers/work_packages/types/subject_configuration_controller.rb b/app/controllers/work_packages/types/subject_configuration_controller.rb new file mode 100644 index 000000000000..240686626aa1 --- /dev/null +++ b/app/controllers/work_packages/types/subject_configuration_controller.rb @@ -0,0 +1,93 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module WorkPackages + module Types + class SubjectConfigurationController < ApplicationController + layout "admin" + + before_action :require_admin + before_action :find_type, only: %i[update_subject_configuration] + + def update_subject_configuration + form_params = params.require(:types_forms_subject_configuration_form_model) + .permit(:subject_configuration, :pattern) + .to_h + + UpdateTypeService.new(@type, current_user) + .call({ patterns: pattern_collection_update(form_params) }) do |call| + call.on_success do + redirect_to tab_path, notice: I18n.t(:notice_successful_update) + end + + call.on_failure do + @default_tab = "subject_configuration" + render template: "types/edit", status: :unprocessable_entity + end + end + end + + private + + def find_type + @type = ::Type.find(params[:id]) + end + + def tab_path = edit_tab_type_path(id: @type.id, tab: :subject_configuration) + + def pattern_collection_update(form_params) + patterns = @type.patterns.to_h.symbolize_keys + + subject_pattern = + case form_params + in { subject_configuration: "generated", pattern: String => blueprint } + { subject: { blueprint:, enabled: true } } + in { subject_configuration: "manual", pattern: String => blueprint } + if blueprint.empty? + # Submitting the form with an empty blueprint and manual subject configuration will + # remove the subject pattern from the collection + nil + else + { subject: { blueprint:, enabled: false } } + end + else + nil + end + + if subject_pattern.nil? + patterns.delete(:subject) + patterns + else + patterns.merge(subject_pattern) + end + end + end + end +end diff --git a/app/controllers/work_packages_controller.rb b/app/controllers/work_packages_controller.rb index 81e3613a662e..36e8a12f8a15 100644 --- a/app/controllers/work_packages_controller.rb +++ b/app/controllers/work_packages_controller.rb @@ -109,7 +109,7 @@ def generate_pdf def show_conflict_flash_message scheme = params[:scheme]&.to_sym || :danger - update_flash_message_via_turbo_stream( + render_flash_message_via_turbo_stream( component: WorkPackages::UpdateConflictComponent, scheme:, message: I18n.t("notice_locking_conflict_#{scheme}"), diff --git a/app/forms/custom_fields/custom_field_rendering.rb b/app/forms/custom_fields/custom_field_rendering.rb new file mode 100644 index 000000000000..7acd5f4ccb39 --- /dev/null +++ b/app/forms/custom_fields/custom_field_rendering.rb @@ -0,0 +1,112 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module CustomFields::CustomFieldRendering + include ActiveSupport::Concern + + def render_custom_fields(form:) + custom_fields.each do |custom_field| + form.fields_for(:custom_field_values) do |builder| + custom_field_input(builder, custom_field) + end + end + end + + # override if you want to pass more attributes + def additional_custom_field_input_arguments + {} + end + + def custom_fields + raise NotImplementedError, "#custom_fields method needs to be overwritten and provide all custom fields we want to show" + end + + private + + def custom_field_input(builder, custom_field) + if custom_field.multi_value? + multi_value_custom_field_input(builder, custom_field) + else + single_value_custom_field_input(builder, custom_field) + end + end + + def form_arguments(custom_field) + { + custom_field: custom_field, + object: model + }.merge(additional_custom_field_input_arguments) + end + + # TBD: transform inputs called below to primer form dsl instead of form classes? + # TODOS: + # - initial values for user inputs are not displayed + # - allow/disallow-non-open version setting is not yet respected in the version selector + # - rich text editor is not yet supported + # - hierarchy should not use a flat list + + def single_value_custom_field_input(builder, custom_field) + form_args = form_arguments(custom_field) + + case custom_field.field_format + when "string", "link" + CustomFields::Inputs::String.new(builder, **form_args) + when "text" + CustomFields::Inputs::Text.new(builder, **form_args) + when "int" + CustomFields::Inputs::Int.new(builder, **form_args) + when "float" + CustomFields::Inputs::Float.new(builder, **form_args) + when "hierarchy", "list" + CustomFields::Inputs::SingleSelectList.new(builder, **form_args) + when "date" + CustomFields::Inputs::Date.new(builder, **form_args) + when "bool" + CustomFields::Inputs::Bool.new(builder, **form_args) + when "user" + CustomFields::Inputs::SingleUserSelectList.new(builder, **form_args) + when "version" + CustomFields::Inputs::SingleVersionSelectList.new(builder, **form_args) + end + end + + def multi_value_custom_field_input(builder, custom_field) + form_args = form_arguments(custom_field) + + case custom_field.field_format + when "hierarchy", "list" + CustomFields::Inputs::MultiSelectList.new(builder, **form_args) + when "user" + CustomFields::Inputs::MultiUserSelectList.new(builder, **form_args) + when "version" + CustomFields::Inputs::MultiVersionSelectList.new(builder, **form_args) + end + end +end diff --git a/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb b/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb index db2fa302c4d5..e1b677dc42b1 100644 --- a/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb +++ b/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb @@ -40,6 +40,7 @@ def autocomplete_options { multiple: true, decorated: decorated?, + focusDirectly: false, append_to: } end diff --git a/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb b/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb index 3a9bf73dd15d..5f678025d266 100644 --- a/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb +++ b/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb @@ -40,6 +40,7 @@ def autocomplete_options { multiple: false, decorated: decorated?, + focusDirectly: false, append_to: } end diff --git a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb index e2d17241aed6..9f01f53464c6 100644 --- a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb +++ b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -51,10 +53,17 @@ def search_key end def filters - [ + filters = [ { name: "type", operator: "=", values: ["User", "Group", "PlaceholderUser"] }, - { name: "member", operator: "=", values: [@object.id.to_s] }, { name: "status", operator: "!", values: [Principal.statuses["locked"].to_s] } ] + + if @object.is_a?(Project) + filters << { name: "member", operator: "=", values: [@object.id.to_s] } + elsif @object.respond_to?(:project_id) + filters << { name: "member", operator: "=", values: [@object.project_id.to_s] } + end + + filters end end diff --git a/app/forms/custom_fields/inputs/base/input.rb b/app/forms/custom_fields/inputs/base/input.rb index 6e30709cc0f0..2e160a5a6f54 100644 --- a/app/forms/custom_fields/inputs/base/input.rb +++ b/app/forms/custom_fields/inputs/base/input.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -32,6 +34,8 @@ class CustomFields::Inputs::Base::Input < ApplicationForm attr_reader :options def initialize(custom_field:, object:, **options) + super() + @custom_field = custom_field @object = object @options = options diff --git a/app/forms/custom_fields/inputs/multi_select_list.rb b/app/forms/custom_fields/inputs/multi_select_list.rb index 832ddb524b49..a6245fcc2357 100644 --- a/app/forms/custom_fields/inputs/multi_select_list.rb +++ b/app/forms/custom_fields/inputs/multi_select_list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -31,17 +33,19 @@ class CustomFields::Inputs::MultiSelectList < CustomFields::Inputs::Base::Autoco # autocompleter does not set key with blank value if nothing is selected or input is cleared # in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field # which sends blank if autocompleter is cleared - custom_value_form.hidden(**input_attributes.merge( + custom_value_form.hidden( + **input_attributes, scope_name_to_model: false, - name: "#{@object.class.name.downcase}[custom_field_values][#{input_attributes[:name]}][]", + name: "#{@object.model_name.element}[custom_field_values][#{input_attributes[:name]}][]", value: - )) + ) custom_value_form.autocompleter(**input_attributes) do |list| - @custom_field.custom_options.each do |custom_option| + list_items.each do |item| list.option( - label: custom_option.value, value: custom_option.id, - selected: selected?(custom_option) + label: item.fetch(:label), + value: item.fetch(:value), + selected: item.fetch(:selected) ) end end @@ -53,6 +57,33 @@ def decorated? true end + def list_items + case @custom_field.field_format + when "hierarchy" + hierarchy_items.map do |item| + { + label: item.ancestry_path, + value: item.id, + selected: @custom_values.pluck(:value).map(&:to_i).include?(item.id) + } + end + else + @custom_field.custom_options.map do |custom_option| + { + label: custom_option.value, + value: custom_option.id, + selected: selected?(custom_option) + } + end + end + end + + def hierarchy_items + CustomFields::Hierarchy::HierarchicalItemService.new + .get_descendants(item: @custom_field.hierarchy_root, include_self: false) + .value_or([]) + end + def selected?(custom_option) if @custom_values.any? @custom_values.pluck(:value).map { |value| value&.to_i }.include?(custom_option.id) diff --git a/app/forms/custom_fields/inputs/multi_user_select_list.rb b/app/forms/custom_fields/inputs/multi_user_select_list.rb index f086b8b8948e..0e93c3b920a9 100644 --- a/app/forms/custom_fields/inputs/multi_user_select_list.rb +++ b/app/forms/custom_fields/inputs/multi_user_select_list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -33,11 +35,12 @@ class CustomFields::Inputs::MultiUserSelectList < CustomFields::Inputs::Base::Au # autocompleter does not set key with blank value if nothing is selected or input is cleared # in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field # which sends blank if autocompleter is cleared - custom_value_form.hidden(**input_attributes.merge( + custom_value_form.hidden( + **input_attributes, scope_name_to_model: false, - name: "#{@object.class.name.downcase}[custom_field_values][#{input_attributes[:name]}][]", + name: "#{@object.model_name.element}[custom_field_values][#{input_attributes[:name]}][]", value: - )) + ) custom_value_form.autocompleter(**input_attributes) end diff --git a/app/forms/custom_fields/inputs/multi_version_select_list.rb b/app/forms/custom_fields/inputs/multi_version_select_list.rb index f03ce7672f6c..9d6c65f3f91f 100644 --- a/app/forms/custom_fields/inputs/multi_version_select_list.rb +++ b/app/forms/custom_fields/inputs/multi_version_select_list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -28,23 +30,24 @@ class CustomFields::Inputs::MultiVersionSelectList < CustomFields::Inputs::Base::Autocomplete::MultiValueInput include AssignableCustomFieldValues - - delegate :assignable_versions, to: :@object + include CustomFields::Inputs::VersionSelect form do |custom_value_form| # autocompleter does not set key with blank value if nothing is selected or input is cleared # in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field # which sends blank if autocompleter is cleared - custom_value_form.hidden(**input_attributes.merge( + custom_value_form.hidden( + **input_attributes, scope_name_to_model: false, - name: "#{@object.class.name.downcase}[custom_field_values][#{input_attributes[:name]}][]", + name: "#{@object.model_name.element}[custom_field_values][#{input_attributes[:name]}][]", value: - )) + ) - custom_value_form.autocompleter(**input_attributes) do |list| + custom_value_form.autocompleter(**version_input_attributes) do |list| assignable_custom_field_values(@custom_field).each do |version| list.option( - label: version.name, value: version.id, + label: version.name, + value: version.id, selected: selected?(version) ) end diff --git a/app/forms/custom_fields/inputs/single_select_list.rb b/app/forms/custom_fields/inputs/single_select_list.rb index 6b86c9c3a614..2eb3711d0f79 100644 --- a/app/forms/custom_fields/inputs/single_select_list.rb +++ b/app/forms/custom_fields/inputs/single_select_list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -34,10 +36,11 @@ class CustomFields::Inputs::SingleSelectList < CustomFields::Inputs::Base::Autoc custom_value_form.hidden(**input_attributes.merge(value: "")) custom_value_form.autocompleter(**input_attributes) do |list| - @custom_value.custom_field.custom_options.each do |custom_option| + list_items.each do |item| list.option( - label: custom_option.value, value: custom_option.id, - selected: selected?(custom_option) + label: item.fetch(:label), + value: item.fetch(:value), + selected: item.fetch(:selected) ) end end @@ -49,6 +52,33 @@ def decorated? true end + def list_items + case @custom_field.field_format + when "hierarchy" + hierarchy_items.map do |item| + { + label: item.ancestry_path, + value: item.id, + selected: item.id == @custom_value.value&.to_i + } + end + else + @custom_field.custom_options.map do |custom_option| + { + label: custom_option.value, + value: custom_option.id, + selected: selected?(custom_option) + } + end + end + end + + def hierarchy_items + CustomFields::Hierarchy::HierarchicalItemService.new + .get_descendants(item: @custom_field.hierarchy_root, include_self: false) + .value_or([]) + end + def selected?(custom_option) custom_option.id == @custom_value.value&.to_i || custom_option.id == @custom_field.default_value&.to_i end diff --git a/app/forms/custom_fields/inputs/single_version_select_list.rb b/app/forms/custom_fields/inputs/single_version_select_list.rb index 870929858e7a..d2649566f834 100644 --- a/app/forms/custom_fields/inputs/single_version_select_list.rb +++ b/app/forms/custom_fields/inputs/single_version_select_list.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -28,16 +30,15 @@ class CustomFields::Inputs::SingleVersionSelectList < CustomFields::Inputs::Base::Autocomplete::SingleValueInput include AssignableCustomFieldValues - - delegate :assignable_versions, to: :@object + include CustomFields::Inputs::VersionSelect form do |custom_value_form| # autocompleter does not set key with blank value if nothing is selected or input is cleared # in order to let acts_as_customizable handle the clearing of the value, we need to set the value to blank via a hidden field # which sends blank if autocompleter is cleared - custom_value_form.hidden(**input_attributes.merge(value: "")) + custom_value_form.hidden(**input_attributes, value: "") - custom_value_form.autocompleter(**input_attributes) do |list| + custom_value_form.autocompleter(**version_input_attributes) do |list| assignable_custom_field_values(@custom_field).each do |version| list.option( label: version.name, value: version.id, diff --git a/app/forms/custom_fields/inputs/version_select.rb b/app/forms/custom_fields/inputs/version_select.rb new file mode 100644 index 000000000000..8ae754b7b1f2 --- /dev/null +++ b/app/forms/custom_fields/inputs/version_select.rb @@ -0,0 +1,64 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module CustomFields + module Inputs + module VersionSelect + protected + + def version_input_attributes + input_attributes.deep_merge(additional_attributes) + end + + def additional_attributes + if @object.blank? || (@object.respond_to?(:project) && @object.project.blank?) + { + autocomplete_options: { + disabled: true, + placeholder: I18n.t("custom_fields.placeholder_version_select") + } + } + else + {} + end + end + + def assignable_versions(only_open:) + if @object.is_a?(Project) + @object.assignable_versions(only_open: only_open) + elsif @object.respond_to?(:project) && @object.project.present? + @object.project.assignable_versions(only_open: only_open) + else + Version.none + end + end + end + end +end diff --git a/app/forms/projects/custom_fields/form.rb b/app/forms/projects/custom_fields/form.rb index 23dd74316571..cd34b56779fb 100644 --- a/app/forms/projects/custom_fields/form.rb +++ b/app/forms/projects/custom_fields/form.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -27,12 +29,10 @@ #++ module Projects::CustomFields class Form < ApplicationForm + include CustomFields::CustomFieldRendering + form do |custom_fields_form| - custom_fields.each do |custom_field| - custom_fields_form.fields_for(:custom_field_values) do |builder| - custom_field_input(builder, custom_field) - end - end + render_custom_fields(form: custom_fields_form) end def initialize(project:, custom_field_section: nil, custom_field: nil, wrapper_id: nil) @@ -48,6 +48,11 @@ def initialize(project:, custom_field_section: nil, custom_field: nil, wrapper_i end end + # override since we want to add the model with @project + def additional_custom_field_input_arguments + { model: @project, wrapper_id: @wrapper_id } + end + private def custom_fields @@ -62,57 +67,5 @@ def custom_fields @project.available_custom_fields end end - - def custom_field_input(builder, custom_field) - if custom_field.multi_value? - multi_value_custom_field_input(builder, custom_field) - else - single_value_custom_field_input(builder, custom_field) - end - end - - # TBD: transform inputs called below to primer form dsl instead of form classes? - # TODOS: - # - initial values for user inputs are not displayed - # - allow/disallow-non-open version setting is not yet respected in the version selector - # - rich text editor is not yet supported - - def single_value_custom_field_input(builder, custom_field) - form_args = { custom_field:, object: @project, wrapper_id: @wrapper_id } - - case custom_field.field_format - when "string", "link" - CustomFields::Inputs::String.new(builder, **form_args) - when "text" - CustomFields::Inputs::Text.new(builder, **form_args) - when "int" - CustomFields::Inputs::Int.new(builder, **form_args) - when "float" - CustomFields::Inputs::Float.new(builder, **form_args) - when "list" - CustomFields::Inputs::SingleSelectList.new(builder, **form_args) - when "date" - CustomFields::Inputs::Date.new(builder, **form_args) - when "bool" - CustomFields::Inputs::Bool.new(builder, **form_args) - when "user" - CustomFields::Inputs::SingleUserSelectList.new(builder, **form_args) - when "version" - CustomFields::Inputs::SingleVersionSelectList.new(builder, **form_args) - end - end - - def multi_value_custom_field_input(builder, custom_field) - form_args = { custom_field:, object: @project, wrapper_id: @wrapper_id } - - case custom_field.field_format - when "list" - CustomFields::Inputs::MultiSelectList.new(builder, **form_args) - when "user" - CustomFields::Inputs::MultiUserSelectList.new(builder, **form_args) - when "version" - CustomFields::Inputs::MultiVersionSelectList.new(builder, **form_args) - end - end end end diff --git a/app/forms/projects/life_cycle_step_definitions/form.rb b/app/forms/projects/life_cycle_step_definitions/form.rb new file mode 100644 index 000000000000..8ed13372050c --- /dev/null +++ b/app/forms/projects/life_cycle_step_definitions/form.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Projects::LifeCycleStepDefinitions + class Form < ApplicationForm + form do |f| + f.hidden(name: :type) unless model.persisted? + + f.text_field( + label: attribute_name(:name), + name: :name, + required: true, + input_width: :medium + ) + + f.color_select_list( + label: attribute_name(:color), + name: :color, + required: true, + input_width: :medium + ) + + f.submit( + scheme: :primary, + name: :submit, + label: submit_label + ) + end + + def submit_label + I18n.t(model.persisted? ? :button_update : :button_create) + end + end +end diff --git a/app/forms/projects/life_cycles/form.rb b/app/forms/projects/life_cycles/form.rb index 6d0233b90460..06a7ec6212d0 100644 --- a/app/forms/projects/life_cycles/form.rb +++ b/app/forms/projects/life_cycles/form.rb @@ -53,7 +53,7 @@ def base_input_attributes label: "#{icon} #{text}".html_safe, # rubocop:disable Rails/OutputSafety leading_visual: { icon: :calendar }, datepicker_options: { - inDialog: true, + inDialog: ProjectLifeCycles::Sections::EditDialogComponent::DIALOG_ID, data: { action: "change->overview--project-life-cycles-form#previewForm" } }, wrapper_data_attributes: { diff --git a/app/forms/shares/invitee.rb b/app/forms/shares/invitee.rb index c60ed79d1c3c..d9bc3704304c 100644 --- a/app/forms/shares/invitee.rb +++ b/app/forms/shares/invitee.rb @@ -53,15 +53,14 @@ class Invitee < ApplicationForm appendToComponent: true, disabled: @disabled, isOpenedInModal: true, - hoverCards: @allow_hover_cards + hoverCards: true } ) end - def initialize(disabled: false, allow_hover_cards: false) + def initialize(disabled: false) super() @disabled = disabled - @allow_hover_cards = allow_hover_cards end end end diff --git a/app/forms/work_packages/dialogs/create_form.rb b/app/forms/work_packages/dialogs/create_form.rb new file mode 100644 index 000000000000..0c5e9fd8cf76 --- /dev/null +++ b/app/forms/work_packages/dialogs/create_form.rb @@ -0,0 +1,124 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages::Dialogs + class CreateForm < ApplicationForm + include CustomFields::CustomFieldRendering + + attr_reader :work_package, :wrapper_id, :contract + + def initialize(work_package:, wrapper_id:) + super() + + @work_package = work_package + @schema = API::V3::WorkPackages::Schema::SpecificWorkPackageSchema.new(work_package:) + @wrapper_id = wrapper_id + @contract = WorkPackages::CreateContract.new(work_package, User.current) + end + + form do |f| + f.autocompleter( + name: :type_id, + required: true, + include_blank: false, + input_width: :small, + label: Type.model_name.human, + visually_hide_label: true, + autocomplete_options: { + multiple: false, + decorated: true, + clearable: false, + focusDirectly: false, + hiddenFieldAction: "change->work-packages--create-dialog#refreshForm", + append_to: wrapper_id, + data: { test_selector: "work_package_create_dialog_type" } + } + ) do |select| + contract + .assignable_types + .pluck(:id, :name) + .map do |value, label| + select.option(label:, + value:, + classes: "__hl_inline_type_#{value}", + selected: work_package.type_id == value) + end + end + + f.text_field( + name: :subject, + label: WorkPackage.human_attribute_name(:subject), + required: true, + autofocus: autofocus_subject?, + input_width: :large, + disabled: !@schema.writable?(:subject) + ) + + f.rich_text_area( + name: :description, + label: WorkPackage.human_attribute_name(:description), + rich_text_options: { + resource: work_package, + showAttachments: false + }, + disabled: !@schema.writable?(:description) + ) + + render_custom_fields(form: f) + + # Keep hidden fields for relevant changes + work_package.changes + .slice(*writable_attributes) + .except(:description, :subject, :type_id) + .each do |attribute, value| + f.hidden(name: attribute, value:) + end + end + + def additional_custom_field_input_arguments + { wrapper_id: } + end + + def autofocus_subject? + work_package.errors.empty? && work_package.custom_values.all? { |cv| cv.errors.empty? } + end + + private + + def custom_fields + @custom_fields ||= work_package.available_custom_fields.select(&:required?) + end + + def writable_attributes + contract = WorkPackages::CreateContract.new(work_package, User.current) + contract.writable_attributes + end + end +end diff --git a/app/forms/work_packages/types/settings_form.rb b/app/forms/work_packages/types/settings_form.rb new file mode 100644 index 000000000000..9b50d854f69d --- /dev/null +++ b/app/forms/work_packages/types/settings_form.rb @@ -0,0 +1,116 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module WorkPackages + module Types + class SettingsForm < ApplicationForm + form do |settings_form| + settings_form.text_field( + name: :name, + label: label(:name), + placeholder: I18n.t(:label_name), + input_width: :large, + required: true, + disabled: model.is_standard? + ) + + settings_form.color_select_list( + name: :color_id, + label: Color.model_name.human, + caption: I18n.t("types.edit.settings.type_color_text"), + input_width: :large + ) + + if show_work_flow_copy? + settings_form.select_list( + name: :copy_workflow_from, + label: label(:copy_workflow_from), + include_blank: true, + input_width: :large + ) do |other_types| + work_package_types.each do |type| + other_types.option( + value: type.id, + label: type.name, + selected: type.id == prefilled_copy_workflow_from + ) + end + end + end + + settings_form.rich_text_area( + name: :description, + label: label(:description), + input_width: :large, + rich_text_options: { showAttachments: false } + ) + + settings_form.check_box( + name: :is_milestone, + label: label(:is_milestone) + ) + + settings_form.check_box( + name: :is_in_roadmap, + label: label(:is_in_roadmap) + ) + + settings_form.check_box( + name: :is_default, + label: label(:is_default) + ) + + settings_form.submit( + name: :submit, + label: I18n.t(:button_save), + scheme: :primary + ) + end + + private + + def label(attribute) + model.class.human_attribute_name(attribute) + end + + def show_work_flow_copy? + model.new_record? + end + + def work_package_types + Type.all + end + + def prefilled_copy_workflow_from + @builder.options[:copy_workflow_from] + end + end + end +end diff --git a/app/forms/work_packages/types/subject_configuration_form.rb b/app/forms/work_packages/types/subject_configuration_form.rb index 455b1213e5ad..7f6b1697552d 100644 --- a/app/forms/work_packages/types/subject_configuration_form.rb +++ b/app/forms/work_packages/types/subject_configuration_form.rb @@ -34,38 +34,53 @@ class SubjectConfigurationForm < ApplicationForm form do |subject_form| subject_form.radio_button_group(name: :subject_configuration) do |group| group.radio_button( - value: "manual", - checked: !has_pattern?, + value: :manual, + checked: subject_configuration_manual?, label: I18n.t("types.edit.subject_configuration.manually_editable_subjects.label"), caption: I18n.t("types.edit.subject_configuration.manually_editable_subjects.caption"), data: { action: "admin--subject-configuration#hidePatternInput" } ) group.radio_button( - value: "auto", - checked: has_pattern?, + value: :generated, + checked: !subject_configuration_manual?, label: I18n.t("types.edit.subject_configuration.automatically_generated_subjects.label"), caption: I18n.t("types.edit.subject_configuration.automatically_generated_subjects.caption"), + disabled: !enterprise? && subject_configuration_manual?, data: { action: "admin--subject-configuration#showPatternInput" } ) end subject_form.group(data: { "admin--subject-configuration-target": "patternInput" }) do |toggleable_group| - toggleable_group.text_field( + toggleable_group.pattern_input( name: :pattern, + value: model.pattern, + suggestions: model.suggestions, label: I18n.t("types.edit.subject_configuration.pattern.label"), caption: I18n.t("types.edit.subject_configuration.pattern.caption"), required: true, - input_width: :large + validation_message: validation_message_for(:patterns) ) end - subject_form.submit(name: :submit, label: I18n.t(:button_save), scheme: :primary) + subject_form.submit( + name: :submit, + label: I18n.t(:button_save), + scheme: :primary + ) end private - def has_pattern? - false + def subject_configuration_manual? + model.subject_configuration == :manual + end + + def enterprise? + EnterpriseToken.allows_to?(:work_package_subject_generation) + end + + def validation_message_for(attribute) + model.validation_errors.messages_for(attribute).to_sentence.presence end end end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 50e94f057851..8e24190f9025 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -189,13 +189,10 @@ def authoring(created, author, options = {}) I18n.t(label, author: link_to_user(author), age: time_tag(created)).html_safe end - def authoring_at(created, author) + def authoring_at(creation_date, author) return if author.nil? - I18n.t(:"js.label_added_time_by", - author: html_escape(author.name), - age: created, - authorLink: user_path(author)).html_safe + I18n.t(:label_added_by_on, author: link_to_user(author), date: creation_date).html_safe end def time_tag(time) @@ -293,7 +290,7 @@ def theme_options_for_select def body_data_attributes(local_assigns) { - controller: "application", + controller: "application hover-card-trigger", relative_url_root: root_path, overflowing_identifier: ".__overflowing_body", rendered_at: Time.zone.now.iso8601, diff --git a/app/helpers/conversion_helper.rb b/app/helpers/conversion_helper.rb new file mode 100644 index 000000000000..e4ed37cee0e4 --- /dev/null +++ b/app/helpers/conversion_helper.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module ConversionHelper + include Dry::Monads[:maybe] + + def maybe_integer(value) + Some(Integer(value || "", 10)) + rescue ArgumentError + None() + end +end diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index 1c81066a9009..122cd405541f 100644 --- a/app/helpers/custom_fields_helper.rb +++ b/app/helpers/custom_fields_helper.rb @@ -205,8 +205,6 @@ def format_value(value, custom_field) # Return an array of custom field formats which can be used in select_tag def custom_field_formats_for_select(custom_field) OpenProject::CustomFieldFormat.all_for_field(custom_field) - .sort_by(&:order) - .reject { |format| format.label.nil? } .map do |custom_field_format| [label_for_custom_field_format(custom_field_format.name), custom_field_format.name] end diff --git a/app/helpers/errors_helper.rb b/app/helpers/errors_helper.rb index 561164407eeb..1de153afb781 100644 --- a/app/helpers/errors_helper.rb +++ b/app/helpers/errors_helper.rb @@ -33,6 +33,12 @@ def render_400(options = {}) # rubocop:disable Naming/VariableNumber false end + def render_402(options = {}) # rubocop:disable Naming/VariableNumber + unset_template_magic + render_error({ message: :notice_requires_enterprise_token, status: 402 }.merge(options)) + false + end + def render_403(options = {}) # rubocop:disable Naming/VariableNumber unset_template_magic render_error({ message: :notice_not_authorized, status: 403 }.merge(options)) diff --git a/app/helpers/highlighting_helper.rb b/app/helpers/highlighting_helper.rb index eadd74133eb2..0760f745f17f 100644 --- a/app/helpers/highlighting_helper.rb +++ b/app/helpers/highlighting_helper.rb @@ -4,6 +4,6 @@ def highlight_css_version_tag(max_updated_at = highlight_css_updated_at) end def highlight_css_updated_at - ApplicationRecord.most_recently_changed Status, IssuePriority, Type, UserPreference + ApplicationRecord.most_recently_changed Status, IssuePriority, Type, UserPreference, Project::LifeCycleStepDefinition end end diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb index 28e9f79f3c80..b3cb0b5c7b77 100644 --- a/app/helpers/pagination_helper.rb +++ b/app/helpers/pagination_helper.rb @@ -29,6 +29,10 @@ require "will_paginate" module PaginationHelper + SHOW_MORE_DEFAULT_LIMIT = 5 + SHOW_MORE_DEFAULT_INCREMENT = 20 + SHOW_MORE_MAX_LIMIT = 1000 + def pagination_links_full(paginator, options = {}) return unless paginator.total_entries > 0 @@ -151,6 +155,24 @@ def per_page_param(options = params) end end + ## + # For "Show more" paginated links, we want to load an initial number of items (defaulting to 5) + # unless a higher number is provided. These values do not correspond to the per_page_options + def show_more_limit_param(options = params, initial_limit: SHOW_MORE_DEFAULT_LIMIT) + limit = options[:limit].to_i + if limit.zero? + initial_limit + else + [limit, SHOW_MORE_MAX_LIMIT].min + end + end + + ## + # Paginate an AR relation for the "show more" pagination functionality + def show_more_pagination(paginator, options = params) + paginator.paginate(page: 1, per_page: show_more_limit_param(options)) + end + class LinkRenderer < ::WillPaginate::ActionView::LinkRenderer def to_html pagination.inject("") do |html, item| diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index 5abcabc4a499..5ffc8c1fbeef 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -124,13 +124,19 @@ def link_to_next_search_page(pagination_next_date) def attachment_fulltexts(event) only_if_tsv_supported(event) do - Attachment.where(id: event.attachment_ids).pluck(:fulltext).join(" ") + # The compact is important here as the fulltext can be nil. + # A nil value in combination with another journal would lead to + # [nil, "The fulltext of the attachment"].join to be in US-ASCII encoding + # instead of the expected UTF-8. + # When this is then passed into Commonmarker, that will raise an error. + # https://community.openproject.org/wp/61110 + Attachment.where(id: event.attachment_ids).pluck(:fulltext).compact.join end end def attachment_filenames(event) only_if_tsv_supported(event) do - event.attachments&.map(&:filename)&.join(" ") + event.attachments.map(&:filename).join end end diff --git a/app/helpers/tabs_helper.rb b/app/helpers/tabs_helper.rb index 6305516475ac..df8228f2e6fa 100644 --- a/app/helpers/tabs_helper.rb +++ b/app/helpers/tabs_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -37,8 +39,10 @@ def render_tabs(tabs, form = nil, with_tab_nav: true) end end - def selected_tab(tabs) - tabs.detect { |t| t[:name] == params[:tab] } || tabs.first + def selected_tab(tabs, default_tab = nil) + tabs.detect { |t| t[:name] == params[:tab] } || + tabs.detect { |t| t[:name] == default_tab } || + tabs.first end def tabs_for_key(key, params = {}) diff --git a/app/helpers/types_helper.rb b/app/helpers/types_helper.rb index 2fcb024f7009..2e9c38b7012a 100644 --- a/app/helpers/types_helper.rb +++ b/app/helpers/types_helper.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -32,20 +34,20 @@ def types_tabs tabs = [ { name: "settings", - partial: "types/form/settings", - path: edit_type_tab_path(id: @type.id, tab: :settings), - label: "types.edit.settings.tab" + path: edit_tab_type_path(id: @type.id, tab: :settings), + label: "types.edit.settings.tab", + view_component: WorkPackages::Types::SettingsComponent }, { name: "form_configuration", partial: "types/form/form_configuration", - path: edit_type_tab_path(id: @type.id, tab: :form_configuration), + path: edit_tab_type_path(id: @type.id, tab: :form_configuration), label: "types.edit.form_configuration.tab" }, { name: "projects", partial: "types/form/projects", - path: edit_type_tab_path(id: @type.id, tab: :projects), + path: edit_tab_type_path(id: @type.id, tab: :projects), label: "types.edit.projects.tab" } ] @@ -53,7 +55,7 @@ def types_tabs if OpenProject::FeatureDecisions.generate_work_package_subjects_active? subject_configuration_tab = { name: "subject_configuration", - path: edit_type_tab_path(id: @type.id, tab: :subject_configuration), + path: edit_tab_type_path(id: @type.id, tab: :subject_configuration), label: "types.edit.subject_configuration.tab", view_component: WorkPackages::Types::SubjectConfigurationComponent } diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb index 2d37bcad6da7..0744c4502f6b 100644 --- a/app/helpers/work_packages_helper.rb +++ b/app/helpers/work_packages_helper.rb @@ -157,6 +157,23 @@ def work_package_list(work_packages, &) end end + def work_package_dates_icon(work_package) + work_package.schedule_manually ? :pin : :calendar + end + + def work_package_formatted_dates(work_package) + start_date = work_package.start_date ? format_date(work_package.start_date) : nil + due_date = work_package.due_date ? format_date(work_package.due_date) : nil + + # If both dates are missing, return just one dash + return "-" if start_date.nil? && due_date.nil? + + return start_date if start_date == due_date + + # Return the formatted date range (start_date - due_date) + "#{start_date} - #{due_date}" + end + def send_notification_option(checked = false) content_tag(:label, for: "send_notification", class: "form--label-with-check-box") do (content_tag "span", class: "form--check-box-container" do diff --git a/app/models/application_record.rb b/app/models/application_record.rb index 40fbed060cee..17cb76e7a913 100644 --- a/app/models/application_record.rb +++ b/app/models/application_record.rb @@ -34,22 +34,18 @@ def read_attribute_for_validation(attribute) def self.most_recently_changed(*record_classes) queries = record_classes.map do |clz| column_name = clz.send(:timestamp_attributes_for_update_in_model)&.first || "updated_at" - "(SELECT MAX(#{column_name}) AS max_updated_at FROM #{clz.table_name})" + table = clz.arel_table + table.project(table[column_name].maximum.as("max_updated_at")).to_sql end .join(" UNION ") - union_query = <<~SQL - SELECT MAX(union_query.max_updated_at) + union_query = <<~SQL.squish + SELECT MAX(max_updated_at) FROM (#{queries}) AS union_query SQL - ActiveRecord::Base - .connection - .select_all(union_query) - .rows - &.first # first result row - &.first # max column + ActiveRecord::Base.connection.select_value(union_query) end def self.skip_optimistic_locking(&) diff --git a/app/models/custom_actions/actions/base.rb b/app/models/custom_actions/actions/base.rb index 8b64662449b5..4995d3c9371d 100644 --- a/app/models/custom_actions/actions/base.rb +++ b/app/models/custom_actions/actions/base.rb @@ -43,6 +43,12 @@ def allowed_values raise NotImplementedError end + def value_objects + values.map do |value| + allowed_values.find { |v| v[:value] == value } + end + end + def type raise NotImplementedError end diff --git a/app/models/custom_actions/conditions/base.rb b/app/models/custom_actions/conditions/base.rb index 93828f8d3880..ddd0a58fdd30 100644 --- a/app/models/custom_actions/conditions/base.rb +++ b/app/models/custom_actions/conditions/base.rb @@ -45,6 +45,12 @@ def allowed_values .map { |value, label| { value:, label: } } end + def value_objects + values.map do |value| + allowed_values.find { |v| v[:value] == value } + end + end + def human_name WorkPackage.human_attribute_name(self.class.key) end diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index 658fa0c80ce0..2825ffa357d7 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -296,7 +296,7 @@ def field_format_hierarchy? end def multi_value_possible? - version? || user? || list? || field_format_hierarchy? + OpenProject::CustomFieldFormat.find_by(name: field_format)&.multi_value_possible? end def allow_non_open_versions_possible? diff --git a/app/models/custom_style.rb b/app/models/custom_style.rb index 8e0603b2e177..6155a03d988b 100644 --- a/app/models/custom_style.rb +++ b/app/models/custom_style.rb @@ -35,7 +35,11 @@ def digest image = send(name) image&.remove! - update_columns(name => nil, updated_at: Time.zone.now) + if new_record? + send(:"#{name}=", nil) + else + update_columns(name => nil, updated_at: Time.zone.now) + end end end end diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index da80df871462..c12c715822a8 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -75,6 +75,11 @@ def self.default end end + # boolean to define if the enumeration can set a default + def self.can_have_default_value? + true + end + # Destroys enumerations in a single transaction # It ensures, that the transactions can be safely transferred to each # entry's parent diff --git a/app/models/principal.rb b/app/models/principal.rb index 20a0b51e10a8..aa06360d3964 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -31,12 +31,12 @@ class Principal < ApplicationRecord # Account statuses # Disables enum scopes to include not_builtin (cf. Principals::Scopes::Status) - enum status: { + enum :status, { active: 1, registered: 2, locked: 3, invited: 4 - }.freeze, _scopes: false + }.freeze, scopes: false self.table_name = "#{table_name_prefix}users#{table_name_suffix}" @@ -176,6 +176,11 @@ def activatable? false end + # Returns true if usr or current user is allowed to view the user + def visible?(usr = User.current) + User.visible(usr).exists?(id: id) + end + def <=>(other) if instance_of?(other.class) to_s.downcase <=> other.to_s.downcase diff --git a/app/models/project.rb b/app/models/project.rb index 5bdb1f1f83f5..0a591573f541 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -100,9 +100,29 @@ class Project < ApplicationRecord acts_as_favorable - acts_as_customizable # extended in Projects::CustomFields in order to support sections + acts_as_customizable validate_on: :saving_custom_fields + # extended in Projects::CustomFields in order to support sections # and project-level activation of custom fields + # Override the `validation_context` getter to include the `default_validation_context` when the + # context is `:saving_custom_fields`. This is required, because the `acts_as_url` plugin from + # `stringex` defines a callback on the `:create` context for initialising the `identifier` field. + # Providing a custom context while creating the project, will not execute the callbacks on the + # `:create` or `:update` contexts, meaning the identifier will not get initialised. + # In order to initialise the identifier, the `default_validation_context` (`:create`, or `:update`) + # should be included when validating via the `:saving_custom_fields`. This way every create + # or update callback will also be executed alongside the `:saving_custom_fields` callbacks. + # This problem does not affect the contextless callbacks, they are always executed. + + def validation_context + case Array(@validation_context) + in [*, :saving_custom_fields, *] => context + context << default_validation_context + else + @validation_context + end + end + acts_as_searchable columns: %W(#{table_name}.name #{table_name}.identifier #{table_name}.description), date_column: "#{table_name}.created_at", project_key: "id", diff --git a/app/models/project/life_cycle_step_definition.rb b/app/models/project/life_cycle_step_definition.rb index f80cc6116931..031e72d4ee55 100644 --- a/app/models/project/life_cycle_step_definition.rb +++ b/app/models/project/life_cycle_step_definition.rb @@ -27,6 +27,8 @@ #++ class Project::LifeCycleStepDefinition < ApplicationRecord + include ::Scopes::Scoped + has_many :life_cycle_steps, class_name: "Project::LifeCycleStep", foreign_key: :definition_id, @@ -43,6 +45,10 @@ class Project::LifeCycleStepDefinition < ApplicationRecord acts_as_list + default_scope { order(:position) } + + scopes :with_project_count + def step_class raise NotImplementedError end diff --git a/app/models/project/life_cycle_step_definitions/scopes/with_project_count.rb b/app/models/project/life_cycle_step_definitions/scopes/with_project_count.rb new file mode 100644 index 000000000000..e4448a90187b --- /dev/null +++ b/app/models/project/life_cycle_step_definitions/scopes/with_project_count.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Project::LifeCycleStepDefinitions::Scopes + module WithProjectCount + extend ActiveSupport::Concern + + class_methods do + def with_project_count + project_counts = Project::LifeCycleStep + .where(active: true) + .group(:definition_id) + .select(:definition_id, "COUNT(project_id) AS count") + + Project::LifeCycleStepDefinition + .with(project_counts:) + .joins("LEFT OUTER JOIN project_counts ON #{quoted_table_name}.id = project_counts.definition_id") + .select("#{quoted_table_name}.*") + .select("COALESCE(project_counts.count, 0) AS project_count") + end + end + end +end diff --git a/app/models/queries/filters/strategies/huge_list.rb b/app/models/queries/filters/strategies/huge_list.rb index 83ab9ac173b0..12ae9014a3ac 100644 --- a/app/models/queries/filters/strategies/huge_list.rb +++ b/app/models/queries/filters/strategies/huge_list.rb @@ -33,10 +33,18 @@ class HugeList < List def validate unique_values = values.uniq - allowed_and_desired_values = allowed_values_subset & unique_values - if allowed_and_desired_values.sort != unique_values.sort - errors.add(:values, :inclusion) + case allowed_values_subset + when ActiveRecord::Relation + unless allowed_values_subset.exists?(id: values) + errors.add(:values, :inclusion) + end + else + allowed_and_desired_values = allowed_values_subset & unique_values + + if allowed_and_desired_values.sort != unique_values.sort + errors.add(:values, :inclusion) + end end end diff --git a/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb b/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb index 2b1bab0a0462..9e43b20367c4 100644 --- a/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb +++ b/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb @@ -31,8 +31,11 @@ class Queries::Principals::Filters::MentionableOnWorkPackageFilter < Queries::Principals::Filters::PrincipalFilter def allowed_values - # We don't care for the first value as we do not display the values visibly - @allowed_values ||= ::WorkPackage.visible.pluck(:id).map { |id| [id, id.to_s] } + raise NotImplementedError, "There would be too many candidates" + end + + def allowed_values_subset + @allowed_values_subset ||= ::WorkPackage.visible end def type @@ -54,6 +57,10 @@ def apply_to(query_scope) private + def type_strategy + @type_strategy ||= Queries::Filters::Strategies::HugeList.new(self) + end + def principals_with_a_membership visible_scope.where(id: work_package_members.select(:user_id)) .or(visible_scope.where(id: project_members.select(:user_id))) diff --git a/app/models/queries/projects.rb b/app/models/queries/projects.rb index 64b721b7596a..147e04f4b33c 100644 --- a/app/models/queries/projects.rb +++ b/app/models/queries/projects.rb @@ -54,6 +54,7 @@ module Queries::Projects order Orders::LatestActivityAtOrder order Orders::RequiredDiskSpaceOrder order Orders::CustomFieldOrder + order Orders::LifeCycleStepOrder order Orders::ProjectStatusOrder order Orders::NameOrder order Orders::TypeaheadOrder diff --git a/app/models/queries/projects/orders/life_cycle_step_order.rb b/app/models/queries/projects/orders/life_cycle_step_order.rb new file mode 100644 index 000000000000..7234a0fac860 --- /dev/null +++ b/app/models/queries/projects/orders/life_cycle_step_order.rb @@ -0,0 +1,111 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class Queries::Projects::Orders::LifeCycleStepOrder < Queries::Orders::Base + self.model = Project + + validates :life_cycle_step_definition, presence: { message: I18n.t(:"activerecord.errors.messages.does_not_exist") } + + def self.key + /\Alcsd_(\d+)\z/ + end + + def life_cycle_step_definition + return @life_cycle_step_definition if defined?(@life_cycle_step_definition) + + @life_cycle_step_definition = Project::LifeCycleStepDefinition.find_by(id: attribute[/\Alcsd_(\d+)\z/, 1]) + end + + def available? + life_cycle_step_definition.present? && + OpenProject::FeatureDecisions.stages_and_gates_active? && + User.current.allowed_in_any_project?(:view_project_stages_and_gates) + end + + private + + def joins + join = <<~SQL.squish + LEFT JOIN ( + SELECT steps.*, steps.definition_id as def_id + FROM project_life_cycle_steps steps + WHERE + steps.active = true + AND steps.definition_id = :definition_id + AND steps.project_id IN (#{viewable_project_ids.to_sql}) + ) #{subquery_table_name} ON #{subquery_table_name}.project_id = projects.id + SQL + + ActiveRecord::Base.sanitize_sql([join, { definition_id: life_cycle_step_definition.id }]) + end + + # Since we can combine multiple queries with their respective ORDER BY clauses, we need to make sure + # that the names of our tables are unique. It suffices to include the definition id into the name as there can only + # ever be one order statement per definition. + def subquery_table_name + definition_id = life_cycle_step_definition.id + + :"life_cycle_steps_subquery_#{definition_id}" + end + + def order(scope) + with_raise_on_invalid do + scope.where(order_condition) + .order(*order_by_start_and_end_date) + end + end + + # Ensure that only life cycle columns viewable to the current user are considered + # for ordering the query result. + def viewable_project_ids + Project.allowed_to(User.current, :view_project_stages_and_gates).select(:id) + end + + def order_condition + # To avoid SQL injection warnings, we use Arel to build the condition. + # Note that this SQL query uses the subquery defined in `joins`. + steps_table = Arel::Table.new(subquery_table_name.to_s) + + # WHERE subquery_table_name.def_id = life_cycle_step_definition.id OR subquery_table_name.def_id IS NULL + steps_table[:def_id] + .eq(life_cycle_step_definition.id) + .or(steps_table[:def_id].eq(nil)) + end + + def order_by_start_and_end_date + steps_table = Arel::Table.new(subquery_table_name.to_s) + + # Even though a gate does not define an end_date, this code still works. + [ + steps_table[:start_date].send(direction), + steps_table[:end_date].send(direction) + ] + end +end diff --git a/app/models/queries/work_packages/filter/role_filter.rb b/app/models/queries/work_packages/filter/role_filter.rb index 16ddd8583c86..d320b76943a1 100644 --- a/app/models/queries/work_packages/filter/role_filter.rb +++ b/app/models/queries/work_packages/filter/role_filter.rb @@ -67,7 +67,9 @@ def where private def roles - ::Role.givable + Role + .includes(:role_permissions) + .where(role_permissions: { permission: "work_package_assigned" }) end def operator_for_filtering diff --git a/app/models/relation.rb b/app/models/relation.rb index 947312b1c213..1cad5d0bc23f 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -30,41 +32,34 @@ class Relation < ApplicationRecord belongs_to :from, class_name: "WorkPackage" belongs_to :to, class_name: "WorkPackage" - TYPE_RELATES = "relates".freeze - TYPE_PRECEDES = "precedes".freeze - TYPE_FOLLOWS = "follows".freeze - TYPE_BLOCKS = "blocks".freeze - TYPE_BLOCKED = "blocked".freeze - TYPE_DUPLICATES = "duplicates".freeze - TYPE_DUPLICATED = "duplicated".freeze - TYPE_INCLUDES = "includes".freeze - TYPE_PARTOF = "partof".freeze - TYPE_REQUIRES = "requires".freeze - TYPE_REQUIRED = "required".freeze + TYPE_RELATES = "relates" + TYPE_PRECEDES = "precedes" + TYPE_FOLLOWS = "follows" + TYPE_BLOCKS = "blocks" + TYPE_BLOCKED = "blocked" + TYPE_DUPLICATES = "duplicates" + TYPE_DUPLICATED = "duplicated" + TYPE_INCLUDES = "includes" + TYPE_PARTOF = "partof" + TYPE_REQUIRES = "requires" + TYPE_REQUIRED = "required" # The parent/child relation is maintained separately # (in WorkPackage and WorkPackageHierarchy) and a relation cannot # have the type 'parent' but this is abstracted to simplify the code. - TYPE_PARENT = "parent".freeze - TYPE_CHILD = "child".freeze + TYPE_PARENT = "parent" + TYPE_CHILD = "child" TYPES = { TYPE_RELATES => { name: :label_relates_to, sym_name: :label_relates_to, order: 1, sym: TYPE_RELATES }, - TYPE_PRECEDES => { - name: :label_precedes, sym_name: :label_follows, order: 6, - sym: TYPE_FOLLOWS, reverse: TYPE_FOLLOWS - }, TYPE_FOLLOWS => { name: :label_follows, sym_name: :label_precedes, order: 7, sym: TYPE_PRECEDES }, - TYPE_BLOCKS => { - name: :label_blocks, sym_name: :label_blocked_by, order: 4, sym: TYPE_BLOCKED - }, - TYPE_BLOCKED => { - name: :label_blocked_by, sym_name: :label_blocks, order: 5, - sym: TYPE_BLOCKS, reverse: TYPE_BLOCKS + TYPE_PRECEDES => { + name: :label_precedes, sym_name: :label_follows, order: 6, + sym: TYPE_FOLLOWS, reverse: TYPE_FOLLOWS }, TYPE_DUPLICATES => { name: :label_duplicates, sym_name: :label_duplicated_by, order: 6, sym: TYPE_DUPLICATED @@ -73,6 +68,13 @@ class Relation < ApplicationRecord name: :label_duplicated_by, sym_name: :label_duplicates, order: 7, sym: TYPE_DUPLICATES, reverse: TYPE_DUPLICATES }, + TYPE_BLOCKS => { + name: :label_blocks, sym_name: :label_blocked_by, order: 4, sym: TYPE_BLOCKED + }, + TYPE_BLOCKED => { + name: :label_blocked_by, sym_name: :label_blocks, order: 5, + sym: TYPE_BLOCKS, reverse: TYPE_BLOCKS + }, TYPE_INCLUDES => { name: :label_includes, sym_name: :label_part_of, order: 8, sym: TYPE_PARTOF @@ -103,7 +105,11 @@ class Relation < ApplicationRecord scope :follows_with_lag, -> { follows.where("lag > 0") } - validates :lag, numericality: { allow_nil: true } + validates :lag, numericality: { + allow_nil: true, + less_than_or_equal_to: 2_147_483_647, + greater_than_or_equal_to: 0 + } validates :to, uniqueness: { scope: :from } diff --git a/app/models/relations/scopes/visible.rb b/app/models/relations/scopes/visible.rb index e2522cc1fdbe..fdcb4821698e 100644 --- a/app/models/relations/scopes/visible.rb +++ b/app/models/relations/scopes/visible.rb @@ -34,10 +34,25 @@ module Visible # Returns all relationships visible to the user. The relationships have to be: # * Start (from_id) on a work package visible to the user (view_work_packages in the work package's project) # * End (to_id) on a work package visible to the user (view_work_packages in the work package's project) + # + # In some cases, the resulting SQL query as is might not run in a performant matter. This happens in + # cases where there are a lot of work packages and relations. PostgreSql then sometimes chooses to use a + # full table scan on work_packages expecting a lot of results. + # Then, the query can be optimized by providing a +work_package_focus_scope+ which is used as a subquery + # on work_packages on the id column. This is beneficial if not all work packages are to be + # considered but only a subset. As this directly excludes work packages, it can also be used + # the wrong way. # @param [User] user - def visible(user = User.current) - where(from_id: WorkPackage.visible(user)) - .where(to_id: WorkPackage.visible(user)) + # @param [ActiveRecord::Relation, Arel::SelectManager] work_package_focus_scope + def visible(user = User.current, work_package_focus_scope: nil) + visible_work_packages = WorkPackage.visible(user) + + wp_arel = work_package_focus_scope.respond_to?(:arel) ? work_package_focus_scope.arel : work_package_focus_scope + visible_work_packages = visible_work_packages.where(WorkPackage.arel_table[:id].in(wp_arel)) if wp_arel + + with(visible_work_packages:) + .where(from_id: WorkPackage.from("visible_work_packages #{WorkPackage.table_name}").select(:id)) + .where(to_id: WorkPackage.from("visible_work_packages #{WorkPackage.table_name}").select(:id)) end end end diff --git a/app/models/sessions/user_session.rb b/app/models/sessions/user_session.rb index 1a0d40e751d9..0f81c8d30293 100644 --- a/app/models/sessions/user_session.rb +++ b/app/models/sessions/user_session.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -33,6 +35,8 @@ module Sessions class UserSession < ::ApplicationRecord self.table_name = "sessions" + belongs_to :user + scope :for_user, ->(user) do user_id = user.is_a?(User) ? user.id : user.to_i diff --git a/app/models/setting.rb b/app/models/setting.rb index 654e24527512..4ee805e1410b 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -335,12 +335,14 @@ def self.settings_table_exists_yet? def self.deserialize(name, value) definition = Settings::Definition[name] - if definition.serialized? && value.is_a?(String) + if definition.nil? + nil + elsif definition.serialized? && value.is_a?(String) deserialize_hash(value) elsif value != "".freeze && !value.nil? read_formatted_setting(value, definition.format) - else - definition.format == :string ? value : nil + elsif definition.format == :string + value end end diff --git a/app/models/sharing_strategies/base_strategy.rb b/app/models/sharing_strategies/base_strategy.rb index 25c00ff2e859..bff01d94d896 100644 --- a/app/models/sharing_strategies/base_strategy.rb +++ b/app/models/sharing_strategies/base_strategy.rb @@ -50,10 +50,6 @@ def manageable? raise NotImplementedError, "Override in a subclass and return true if the current user can manage sharing" end - def allow_hover_cards? - raise NotImplementedError, "Override in a subclass and return true if hover cards should appear hovering users" - end - def create_contract_class raise NotImplementedError, "Override in a subclass and return the contract class for creating a share" end diff --git a/app/models/sharing_strategies/project_query_strategy.rb b/app/models/sharing_strategies/project_query_strategy.rb index 7a898438bb62..eb05b1970d78 100644 --- a/app/models/sharing_strategies/project_query_strategy.rb +++ b/app/models/sharing_strategies/project_query_strategy.rb @@ -54,10 +54,6 @@ def viewable? @entity.visible? end - def allow_hover_cards? - true - end - def create_contract_class Shares::ProjectQueries::CreateContract end diff --git a/app/models/sharing_strategies/work_package_strategy.rb b/app/models/sharing_strategies/work_package_strategy.rb index 018c6b0f5c71..556767dc08aa 100644 --- a/app/models/sharing_strategies/work_package_strategy.rb +++ b/app/models/sharing_strategies/work_package_strategy.rb @@ -53,13 +53,6 @@ def viewable? user.allowed_in_project?(:view_shared_work_packages, @entity.project) end - # Since the work package share dialog is embedded into an angular page, hover cards would compete for the - # portal outlet when rendering, causing bugs. Until the work package share dialog is refactored to be an - # async-dialog, we must disable hover cards for it. - def allow_hover_cards? - false - end - def share_description(share) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize scope = %i[sharing user_details] diff --git a/app/models/type.rb b/app/models/type.rb index 0117f8aaa6b8..1eadea9c31ce 100644 --- a/app/models/type.rb +++ b/app/models/type.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -34,10 +36,12 @@ class Type < ApplicationRecord include ::Scopes::Scoped - attribute :patterns, Types::PatternCollectionType.new + attribute :patterns, Types::Patterns::CollectionType.new before_destroy :check_integrity + belongs_to :color, optional: true, class_name: "Color" + has_many :work_packages has_many :workflows, dependent: :delete_all do def copy_from_type(source_type) @@ -52,12 +56,9 @@ def copy_from_type(source_type) join_table: "#{table_name_prefix}custom_fields_types#{table_name_suffix}", association_foreign_key: "custom_field_id" - belongs_to :color, optional: true, class_name: "Color" - acts_as_list validates :name, presence: true, uniqueness: { case_sensitive: false }, length: { maximum: 255 } - validates :is_default, :is_milestone, inclusion: { in: [true, false] } scopes :milestone @@ -65,8 +66,9 @@ def copy_from_type(source_type) default_scope { order("position ASC") } scope :without_standard, -> { where(is_standard: false).order(:position) } + scope :default, -> { where(is_default: true) } - def to_s; name end + delegate :to_s, to: :name def <=>(other) name <=> other.name @@ -81,26 +83,20 @@ def self.statuses(types) end def self.standard_type - ::Type.where(is_standard: true).first - end - - def self.default - ::Type.where(is_default: true) + where(is_standard: true).first end def self.enabled_in(project) - ::Type.includes(:projects).where(projects: { id: project }) + includes(:projects).where(projects: { id: project }) end def statuses(include_default: false) if new_record? Status.none elsif include_default - ::Type - .statuses([id]) - .or(Status.where_default) + self.class.statuses([id]).or(Status.where_default) else - ::Type.statuses([id]) + self.class.statuses([id]) end end @@ -108,9 +104,20 @@ def enabled_in?(object) object.types.include?(self) end + def replacement_pattern_defined_for?(attribute) + enabled_patterns.key?(attribute) + end + + def enabled_patterns + patterns.all_enabled + end + private def check_integrity - raise "Can't delete type" if WorkPackage.where(type_id: id).any? + throw :abort if is_standard? + throw :abort if WorkPackage.exists?(type_id: id) + + true end end diff --git a/app/models/types/forms/subject_configuration_form_model.rb b/app/models/types/forms/subject_configuration_form_model.rb new file mode 100644 index 000000000000..3a8a53cff944 --- /dev/null +++ b/app/models/types/forms/subject_configuration_form_model.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Types + module Forms + class SubjectConfigurationFormModel + extend ActiveModel::Naming + + attr_reader :subject_configuration, :pattern, :suggestions, :validation_errors + + def initialize(subject_configuration:, pattern:, suggestions:, validation_errors: {}) + @subject_configuration = subject_configuration + @pattern = pattern + @suggestions = suggestions + @validation_errors = validation_errors + end + end + end +end diff --git a/app/models/types/pattern.rb b/app/models/types/pattern.rb index 62dcbd2b2c18..8efe8eac5c41 100644 --- a/app/models/types/pattern.rb +++ b/app/models/types/pattern.rb @@ -30,9 +30,10 @@ module Types Pattern = Data.define(:blueprint, :enabled) do - def call(object) - # calculate string using object - blueprint.to_s + object.to_s + def enabled? = !!enabled + + def resolve(work_package) + PatternResolver.new(blueprint).resolve(work_package) end def to_h diff --git a/app/models/types/pattern_resolver.rb b/app/models/types/pattern_resolver.rb new file mode 100644 index 000000000000..905b5484b4f4 --- /dev/null +++ b/app/models/types/pattern_resolver.rb @@ -0,0 +1,67 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Types + class PatternResolver + TOKEN_REGEX = /{{[0-9A-Za-z_]+}}/ + private_constant :TOKEN_REGEX + + def initialize(pattern) + @mapper = Patterns::TokenPropertyMapper.new + @pattern = pattern + @tokens = pattern.scan(TOKEN_REGEX).map { |token| Patterns::Token.build(token) } + end + + def resolve(work_package) + @tokens.inject(@pattern) do |pattern, token| + pattern.gsub(token.pattern, get_value(work_package, token)) + end + end + + private + + def get_value(work_package, token) + context = token.context == :work_package ? work_package : work_package.public_send(token.context) + + stringify(@mapper[token.context_key].call(context)) + end + + def stringify(value) + case value + when Date, Time, DateTime + value.strftime("%Y-%m-%d") + when NilClass + "NA" + else + value.to_s + end + end + end +end diff --git a/app/models/types/patterns/collection.rb b/app/models/types/patterns/collection.rb new file mode 100644 index 000000000000..cc94bad0907f --- /dev/null +++ b/app/models/types/patterns/collection.rb @@ -0,0 +1,66 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Types + module Patterns + Collection = Data.define(:patterns) do + extend Dry::Monads[:result] + private_class_method :new + + def self.empty + new(patterns: {}) + end + + def self.build(patterns:, contract: CollectionContract.new) + contract.call(patterns).to_monad.fmap { |success| new(success.to_h) } + rescue ArgumentError => e + Failure(e) + end + + def initialize(patterns:) + transformed = patterns.transform_values { Pattern.new(**_1) }.freeze + + super(patterns: transformed) + end + + def subject + patterns[:subject] + end + + def all_enabled + patterns.select { |_, pattern| pattern.enabled? } + end + + def to_h + patterns.stringify_keys.transform_values(&:to_h) + end + end + end +end diff --git a/app/models/types/patterns/collection_contract.rb b/app/models/types/patterns/collection_contract.rb new file mode 100644 index 000000000000..74f06b8a2da4 --- /dev/null +++ b/app/models/types/patterns/collection_contract.rb @@ -0,0 +1,44 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Types + module Patterns + class CollectionContract < Dry::Validation::Contract + config.messages.backend = :i18n + + params do + optional(:subject).hash do + required(:blueprint).filled(:string) + required(:enabled).filled(:bool) + end + end + end + end +end diff --git a/app/models/types/patterns/collection_type.rb b/app/models/types/patterns/collection_type.rb new file mode 100644 index 000000000000..f7c84b23416f --- /dev/null +++ b/app/models/types/patterns/collection_type.rb @@ -0,0 +1,58 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Types + module Patterns + class CollectionType < ActiveModel::Type::Value + def assert_valid_value(value) + cast(value) + end + + def cast(value) + return value if value.is_a?(Collection) + + Collection.build(patterns: value).value_or { Collection.empty } + end + + def serialize(pattern) + return super if pattern.nil? + + YAML.dump(pattern.to_h) + end + + def deserialize(value) + return Collection.empty if value.blank? + + data = YAML.safe_load(value) + cast(data) + end + end + end +end diff --git a/modules/meeting/app/seeders/meetings/demo_data/meeting_seeder.rb b/app/models/types/patterns/token.rb similarity index 67% rename from modules/meeting/app/seeders/meetings/demo_data/meeting_seeder.rb rename to app/models/types/patterns/token.rb index ffab1b2ba05b..e17f87e58fd9 100644 --- a/modules/meeting/app/seeders/meetings/demo_data/meeting_seeder.rb +++ b/app/models/types/patterns/token.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -26,30 +28,30 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Meetings - module DemoData - class MeetingSeeder < ::BasicData::ModelSeeder - self.model_class = StructuredMeeting - self.seed_data_model_key = "meetings" - - attr_reader :project +module Types + module Patterns + Token = Data.define(:pattern, :key) do + private_class_method :new - def initialize(project, seed_data) - super(seed_data) - @project = project + def self.build(pattern) + new(pattern, pattern.tr("{}", "").to_sym) end - def model_attributes(meeting_data) - { - title: meeting_data["title"], - author: seed_data.find_reference(meeting_data["author"]), - duration: minutes_to_hours(meeting_data["duration"]), - project: - } + def custom_field? = key.to_s.include?("custom_field") + + def context_key + return key unless custom_field? + + key.to_s.gsub("#{context}_", "").to_sym end - def minutes_to_hours(duration) - duration && (duration / 60.0) + def context + return :work_package unless custom_field? + + context = key.to_s.gsub(/_?custom_field_\d+/, "") + return :work_package if context.blank? + + context.to_sym end end end diff --git a/app/models/types/patterns/token_property_mapper.rb b/app/models/types/patterns/token_property_mapper.rb new file mode 100644 index 000000000000..171c17076e2b --- /dev/null +++ b/app/models/types/patterns/token_property_mapper.rb @@ -0,0 +1,119 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Types + module Patterns + class TokenPropertyMapper + DEFAULT_FUNCTION = ->(key, context) { context.public_send(key.to_sym) }.curry + + TOKEN_PROPERTY_MAP = IceNine.deep_freeze( + { + accountable: { fn: ->(wp) { wp.responsible&.name }, label: -> { WorkPackage.human_attribute_name(:responsible) } }, + assignee: { fn: ->(wp) { wp.assigned_to&.name }, label: -> { WorkPackage.human_attribute_name(:assigned_to) } }, + author: { fn: ->(wp) { wp.author&.name }, label: -> { WorkPackage.human_attribute_name(:author) } }, + category: { fn: ->(wp) { wp.category&.name }, label: -> { WorkPackage.human_attribute_name(:category) } }, + creation_date: { fn: ->(wp) { wp.created_at }, label: -> { WorkPackage.human_attribute_name(:created_at) } }, + estimated_time: { fn: ->(wp) { wp.estimated_hours }, label: -> { WorkPackage.human_attribute_name(:estimated_hours) } }, + finish_date: { fn: ->(wp) { wp.due_date }, label: -> { WorkPackage.human_attribute_name(:due_date) } }, + parent: { fn: ->(wp) { wp.parent&.id }, label: -> { WorkPackage.human_attribute_name(:parent) } }, + parent_author: { fn: ->(wp) { wp.parent&.author&.name }, label: -> { WorkPackage.human_attribute_name(:author) } }, + parent_category: { fn: ->(wp) { wp.parent&.category&.name }, + label: -> { WorkPackage.human_attribute_name(:category) } }, + parent_creation_date: { fn: ->(wp) { wp.parent&.created_at }, + label: -> { WorkPackage.human_attribute_name(:created_at) } }, + parent_estimated_time: { fn: ->(wp) { wp.parent&.estimated_hours }, + label: -> { WorkPackage.human_attribute_name(:estimated_hours) } }, + parent_finish_date: { fn: ->(wp) { wp.parent&.due_date }, + label: -> { WorkPackage.human_attribute_name(:due_date) } }, + parent_priority: { fn: ->(wp) { wp.parent&.priority }, label: -> { WorkPackage.human_attribute_name(:priority) } }, + priority: { fn: ->(wp) { wp.priority }, label: -> { WorkPackage.human_attribute_name(:priority) } }, + project: { fn: ->(wp) { wp.project_id }, label: -> { WorkPackage.human_attribute_name(:project) } }, + project_active: { fn: ->(wp) { wp.project&.active? }, label: -> { Project.human_attribute_name(:active) } }, + project_name: { fn: ->(wp) { wp.project&.name }, label: -> { Project.human_attribute_name(:name) } }, + project_status: { fn: ->(wp) { wp.project&.status_code }, label: -> { Project.human_attribute_name(:status_code) } }, + project_parent: { fn: ->(wp) { wp.project&.parent_id }, label: -> { Project.human_attribute_name(:parent) } }, + project_public: { fn: ->(wp) { wp.project&.public? }, label: -> { Project.human_attribute_name(:public) } }, + start_date: { fn: ->(wp) { wp.start_date }, label: -> { WorkPackage.human_attribute_name(:start_date) } }, + status: { fn: ->(wp) { wp.status&.name }, label: -> { WorkPackage.human_attribute_name(:status) } }, + type: { fn: ->(wp) { wp.type&.name }, label: -> { WorkPackage.human_attribute_name(:type) } } + } + ) + + def fetch(key) + TOKEN_PROPERTY_MAP.dig(key, :fn) || DEFAULT_FUNCTION.call(key) + end + + alias :[] :fetch + + def tokens_for_type(type) + base = default_tokens + base[:work_package].merge!(tokenize(work_package_cfs_for(type))) + base[:project].merge!(tokenize(project_attributes, "project_")) + base[:parent].merge!(tokenize(all_work_package_cfs, "parent_")) + + base.transform_values { _1.sort_by(&:last).to_h } + end + + private + + def default_tokens + TOKEN_PROPERTY_MAP.keys.each_with_object({ project: {}, work_package: {}, parent: {} }) do |key, obj| + label = TOKEN_PROPERTY_MAP.dig(key, :label).call + + case key.to_s + when /^project_/ + obj[:project][key] = label + when /^parent_/ + obj[:parent][key] = label + else + obj[:work_package][key] = label + end + end + end + + def tokenize(custom_field_scope, prefix = nil) + custom_field_scope.pluck(:name, :id).to_h { |name, id| [:"#{prefix}custom_field_#{id}", name] } + end + + def work_package_cfs_for(type) + all_work_package_cfs.where(type: type) + end + + def all_work_package_cfs + WorkPackageCustomField.where(multi_value: false).where.not(field_format: %w[text bool link empty]).order(:name) + end + + def project_attributes + ProjectCustomField.where.not(field_format: %w[text bool link empty]) + .where(admin_only: false, multi_value: false).order(:name) + end + end + end +end diff --git a/app/models/user.rb b/app/models/user.rb index 4b3d33175723..e5f2d4622194 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -304,16 +304,16 @@ def name(formatter = nil) end end - # Return user's authentication provider for display def authentication_provider - return if identity_url.blank? + return nil if identity_url.blank? - identity_url.split(":", 2).first + slug = identity_url.split(":", 2).first + AuthProvider.find_by(slug:) end # Return user's authentication provider for display def human_authentication_provider - authentication_provider&.titleize + authentication_provider&.display_name end ## diff --git a/app/models/users/scopes/having_reminder_mail_to_send.rb b/app/models/users/scopes/having_reminder_mail_to_send.rb index f9170672bf01..3ba8f050556e 100644 --- a/app/models/users/scopes/having_reminder_mail_to_send.rb +++ b/app/models/users/scopes/having_reminder_mail_to_send.rb @@ -183,8 +183,13 @@ def quarters_between_earliest_and_latest(earliest_time, latest_time) # rubocop:d # The last quarter is the one smaller than the latest time. But needs to be at least equal to the first quarter. last_quarter = [first_quarter, latest_time.change(min: latest_time.min / 15 * 15)].max - (first_quarter.to_i..last_quarter.to_i) - .step(15.minutes) + quarters = if first_quarter == last_quarter + [first_quarter] + else + (first_quarter.to_i..last_quarter.to_i).step(15.minutes) + end + + quarters .map do |time| Time.zone.at(time) end diff --git a/app/models/work_package.rb b/app/models/work_package.rb index a16611e48b03..9e1a6eb34415 100644 --- a/app/models/work_package.rb +++ b/app/models/work_package.rb @@ -242,11 +242,6 @@ def blocked? .exists? end - def visible_relations(user) - relations - .visible(user) - end - def add_time_entry(attributes = {}) attributes.reverse_merge!( project:, diff --git a/app/models/work_package/pdf_export/common/common.rb b/app/models/work_package/pdf_export/common/common.rb index 63c055a40044..cf21300582f9 100644 --- a/app/models/work_package/pdf_export/common/common.rb +++ b/app/models/work_package/pdf_export/common/common.rb @@ -300,4 +300,9 @@ def write_horizontal_line(y_position, height, color) height, color ) end + + def start_new_page_if_needed + is_first_on_page = pdf.bounds.absolute_top - pdf.y < 10 + pdf.start_new_page unless is_first_on_page + end end diff --git a/app/models/work_package/pdf_export/export/schema.json b/app/models/work_package/pdf_export/export/schema.json index 316f60469667..f82609c7b715 100644 --- a/app/models/work_package/pdf_export/export/schema.json +++ b/app/models/work_package/pdf_export/export/schema.json @@ -769,6 +769,45 @@ } ] }, + "html_table" : { + "type" : "object", + "title" : "HTML table", + "x-example" : { + "table" : { + "auto_width" : true, + "header" : { + "background_color" : "F0F0F0", + "no_repeating" : true, + "size" : 12 + }, + "cell" : { + "background_color" : "000FFF", + "size" : 10 + } + } + }, + "properties" : { + "auto_width" : { + "title" : "Automatic column widths", + "description" : "Table columns should fit the content, equal spacing of columns if value is `false`", + "type" : "boolean" + }, + "header" : { + "$ref" : "#/$defs/table_header" + }, + "cell" : { + "$ref" : "#/$defs/table_cell" + } + }, + "allOf" : [ + { + "$ref" : "#/$defs/margin" + }, + { + "$ref" : "#/$defs/border" + } + ] + }, "headless_table" : { "type" : "object", "title" : "Markdown headless table", @@ -1554,7 +1593,7 @@ "x-example" : { "ordered_list_point" : { "template" : ".", - "alphabetical" : false, + "list_style_type" : "decimal", "spacing" : "0.75mm", "spanning" : true } @@ -1563,10 +1602,22 @@ "spacing" : { "$ref" : "#/$defs/measurement" }, - "alphabetical" : { - "title" : "Alphabetical bullet points", - "description" : "Convert the list item number into a character, eg. `a.` `b.` `c.`", - "type" : "boolean" + "alphabetical": { + "title": "Alphabetical bullet points", + "description": "(deprecated; use list_style_type) Convert the list item number into a character, eg. `a.` `b.` `c.`", + "type": "boolean" + }, + "list_style_type": { + "title": "List style type", + "description": "The style of the list bullet points, eg. `decimal`, `lower-latin`, `upper-roman`", + "type": "string", + "enum": [ + "decimal", + "lower-latin", + "lower-roman", + "upper-latin", + "upper-roman" + ] }, "spanning" : { "title" : "Spanning", diff --git a/app/models/work_package/pdf_export/export/standard.yml b/app/models/work_package/pdf_export/export/standard.yml index ecfc8a0a904b..90bb690fe34a 100644 --- a/app/models/work_package/pdf_export/export/standard.yml +++ b/app/models/work_package/pdf_export/export/standard.yml @@ -138,6 +138,16 @@ work_package: spacing: 1 ordered_list_point: spacing: 4 + spanning: true + list_style_type: decimal + ordered_list_point_2: + list_style_type: lower-latin + ordered_list_point_3: + list_style_type: lower-roman + ordered_list_point_4: + list_style_type: upper-latin + ordered_list_point_5: + list_style_type: upper-roman task_list: spacing: 1 task_list_point: @@ -192,6 +202,17 @@ work_package: size: 8 border_width: 0.25 padding: 5 + html_table: + auto_width: true + margin_top: 4 + margin_bottom: 4 + header: + size: 9 + styles: [ "bold" ] + cell: + size: 8 + border_width: 0.25 + padding: 5 alerts: NOTE: border_color: '0969da' diff --git a/app/models/work_package/pdf_export/generator/contracts.yml b/app/models/work_package/pdf_export/generator/contracts.yml index 97930db5db6b..1559578f0bd0 100644 --- a/app/models/work_package/pdf_export/generator/contracts.yml +++ b/app/models/work_package/pdf_export/generator/contracts.yml @@ -62,15 +62,25 @@ ordered-list: spacing: 3mm padding-bottom: 3mm -ordered-list-point: +ordered_list_point: spanning: true + list_style_type: decimal ordered-list-point-1: template: '()' -ordered-list-point-2: +ordered_list_point_2: template: ')' - alphabetical: true + list_style_type: lower-latin + +ordered_list_point_3: + list_style_type: lower-roman + +ordered_list_point_4: + list_style_type: upper-latin + +ordered_list_point_5: + list_style_type: upper-roman hrule: margin-top: 2mm @@ -111,15 +121,17 @@ table: background-color: 'F0F0F0' size: 10 cell: - no-border: true padding: 1mm size: 9 -headless-table: +html_table: margin-top: 2mm margin-bottom: 4mm + header: + styles: [ 'bold' ] + background-color: 'F0F0F0' + size: 10 cell: - no-border: true padding: 1mm size: 9 @@ -211,10 +223,11 @@ codeblock: margin-bottom: 2mm image: - max-width: 50mm - margin: 2mm margin-bottom: 3mm align: "center" + caption: + size: 8 + align: "center" image-classes: small: diff --git a/app/models/work_package/pdf_export/generator/generator.rb b/app/models/work_package/pdf_export/generator/generator.rb index 2e152e561526..f9be2ea97186 100644 --- a/app/models/work_package/pdf_export/generator/generator.rb +++ b/app/models/work_package/pdf_export/generator/generator.rb @@ -29,6 +29,7 @@ #++ require "md_to_pdf/core" +require "md_to_pdf/hyphen" module WorkPackage::PDFExport::Generator::Generator class MD2PDFGenerator @@ -65,7 +66,7 @@ def generate!(markdown, options, image_loader) .merge(@styles.default_fields) .merge(options) doc = parse_frontmatter_markdown(markdown, fields) - @hyphens = Text::Hyphen.new(language: options[:language], left: 2, right: 2) if options[:language].present? + @hyphens = Hyphen.new(options[:language], true) if options[:language].present? render_doc(doc) end @@ -89,7 +90,7 @@ def image_url_to_local_file(url, _node = nil) def hyphenate(text) return text if @hyphens.nil? - @hyphens.visualize(text, Prawn::Text::SHY) + @hyphens.hyphenate(text) end def handle_mention_html_tag(tag, node, opts) diff --git a/app/models/work_packages/relations.rb b/app/models/work_packages/relations.rb index 12dc4d3da507..d28b23f159f8 100644 --- a/app/models/work_packages/relations.rb +++ b/app/models/work_packages/relations.rb @@ -29,14 +29,23 @@ module WorkPackages::Relations included do # All relations of the work package in both directions. - # Mostly used to have the relations destroyed upon destruction of the work package. # rubocop:disable Rails/InverseOf has_many :relations, ->(work_package) { unscope(:where) .of_work_package(work_package) }, - dependent: :destroy + dependent: :destroy do + def visible(user = User.current) + # The work_package_focus_scope in here is used to improve performance by reducing the number of + # work packages that have to be checked for whether they are visible. + # Since the method looks for relations on the current work package, only work packages + # that are on either end of a relation with the current work package need to be considered. + # The number should be quite small compared to the total number of work packages. + merge(Relation.visible(user, + work_package_focus_scope: Arel::Nodes::UnionAll.new(select(:from_id).arel, select(:to_id).arel))) + end + end # rubocop:enable Rails/InverseOf # Relations where the current work package follows another one. diff --git a/app/seeders/basic_data/model_seeder.rb b/app/seeders/basic_data/model_seeder.rb index 979518804194..37e7a4e57f81 100644 --- a/app/seeders/basic_data/model_seeder.rb +++ b/app/seeders/basic_data/model_seeder.rb @@ -39,13 +39,21 @@ class ModelSeeder < Seeder def seed_data! model_class.transaction do + prepare! models_data.each do |model_data| - model = model_class.create!(model_attributes(model_data)) - seed_data.store_reference(model_data["reference"], model) + create_model!(model_data) end end end + def prepare!; end + + def create_model!(model_data) + model_class + .create!(model_attributes(model_data)) + .tap { |model| seed_data.store_reference(model_data["reference"], model) } + end + def mapped_models_data models_data.each_with_object({}) do |model_data, models| models[model_data["reference"]] = model_attributes(model_data) diff --git a/app/seeders/demo_data/project_seeder.rb b/app/seeders/demo_data/project_seeder.rb index cb7f1fb66190..5b4090e6e43d 100644 --- a/app/seeders/demo_data/project_seeder.rb +++ b/app/seeders/demo_data/project_seeder.rb @@ -55,7 +55,7 @@ def project_content_seeder_classes DemoData::WikiSeeder, DemoData::WorkPackageSeeder, DemoData::WorkPackageBoardSeeder, - ::Meetings::DemoData::MeetingSeeder, + ::Meetings::DemoData::MeetingSeriesSeeder, ::Meetings::DemoData::MeetingAgendaItemsSeeder ] end diff --git a/app/seeders/env_data/custom_design_seeder.rb b/app/seeders/env_data/custom_design_seeder.rb new file mode 100644 index 000000000000..82bd3fa07201 --- /dev/null +++ b/app/seeders/env_data/custom_design_seeder.rb @@ -0,0 +1,146 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +module EnvData + class CustomDesignSeeder < Seeder + def seed_data! + custom_style = CustomStyle.current || CustomStyle.create! + + print_status " ↳ Setting custom design colors" do + seed_colors + seed_export_color(custom_style) + end + + print_status " ↳ Setting custom logos" do + seed_logos(custom_style) + end + + custom_style.save! + end + + def applicable? + Setting.seed_design.present? + end + + private + + def seed_logos(custom_style) + CustomStyle.uploaders.each_key do |key| + data = Setting.seed_design[key.to_s] + + if data.blank? + custom_style.public_send(:"remove_#{key}") + elsif data.match?(/^https?:\/\//) + seed_remote_url(custom_style, key, data) + else + io = Base64StringIO.new(data, key.to_s) + custom_style.public_send(:"#{key}=", io) + end + end + end + + def seed_colors + OpenProject::CustomStyles::Design.customizable_variables.each do |variable| + key = variable.to_s.underscore + value = Setting.seed_design[key] + + if value.blank? + DesignColor.where(variable:).delete_all + else + design_color = DesignColor.find_or_initialize_by(variable:) + design_color.hexcode = value + design_color.save! + end + end + end + + def seed_export_color(custom_style) + value = Setting.seed_design["export_cover_text_color"] + custom_style.export_cover_text_color = value.presence + end + + def seed_remote_url(custom_style, key, url) + response = HTTPX.get(url) + raise "Failed to set #{key} from #{url}: #{response}" unless response.status == 200 + + build_attachable_file(key.to_s, response.body.to_s) do |file| + custom_style.public_send(:"#{key}=", file) + custom_style.save! + end + end + + def build_attachable_file(file_name, data) + Tempfile.open(file_name) do |tempfile| + tempfile.binmode + tempfile.write(data) + tempfile.rewind + + content_type = OpenProject::ContentTypeDetector.new(tempfile.path).detect + mime_type = MIME::Types[content_type].last + raise ArgumentError, "Unknown mime type: #{content_type}" if mime_type.nil? + + file = OpenProject::Files.build_uploaded_file(tempfile, + content_type, + file_name: "#{file_name}.#{mime_type.preferred_extension}") + + yield(file) + end + end + + class Base64StringIO < StringIO + attr_reader :filename + + def initialize(data_url, base_name) + metadata, encoded = data_url.split(",") + + if metadata.blank? || encoded.blank? || !metadata.start_with?("data:") + raise ArgumentError, "Expected data URL, got #{data_url}" + end + + @filename = "#{base_name}.#{extension(metadata)}" + bytes = ::Base64.strict_decode64(encoded) + + super(bytes) + end + + def original_filename + filename + end + + def extension(metadata) + content_type = metadata.match(%r{data:([^;]+)})&.captures&.first + raise ArgumentError, "Failed to parse content type from metadata: #{metadata}" if content_type.nil? + + mime_type = MIME::Types[content_type].last + raise ArgumentError, "Unknown mime type: #{content_type}" if mime_type.nil? + + mime_type.preferred_extension + end + end + end +end diff --git a/app/seeders/env_data/token_seeder.rb b/app/seeders/env_data/token_seeder.rb new file mode 100644 index 000000000000..36ed8740ca39 --- /dev/null +++ b/app/seeders/env_data/token_seeder.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +module EnvData + class TokenSeeder < Seeder + def seed_data! + Rails.logger.debug "*** Seeding Enterprise support token from ENV" + + token = Setting.seed_enterprise_token + if token.present? + EnterpriseToken.create! encoded_token: token.gsub("\\n", "\n") + end + end + + def applicable? + !EnterpriseToken.exists? + end + end +end diff --git a/app/seeders/env_data_seeder.rb b/app/seeders/env_data_seeder.rb index bbda615cb625..a8ca8e16b5cb 100644 --- a/app/seeders/env_data_seeder.rb +++ b/app/seeders/env_data_seeder.rb @@ -27,7 +27,9 @@ class EnvDataSeeder < CompositeSeeder def data_seeder_classes [ - EnvData::LdapSeeder + EnvData::CustomDesignSeeder, + EnvData::LdapSeeder, + EnvData::TokenSeeder ] end diff --git a/app/seeders/source/seed_data.rb b/app/seeders/source/seed_data.rb index 13f9726bfe39..55d0e9829aec 100644 --- a/app/seeders/source/seed_data.rb +++ b/app/seeders/source/seed_data.rb @@ -60,10 +60,10 @@ def find_reference(reference, *fallbacks, default: :__unset__) default else references = [reference, *fallbacks].map(&:inspect) - message = <<~STRING - Nothing registered with #{'reference'.pluralize(references.count)} #{references.to_sentence(locale: false)} - Perhaps you forgot to add the `attribute_names_for_lookups` for your seeder? - STRING + message = "Nothing registered with #{'reference'.pluralize(references.count)} #{references.to_sentence(locale: false)}" + if Rails.env.local? + message += "\nPerhaps you forgot to add the `attribute_names_for_lookups` for your seeder?" + end raise ArgumentError, message end end diff --git a/app/services/add_work_package_note_service.rb b/app/services/add_work_package_note_service.rb index d0bf6ff79b61..69bb8054f419 100644 --- a/app/services/add_work_package_note_service.rb +++ b/app/services/add_work_package_note_service.rb @@ -32,6 +32,8 @@ class AddWorkPackageNoteService include Contracted + include Shared::ServiceContext + attr_accessor :user, :work_package def initialize(user:, work_package:) @@ -41,7 +43,7 @@ def initialize(user:, work_package:) end def call(notes, send_notifications: nil) - Journal::NotificationConfiguration.with send_notifications do + in_context(work_package, send_notifications:) do work_package.add_journal(user:, notes:) success, errors = validate_and_yield(work_package, user) do diff --git a/app/services/authentication/omniauth_service.rb b/app/services/authentication/omniauth_service.rb index 47f18d600691..bade473d3233 100644 --- a/app/services/authentication/omniauth_service.rb +++ b/app/services/authentication/omniauth_service.rb @@ -159,13 +159,11 @@ def find_existing_user end ## - # Allow to map existing users with an Omniauth source if the login - # already exists, and no existing auth source or omniauth provider is - # linked + # Allow to map existing users with an Omniauth source if the login already exists def remap_existing_user return unless Setting.oauth_allow_remapping_of_existing_users? - User.not_builtin.find_by_login(user_attributes[:login]) # rubocop:disable Rails/DynamicFindBy + User.not_builtin.find_by_login(user_attributes[:login]) end ## @@ -285,7 +283,7 @@ def identity_url_from_omniauth # Try to provide some context of the auth_hash in case of errors def auth_uid hash = auth_hash || {} - hash.dig(:info, :uid) || hash.dig(:uid) || "unknown" + hash.dig(:info, :uid) || hash[:uid] || "unknown" end end end diff --git a/app/services/authorization/enterprise_service.rb b/app/services/authorization/enterprise_service.rb index 4e419b03d20e..e070d85775ce 100644 --- a/app/services/authorization/enterprise_service.rb +++ b/app/services/authorization/enterprise_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -35,6 +37,7 @@ class Authorization::EnterpriseService conditional_highlighting custom_actions custom_field_hierarchies + customize_life_cycle date_alerts define_custom_style edit_attribute_groups @@ -51,6 +54,7 @@ class Authorization::EnterpriseService virus_scanning work_package_query_relation_columns work_package_sharing + work_package_subject_generation ].freeze def initialize(token) diff --git a/app/services/base_type_service.rb b/app/services/base_type_service.rb index 36750ca1a461..8ba1b086bdae 100644 --- a/app/services/base_type_service.rb +++ b/app/services/base_type_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -71,13 +73,14 @@ def update(params, options) def set_params_and_validate(params) # Only set attribute groups when it exists # (Regression #28400) - set_attribute_groups(params) unless params[:attribute_groups].nil? + set_attribute_groups(params) if params[:attribute_groups] # This should go before `set_scalar_params` call to get the # project_ids, custom_field_ids diffs from the type and the params. # For determining the active custom fields for the type, it is necessary # to know whether the type is a milestone or not. set_milestone_param(params) unless params[:is_milestone].nil? + set_active_custom_fields set_active_custom_fields_for_project_ids(params[:project_ids]) if params[:project_ids].present? @@ -92,7 +95,7 @@ def set_milestone_param(params) end def set_scalar_params(params) - type.attributes = params.except(:attribute_groups) + type.attributes = params.except(:attribute_groups, :subject_configuration, :subject_pattern) end def set_attribute_groups(params) diff --git a/app/services/bulk_services/project_mappings/base_create_service.rb b/app/services/bulk_services/project_mappings/base_create_service.rb new file mode 100644 index 000000000000..03d7c209301c --- /dev/null +++ b/app/services/bulk_services/project_mappings/base_create_service.rb @@ -0,0 +1,131 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module BulkServices + module ProjectMappings + class BaseCreateService < ::BaseServices::BaseCallable + attr_reader :mapping_context + + delegate :incoming_projects, :mapping_model_class, to: :mapping_context + + def initialize(user:, mapping_context: nil) + super() + @user = user + @mapping_context = mapping_context + end + + def perform(params = {}) + service_call = validate_permissions + service_call = validate_contract(service_call, params) if service_call.success? + service_call = perform_bulk_create(service_call) if service_call.success? + service_call = after_perform(service_call, params) if service_call.success? + + service_call + end + + private + + def validate_permissions + return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty? + + if @user.allowed_in_project?(permission, incoming_projects) + ServiceResult.success + else + ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized")) + end + end + + def validate_contract(service_call, params) + extra_attributes = attributes_from_params(params) + mapping_attributes_for_all_projects = mapping_context.mapping_attributes_for_all_projects(extra_attributes) + set_attributes_results = mapping_attributes_for_all_projects.map do |mapping_attributes| + set_attributes(mapping_attributes) + end + + if (failures = set_attributes_results.select(&:failure?)).any? + service_call.success = false + service_call.errors = failures.map(&:errors) + end + + service_call.result = set_attributes_results.map(&:result) + + service_call + end + + # override in subclasses to pass additional parameters to the `SetAttributesService`. + def attributes_from_params(_params) + {} + end + + def perform_bulk_create(service_call) + mapping_model_class.insert_all( + service_call.result.map { |model| model.attributes.compact }, + unique_by: [:project_id, model_foreign_key_id.to_sym] + ) + + service_call + end + + def after_perform(service_call, _params) + service_call # Subclasses can override this method to add additional logic + end + + def set_attributes(params) + attributes_service_class + .new(user: @user, + model: mapping_model_class.new, + contract_class: default_contract_class) + .call(params) + end + + # @return [Symbol] the permission required to create the mapping + def permission + raise NotImplementedError + end + + # @return [Symbol] the column name of the mapping + def model_foreign_key_id + raise NotImplementedError + end + + def attributes_service_class + "#{namespace}::SetAttributesService".constantize + end + + def default_contract_class + "#{namespace}::UpdateContract".constantize + end + + def namespace + self.class.name.deconstantize.pluralize + end + end + end +end diff --git a/app/services/bulk_services/project_mappings/mapping_context.rb b/app/services/bulk_services/project_mappings/mapping_context.rb new file mode 100644 index 000000000000..318e81d18b9b --- /dev/null +++ b/app/services/bulk_services/project_mappings/mapping_context.rb @@ -0,0 +1,85 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +# Gives the projects to map and the attributes to be used for the mapping. +module BulkServices + module ProjectMappings + class MappingContext < MappingContextBase + attr_reader :model, + :projects, + :model_foreign_key_id, + :include_sub_projects + + def initialize(mapping_model_class:, + model:, + projects:, + model_foreign_key_id:, + include_sub_projects: false) + super(mapping_model_class:) + @model = model + @projects = projects + @model_foreign_key_id = model_foreign_key_id + @include_sub_projects = include_sub_projects + end + + def mapping_attributes_for_all_projects(extra_attributes) + project_ids_to_map.map do |project_id| + { + project_id:, + model_foreign_key_id => model.id + }.merge(extra_attributes) + end + end + + def incoming_projects + projects.each_with_object(Set.new) do |project, projects_set| + next unless project.active? + + projects_set << project + projects_set.merge(project.active_subprojects.to_a) if include_sub_projects + end.to_a + end + + private + + def project_ids_to_map + project_ids = incoming_projects.pluck(:id) + project_ids - project_ids_already_mapped(project_ids) + end + + def project_ids_already_mapped(project_ids) + mapping_model_class.where( + model_foreign_key_id => @model.id, + project_id: project_ids + ).pluck(:project_id) + end + end + end +end diff --git a/app/services/bulk_services/project_mappings/mapping_context_base.rb b/app/services/bulk_services/project_mappings/mapping_context_base.rb new file mode 100644 index 000000000000..9a27261df030 --- /dev/null +++ b/app/services/bulk_services/project_mappings/mapping_context_base.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +# Gives the projects to map and the attributes to be used for the mapping. +module BulkServices + module ProjectMappings + class MappingContextBase + attr_reader :mapping_model_class + + def initialize(mapping_model_class:) + @mapping_model_class = mapping_model_class + end + + def mapping_attributes_for_all_projects(params) + raise NotImplementedError, "This method must be implemented in a subclass" + end + + def incoming_projects + raise NotImplementedError, "This method must be implemented in a subclass" + end + end + end +end diff --git a/app/services/custom_fields/custom_field_projects/bulk_create_service.rb b/app/services/custom_fields/custom_field_projects/bulk_create_service.rb index 3b452006ce68..7dd66c4c3e15 100644 --- a/app/services/custom_fields/custom_field_projects/bulk_create_service.rb +++ b/app/services/custom_fields/custom_field_projects/bulk_create_service.rb @@ -30,96 +30,20 @@ module CustomFields module CustomFieldProjects - class BulkCreateService < ::BaseServices::BaseCallable - def initialize(user:, projects:, custom_field:, include_sub_projects: false) - super() - @user = user - @projects = projects - @custom_field = custom_field - @include_sub_projects = include_sub_projects - end - - def perform - service_call = validate_permissions - service_call = validate_contract(service_call, incoming_mapping_ids) if service_call.success? - service_call = perform_bulk_create(service_call) if service_call.success? - - service_call - end - - private - - def validate_permissions(permission: :select_custom_fields) - return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty? - - if @user.allowed_in_project?(permission, incoming_projects) - ServiceResult.success - else - ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized")) - end - end - - def validate_contract(service_call, project_ids) - set_attributes_results = project_ids.map do |id| - set_attributes(project_id: id, custom_field_id: @custom_field.id) - end - - if (failures = set_attributes_results.select(&:failure?)).any? - service_call.success = false - service_call.errors = failures.map(&:errors) - else - service_call.result = set_attributes_results.map(&:result) - end - - service_call - end - - def perform_bulk_create(service_call) - custom_field_project_mapping_class.insert_all( - service_call.result.map { |model| model.attributes.slice("project_id", "custom_field_id") }, - unique_by: %i[project_id custom_field_id] + class BulkCreateService < ::BulkServices::ProjectMappings::BaseCreateService + def initialize(user:, projects:, model:, include_sub_projects: false) + mapping_context = ::BulkServices::ProjectMappings::MappingContext.new( + mapping_model_class: CustomFieldsProject, + model:, + projects:, + model_foreign_key_id:, + include_sub_projects: ) - - service_call - end - - def incoming_mapping_ids - project_ids = incoming_projects.pluck(:id) - project_ids - existing_project_mappings(project_ids) - end - - def incoming_projects - @projects.each_with_object(Set.new) do |project, projects_set| - next unless project.active? - - projects_set << project - projects_set.merge(project.active_subprojects.to_a) if @include_sub_projects - end.to_a - end - - def existing_project_mappings(project_ids) - custom_field_project_mapping_class.where( - custom_field_id: @custom_field.id, - project_id: project_ids - ).pluck(:project_id) - end - - def set_attributes(params) - attributes_service_class - .new(user: @user, - model: instance(params), - contract_class: default_contract_class, - contract_options: {}) - .call(params) - end - - def instance(params) - custom_field_project_mapping_class.new(params) + super(user:, mapping_context:) end - def attributes_service_class = CustomFields::CustomFieldProjects::SetAttributesService - def default_contract_class = CustomFields::CustomFieldProjects::UpdateContract - def custom_field_project_mapping_class = CustomFieldsProject + def permission = :select_custom_fields + def model_foreign_key_id = :custom_field_id end end end diff --git a/app/services/duration_converter.rb b/app/services/duration_converter.rb index c16c3b58b0bf..65b023af8517 100644 --- a/app/services/duration_converter.rb +++ b/app/services/duration_converter.rb @@ -111,7 +111,9 @@ def output(duration_in_hours, format: default_format) def parseable?(duration_string) if number = Integer(duration_string, 10, exception: false) || Float(duration_string, exception: false) - number >= 0 + # ruby 3.4 started being able to parse strings like "1." as 1.0. + # However, that does not work with ChronicDuration. + number >= 0 && !duration_string.ends_with?(".") else begin do_parse(duration_string) diff --git a/app/services/ldap/base_service.rb b/app/services/ldap/base_service.rb index a2afb8b3642e..00ce75cb1212 100644 --- a/app/services/ldap/base_service.rb +++ b/app/services/ldap/base_service.rb @@ -124,7 +124,7 @@ def find_entries_by(login:, ldap_con: new_ldap_connection) filter: ldap.login_filter(login), attributes: ldap.search_attributes ) - .map { |entry| ldap.get_user_attributes_from_ldap_entry(entry).except(:dn) } + &.map { |entry| ldap.get_user_attributes_from_ldap_entry(entry).except(:dn) } || [] end def new_ldap_connection diff --git a/app/services/project_custom_field_project_mappings/bulk_create_service.rb b/app/services/project_custom_field_project_mappings/bulk_create_service.rb index 432112326ac1..19bbd7594ba8 100644 --- a/app/services/project_custom_field_project_mappings/bulk_create_service.rb +++ b/app/services/project_custom_field_project_mappings/bulk_create_service.rb @@ -29,19 +29,21 @@ #++ module ProjectCustomFieldProjectMappings - class BulkCreateService < ::CustomFields::CustomFieldProjects::BulkCreateService - def initialize(user:, projects:, project_custom_field:, include_sub_projects: false) - super(user:, projects:, custom_field: project_custom_field, include_sub_projects:) + class BulkCreateService < ::BulkServices::ProjectMappings::BaseCreateService + def initialize(user:, projects:, model:, include_sub_projects: false) + mapping_context = ::BulkServices::ProjectMappings::MappingContext.new( + mapping_model_class: ProjectCustomFieldProjectMapping, + model:, + projects:, + model_foreign_key_id:, + include_sub_projects: + ) + super(user:, mapping_context:) end private - def validate_permissions(permission: :select_project_custom_fields) - super - end - - def attributes_service_class = ProjectCustomFieldProjectMappings::SetAttributesService - def default_contract_class = ProjectCustomFieldProjectMappings::UpdateContract - def custom_field_project_mapping_class = ProjectCustomFieldProjectMapping + def permission = :select_project_custom_fields + def model_foreign_key_id = :custom_field_id end end diff --git a/app/services/service_result.rb b/app/services/service_result.rb index 950a140f5d49..f22a576ef742 100644 --- a/app/services/service_result.rb +++ b/app/services/service_result.rb @@ -223,6 +223,13 @@ def state @state ||= ::Shared::ServiceState.build end + ## + # Required as we create an errors object bound to this ServiceResult. + # calling `errors#full_messages` will call `human_attribute_name` here. + def self.human_attribute_name(*) + ApplicationRecord.human_attribute_name(*) + end + private def initialize_errors(errors) diff --git a/app/services/update_type_service.rb b/app/services/update_type_service.rb index be475bdf48ec..cfb28450dfe2 100644 --- a/app/services/update_type_service.rb +++ b/app/services/update_type_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -35,4 +37,40 @@ def call(params) super(params, {}) end + + private + + def set_params_and_validate(params) + # Set patterns includes a data validation before assigning the value to the attribute. + # A validation failure should return a service call failure. + if params[:patterns].present? + validate_enterprise_action(params[:patterns]) + set_patterns(params[:patterns]) + return [false, type.errors] if type.errors.any? + end + + super + end + + def validate_enterprise_action(patterns) + change_from_manual_to_generated = !type.patterns.subject&.enabled? && patterns.dig(:subject, :enabled) + action = :work_package_subject_generation + + if change_from_manual_to_generated && !EnterpriseToken.allows_to?(action) + type.errors.add(:patterns, :error_enterprise_only, action: action.to_s.titleize) + end + end + + def set_patterns(patterns) + Types::Patterns::Collection + .build(patterns:) + .either( + ->(collection) { type.patterns = collection }, + ->(result) do + result.errors(full: true).messages.each do |message| + type.errors.add(:patterns, message.text) + end + end + ) + end end diff --git a/app/services/users/register_user_service.rb b/app/services/users/register_user_service.rb index 3ab6efc7baad..b498044d593d 100644 --- a/app/services/users/register_user_service.rb +++ b/app/services/users/register_user_service.rb @@ -137,7 +137,7 @@ def limited_provider?(user) end def provider_name(user) - user.authentication_provider&.downcase + user.authentication_provider&.slug&.downcase end def register_by_email_activation diff --git a/app/services/work_packages/create_service.rb b/app/services/work_packages/create_service.rb index 600c0f5d0eb2..69961b847cda 100644 --- a/app/services/work_packages/create_service.rb +++ b/app/services/work_packages/create_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -30,17 +32,15 @@ class WorkPackages::CreateService < BaseServices::BaseCallable include ::WorkPackages::Shared::UpdateAncestors include ::Shared::ServiceContext - attr_accessor :user, - :contract_class + attr_reader :user, :contract_class def initialize(user:, contract_class: WorkPackages::CreateContract) - self.user = user - self.contract_class = contract_class + super() + @user = user + @contract_class = contract_class end - def perform(work_package: WorkPackage.new, - send_notifications: nil, - **attributes) + def perform(work_package: WorkPackage.new, send_notifications: nil, **attributes) in_user_context(send_notifications:) do create(attributes, work_package) end @@ -55,8 +55,8 @@ def create(attributes, work_package) if result.success work_package.attachments = work_package.attachments_replacements if work_package.attachments_replacements work_package.save - else - false + + set_templated_subject(work_package) end if result.success? @@ -67,25 +67,24 @@ def create(attributes, work_package) end set_user_as_watcher(work_package) - else - result.success = false end result end - def set_attributes(attributes, wp) - attributes_service_class - .new(user:, - model: wp, - contract_class:) - .call(attributes) + def set_templated_subject(work_package) + return true unless work_package.type&.replacement_pattern_defined_for?(:subject) + + work_package.subject = work_package.type.enabled_patterns[:subject].resolve(work_package) + work_package.save + end + + def set_attributes(attributes, work_package) + attributes_service_class.new(user:, model: work_package, contract_class:).call(attributes) end def reschedule_related(work_package) - result = WorkPackages::SetScheduleService - .new(user:, work_package:) - .call + result = WorkPackages::SetScheduleService.new(user:, work_package:).call result.self_and_dependent.each do |r| unless r.result.save @@ -100,9 +99,7 @@ def reschedule_related(work_package) def set_user_as_watcher(work_package) # We don't care if it fails here. If it does # the user simply does not become watcher - Services::CreateWatcher - .new(work_package, user) - .run(send_notifications: false) + Services::CreateWatcher.new(work_package, user).run(send_notifications: false) end def attributes_service_class diff --git a/app/services/work_packages/set_attributes_service.rb b/app/services/work_packages/set_attributes_service.rb index cd1118d965af..b7fe5d9312f8 100644 --- a/app/services/work_packages/set_attributes_service.rb +++ b/app/services/work_packages/set_attributes_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -43,6 +45,13 @@ def set_attributes(attributes) end set_custom_attributes(attributes) + mark_templated_subject + end + + def mark_templated_subject + if work_package.type&.replacement_pattern_defined_for?(:subject) + work_package.subject = I18n.t("work_packages.templated_subject_hint", type: work_package.type.name) + end end def set_static_attributes(attributes) @@ -298,15 +307,14 @@ def derive_progress_values_class def set_version_to_nil if work_package.version && - work_package.project && - work_package.project.shared_versions.exclude?(work_package.version) + work_package.project&.shared_versions&.exclude?(work_package.version) work_package.version = nil end end def set_parent_to_nil if !Setting.cross_project_work_package_relations? && - !work_package.parent_changed? + !work_package.parent_changed? work_package.parent = nil end @@ -368,7 +376,7 @@ def new_start_date def new_start_date_from_parent return unless work_package.parent_id_changed? && - work_package.parent + work_package.parent work_package.parent.soonest_start end diff --git a/app/services/work_packages/update_service.rb b/app/services/work_packages/update_service.rb index 4788e7374239..bed33bd22148 100644 --- a/app/services/work_packages/update_service.rb +++ b/app/services/work_packages/update_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -39,7 +41,14 @@ def initialize(user:, model:, contract_class: nil, contract_options: {}, cause_o private + def set_templated_attributes + model.type.enabled_patterns.each do |key, pattern| + model.public_send(:"#{key}=", pattern.resolve(model)) + end + end + def after_perform(service_call) + set_templated_attributes update_related_work_packages(service_call) cleanup(service_call.result) diff --git a/app/views/admin/settings/api_settings/show.html.erb b/app/views/admin/settings/api_settings/show.html.erb index 2c8a696ca2e3..264c3b31223a 100644 --- a/app/views/admin/settings/api_settings/show.html.erb +++ b/app/views/admin/settings/api_settings/show.html.erb @@ -70,7 +70,7 @@ See COPYRIGHT and LICENSE files for more details.
- Cross-Origin Resource Sharing (CORS) + <%= I18n.t("setting_apiv3_cors_title") %>
<%= setting_check_box :apiv3_cors_enabled %> diff --git a/app/views/admin/settings/new_project_settings/show.html.erb b/app/views/admin/settings/new_project_settings/show.html.erb index b879a6594091..61bdec015e14 100644 --- a/app/views/admin/settings/new_project_settings/show.html.erb +++ b/app/views/admin/settings/new_project_settings/show.html.erb @@ -42,13 +42,15 @@ See COPYRIGHT and LICENSE files for more details.
<%= setting_check_box :default_projects_public %>
<%= setting_multiselect(:default_projects_modules, - OpenProject::AccessControl.available_project_modules.collect {|m| [l_or_humanize(m, prefix: "project_module_"), m.to_s]}) %> + OpenProject::AccessControl + .available_project_modules(sorted: true) + .collect { |m| [l_or_humanize(m, prefix: "project_module_"), m.to_s] }) %>
<%= setting_select :new_project_user_role_id, - Role.givable.collect {|r| [r.name, r.id.to_s]}, - blank: "--- #{t(:actionview_instancetag_blank_option)} ---", - container_class: '-middle' %>
+ ProjectRole.givable.collect { |r| [r.name, r.id.to_s] }, + blank: "--- #{t(:actionview_instancetag_blank_option)} ---", + container_class: "-middle" %>
- <%= styled_button_tag t(:button_save), class: '-primary -with-icon icon-checkmark' %> + <%= styled_button_tag t(:button_save), class: "-primary -with-icon icon-checkmark" %> <% end %> diff --git a/app/views/admin/settings/project_life_cycle_step_definitions/form.html.erb b/app/views/admin/settings/project_life_cycle_step_definitions/form.html.erb new file mode 100644 index 000000000000..e11d2ad56bac --- /dev/null +++ b/app/views/admin/settings/project_life_cycle_step_definitions/form.html.erb @@ -0,0 +1,44 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<% heading_scope = "#{@definition.persisted? ? :edit : :new}_#{@definition.is_a?(Project::StageDefinition) ? :stage : :gate}" %> + +<% html_title t(:label_administration), + t("settings.project_life_cycle_step_definitions.heading"), + t("settings.project_life_cycle_step_definitions.#{heading_scope}.heading") %> + +<%= render Settings::ProjectLifeCycleStepDefinitions::FormHeaderComponent.new(@definition, heading_scope:) %> + +<%= + primer_form_with( + model: [:admin, :settings, @definition.becomes(Project::LifeCycleStepDefinition)] + ) do |f| + render Projects::LifeCycleStepDefinitions::Form.new(f) + end +%> diff --git a/app/views/admin/settings/project_life_cycle_step_definitions/index.html.erb b/app/views/admin/settings/project_life_cycle_step_definitions/index.html.erb new file mode 100644 index 000000000000..cf8877a719e5 --- /dev/null +++ b/app/views/admin/settings/project_life_cycle_step_definitions/index.html.erb @@ -0,0 +1,33 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<% html_title t(:label_administration), t("settings.project_life_cycle_step_definitions.heading") %> + +<%= render Settings::ProjectLifeCycleStepDefinitions::IndexHeaderComponent.new %> +<%= render Settings::ProjectLifeCycleStepDefinitions::IndexComponent.new(definitions: @definitions) %> diff --git a/app/views/augmented/_autocomplete_select_decoration.html.erb b/app/views/augmented/_autocomplete_select_decoration.html.erb deleted file mode 100644 index e96307d43051..000000000000 --- a/app/views/augmented/_autocomplete_select_decoration.html.erb +++ /dev/null @@ -1,14 +0,0 @@ - diff --git a/app/views/custom_actions/_form.html.erb b/app/views/custom_actions/_form.html.erb index b1e2620f55a7..0a36eeb5ceca 100644 --- a/app/views/custom_actions/_form.html.erb +++ b/app/views/custom_actions/_form.html.erb @@ -1,5 +1,5 @@ <% initialize_hide_sections_with @custom_action.all_actions.map { |a| { key: a.key, label: a.human_name } }, - @custom_action.actions.map { |a| { key: a.key, label: a.human_name } } %> + @custom_action.actions.map { |a| { key: a.key, label: a.human_name } } %>
<%= f.text_field :name, required: true, container_class: '-middle' %> @@ -17,18 +17,36 @@
<%= styled_label_tag("custom_action_conditions_#{condition.key}", condition.human_name, class: '-top') %> <% input_name = "custom_action[conditions][#{condition.key}]" %> - <% selected_values = condition.values - select_options = condition.allowed_values.map { |v| { label: v[:label], value: v[:value], selected: selected_values.include?(v[:value]) } } %>
- <%= render partial: 'augmented/autocomplete_select_decoration', - locals: { input_name: input_name, - input_id: "custom_action_conditions_#{condition.key}", - select_options: select_options, - multiple: true, - key: condition.key.to_s - } %> + <% if condition.key == :project %> + <%= angular_component_tag 'opce-project-autocompleter', + inputs: { + multiple: true, + filters: [{ name: 'active', operator: '=', values: ['t'] }], + resource: "projects", + inputName: input_name, + appendTo: "body", + labelForId: "custom_action_actions_#{condition.key}", + inputValue: condition.values + } + %> + <% else %> + <%= angular_component_tag 'opce-autocompleter', + inputs: { + multiple: true, + defaultData: false, + items: condition.allowed_values.map { |v| { id: v[:value], name: v[:label] } }, + model: condition.value_objects.map { |v| { id: v[:value], name: v[:label] } }, + inputName: input_name, + bindLabel: "name", + bindValue: "id", + labelForId: "custom_action_conditions_#{condition.key}", + appendTo: "body", + } + %> + <% end %>
@@ -49,18 +67,35 @@ <% input_name = "custom_action[actions][#{action.key}]" %> <% if %i(associated_property boolean).include?(action.type) %> - <% selected_values = action.values - select_options = action.allowed_values.map { |v| { label: v[:label], value: v[:value], selected: selected_values.include?(v[:value]) } } %> -
- <%= render partial: 'augmented/autocomplete_select_decoration', - locals: { input_name: input_name, - input_id: "custom_action_actions_#{action.key}", - select_options: select_options, - multiple: action.multi_value?, - key: action.key.to_s - } %> + <% if action.key == :project %> + <%= angular_component_tag 'opce-project-autocompleter', + inputs: { + multiple: false, + filters: [{ name: 'active', operator: '=', values: ['t'] }], + resource: "projects", + inputName: input_name, + appendTo: "body", + labelForId: "custom_action_actions_#{action.key}", + inputValue: action.values.first + } + %> + <% else %> + <%= angular_component_tag 'opce-autocompleter', + inputs: { + multiple: action.multi_value?, + defaultData: false, + items: action.allowed_values.map { |v| { id: v[:value], name: v[:label] } }, + model: action.value_objects.map { |v| { id: v[:value], name: v[:label] } }, + inputName: input_name, + bindLabel: "name", + bindValue: "id", + labelForId: "custom_action_actions_#{action.key}", + appendTo: "body", + } + %> + <% end %>
<% elsif %i(date_property).include?(action.type) %> diff --git a/app/views/custom_fields/_tab.html.erb b/app/views/custom_fields/_tab.html.erb index 5616d5199745..13437c013950 100644 --- a/app/views/custom_fields/_tab.html.erb +++ b/app/views/custom_fields/_tab.html.erb @@ -140,7 +140,7 @@ See COPYRIGHT and LICENSE files for more details. <%= t(:label_x_projects, count: custom_field.projects.count) %> <% end %> - <% type_links = custom_field.types.map { |t| link_to(t.name, edit_type_tab_path(id: t.id, tab: 'form_configuration')) } %> + <% type_links = custom_field.types.map { |t| link_to(t.name, edit_tab_type_path(id: t.id, tab: "form_configuration")) } %> <% if type_links.empty? %> <%= link_to t(:label_custom_field_add_no_type), types_path %> diff --git a/app/views/enumerations/_form.html.erb b/app/views/enumerations/_form.html.erb index db1be44dbc1e..8e0fe7566e9d 100644 --- a/app/views/enumerations/_form.html.erb +++ b/app/views/enumerations/_form.html.erb @@ -37,7 +37,10 @@ See COPYRIGHT and LICENSE files for more details. <%= f.hidden_field 'type' %>
<%= f.text_field 'name', required: true, container_class: '-middle' %>
<%= f.check_box 'active' %>
-
<%= f.check_box 'is_default' %>
+ + <% if @enumeration.class.can_have_default_value? %> +
<%= f.check_box 'is_default' %>
+ <% end %> <% if @enumeration.class.colored? %> <%= render partial: '/colors/color_autocomplete_field', diff --git a/app/views/enumerations/index.html.erb b/app/views/enumerations/index.html.erb index bc61f86715e5..d9e9e910333d 100644 --- a/app/views/enumerations/index.html.erb +++ b/app/views/enumerations/index.html.erb @@ -38,5 +38,5 @@ See COPYRIGHT and LICENSE files for more details. <% Enumeration.subclasses.each do |klass| %>

<%= t(klass::OptionName) %>

- <%= render(::Enumerations::TableComponent.new(rows: klass.shared)) %> + <%= render(::Enumerations::TableComponent.new(rows: klass.shared, enumeration: klass)) %> <% end %> diff --git a/app/views/filters/_autocomplete.html.erb b/app/views/filters/_autocomplete.html.erb index 57a5df7653b7..c85518e08440 100644 --- a/app/views/filters/_autocomplete.html.erb +++ b/app/views/filters/_autocomplete.html.erb @@ -12,7 +12,6 @@ # of the #connect lifecycle hook of the filter--filters-form # Stimulus controller. }.merge(autocomplete_options.except(:component)), - class: 'form--field', id: "#{filter.name}_value", data: { 'filter-autocomplete': true, diff --git a/app/views/forums/show.html.erb b/app/views/forums/show.html.erb index 3f0ddfa73894..e99fa7d54636 100644 --- a/app/views/forums/show.html.erb +++ b/app/views/forums/show.html.erb @@ -34,22 +34,21 @@ See COPYRIGHT and LICENSE files for more details. url: forum_topics_path(@forum), html: { multipart: true, - id: 'message-form', - class: 'form', + id: "message-form", + class: "form", data: { turbo: false } } do |f| %> - <%= render partial: 'messages/form', locals: { f: f } %> + <%= render partial: "messages/form", locals: { f: f } %> -
- <%= styled_button_tag t(:button_create), class: '-primary -with-icon icon-checkmark' %> - <%= link_to t(:button_cancel), '', class: 'cancel-add-message-button button -with-icon icon-cancel' %> - <% csp_onclick('jQuery("#add-message").hide();', '.cancel-add-message-button') %> +
+ <%= styled_button_tag t(:button_create), class: "-primary -with-icon icon-checkmark" %> + <%= link_to t(:button_cancel), "", class: "cancel-add-message-button button -with-icon icon-cancel" %> + <% csp_onclick('jQuery("#add-message").hide();', ".cancel-add-message-button") %> <% end %>
<% end %>
- <%= render(Primer::OpenProject::PageHeader.new) do |header| header.with_title { @forum.name } @@ -69,8 +68,8 @@ See COPYRIGHT and LICENSE files for more details. aria: { label: t(:label_message_new) }, title: t(:label_message_new), tag: :a, - class: 'add-message-button', - href: url_for({ controller: '/messages', action: 'new', forum_id: @forum })) do |button| + class: "add-message-button", + href: url_for({ controller: "/messages", action: "new", forum_id: @forum })) do |button| button.with_leading_visual_icon(icon: :plus) t(:label_message) end @@ -120,16 +119,16 @@ See COPYRIGHT and LICENSE files for more details. <% if message.sticky? %> - <%= op_icon('icon-wiki', title: I18n.t('js.label_board_sticky')) %> + <%= op_icon("icon-wiki", title: I18n.t("js.label_board_sticky")) %> <% end %> <% if message.locked? %> - <%= op_icon('icon-locked', title: I18n.t('js.label_board_locked')) %> + <%= op_icon("icon-locked", title: I18n.t("js.label_board_locked")) %> <% end %> <%= link_to message.subject, topic_path(message) %> <% if message.author %> - <%= link_to message.author.name, user_path(message.author) %> + <%= link_to_user message.author %> <% end %> @@ -138,8 +137,8 @@ See COPYRIGHT and LICENSE files for more details. <%= message.replies_count %> <% if message.last_reply %> - <%= authoring message.last_reply.created_at, message.last_reply.author %>
-
+ <%= authoring message.last_reply.created_at, message.last_reply.author %>
+
<%= link_to_message message.last_reply, no_root: true %> <% end %> @@ -155,9 +154,9 @@ See COPYRIGHT and LICENSE files for more details. <% end %> <%= other_formats_links do |f| %> - <%= f.link_to 'Atom', url: { key: User.current.rss_key } %> + <%= f.link_to "Atom", url: { key: User.current.rss_key } %> <% end %> <% html_title h(@forum.name) %> <% content_for :header_tags do %> - <%= auto_discovery_link_tag(:atom, { format: 'atom', key: User.current.rss_key }, title: "#{@project}: #{@forum}") %> + <%= auto_discovery_link_tag(:atom, { format: "atom", key: User.current.rss_key }, title: "#{@project}: #{@forum}") %> <% end %> diff --git a/app/views/homescreen/blocks/_users.html.erb b/app/views/homescreen/blocks/_users.html.erb index 2bc2b31a58f4..45584c6973eb 100644 --- a/app/views/homescreen/blocks/_users.html.erb +++ b/app/views/homescreen/blocks/_users.html.erb @@ -6,7 +6,7 @@
    <% @newest_users.each do |user| %>
  • - <%= link_to user, user_path(user), title: user.name %> + <%= link_to_user user %> (<%= format_date(user.created_at) %>)
    • <% end %> diff --git a/app/views/oauth/applications/_form.html.erb b/app/views/oauth/applications/_form.html.erb index e0d45a78235e..3f78df57fc9f 100644 --- a/app/views/oauth/applications/_form.html.erb +++ b/app/views/oauth/applications/_form.html.erb @@ -54,7 +54,7 @@ See COPYRIGHT and LICENSE files for more details. <% if Doorkeeper.configuration.scopes.all.length > 1 %>
    - + <% Doorkeeper.configuration.scopes.each do |scope| %>
    - Client credentials + <%= t("oauth.application.client_credentials") %>

    <%= t('oauth.client_credentials_impersonation_html', client_credentials_flow_link: static_link_to(:client_credentials_code_flow), diff --git a/app/views/projects/settings/custom_fields/_form.html.erb b/app/views/projects/settings/custom_fields/_form.html.erb index 093ebc211c91..454b88826119 100644 --- a/app/views/projects/settings/custom_fields/_form.html.erb +++ b/app/views/projects/settings/custom_fields/_form.html.erb @@ -96,7 +96,7 @@ See COPYRIGHT and LICENSE files for more details. <% if current_user.admin? %> - <% type_links = custom_field.types.map { |t| link_to(t.name, edit_type_tab_path(id: t.id, tab: 'form_configuration')) } %> + <% type_links = custom_field.types.map { |t| link_to(t.name, edit_tab_type_path(id: t.id, tab: "form_configuration")) } %> <%= safe_join type_links, ', '.html_safe %> <% else %> <%= custom_field.types.map(&:name).join(', ') %> diff --git a/app/views/projects/settings/modules/_form.html.erb b/app/views/projects/settings/modules/_form.html.erb index ce68cab4fd83..f6acd851047d 100644 --- a/app/views/projects/settings/modules/_form.html.erb +++ b/app/views/projects/settings/modules/_form.html.erb @@ -27,7 +27,7 @@ See COPYRIGHT and LICENSE files for more details. ++#%> -<% sorted_modules = OpenProject::AccessControl.available_project_modules.sort_by { |name| t(:"project_module_#{name}") } %> +<% sorted_modules = OpenProject::AccessControl.available_project_modules(sorted: true) %> <% sorted_modules.each do |name| %>

    diff --git a/app/views/types/edit.html.erb b/app/views/types/edit.html.erb index cdba71ebc004..abc54020da3d 100644 --- a/app/views/types/edit.html.erb +++ b/app/views/types/edit.html.erb @@ -34,13 +34,13 @@ See COPYRIGHT and LICENSE files for more details. <%= render ::Types::EditPageHeaderComponent.new(type: @type, tabs: tabs) %> <%= - selected_tab = selected_tab(tabs) + selected_tab = selected_tab(tabs, @default_tab) if selected_tab.key?(:view_component) render selected_tab[:view_component].new(@type) else form_for @type, - url: update_type_tab_path(id: @type.id, tab: @tab), + url: update_tab_type_path(id: @type.id, tab: @tab), builder: TabularFormBuilder, lang: current_language do |f| render partial: "common/tabs", locals: { f:, tabs:, selected_tab:, with_tab_nav: false } @@ -48,4 +48,5 @@ See COPYRIGHT and LICENSE files for more details. end %> -<%= error_messages_for 'type' %> + +<%= error_messages_for "type" %> diff --git a/app/views/types/form/_settings.html.erb b/app/views/types/form/_settings.html.erb deleted file mode 100644 index 13ba08e6a564..000000000000 --- a/app/views/types/form/_settings.html.erb +++ /dev/null @@ -1,75 +0,0 @@ -<%#-- copyright -OpenProject is an open source project management software. -Copyright (C) the OpenProject GmbH - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License version 3. - -OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -Copyright (C) 2006-2013 Jean-Philippe Lang -Copyright (C) 2010-2013 the ChiliProject Team - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - -See COPYRIGHT and LICENSE files for more details. - -++#%> - -
    -
    - -
    <%= f.text_field :name, required: true, disabled: @type.is_standard?, container_class: '-middle' %>
    -
    <%= f.check_box :is_in_roadmap %>
    - <%= render partial: '/colors/color_autocomplete_field', - locals: { - form: f, - object: @type, - type: 'type', - highlight_text_inline: true, - label: t('types.edit.settings.type_color_text'), - form_field_class: '-wide-label', - container_class: '-slim' - } %> -
    <%= f.check_box :is_default %>
    -
    <%= f.check_box :is_milestone %>
    - - <% if @type.new_record? && @types.any? %> -
    - <%= styled_label_tag 'copy_workflow_from', t(:label_copy_workflow_from) %> - <%= styled_select_tag(:copy_workflow_from, - options_from_collection_for_select(@types, :id, :name, params[:copy_workflow_from]), - include_blank: true, - container_class: '-slim') %> -
    - <% end %> - -
    - <%= f.text_area :description, - class: 'wiki-edit wiki-toolbar', - container_class: '-xxwide', - with_text_formatting: true %> -
    - - - -
    -
    - -
    -
    - <%= styled_button_tag t(@type.new_record? ? :button_create : :button_save), - class: '-primary -with-icon icon-checkmark' %> -
    -
    diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb index 1b8856b626e1..ce69f94a49f4 100644 --- a/app/views/types/index.html.erb +++ b/app/views/types/index.html.erb @@ -121,7 +121,7 @@ See COPYRIGHT and LICENSE files for more details. <% for type in @types %> - <%= link_to type.name, edit_type_tab_path(type, tab: "settings") %> + <%= link_to type.name, edit_tab_type_path(type, tab: "settings") %> <% if type.workflows.empty? %> diff --git a/app/views/types/new.html.erb b/app/views/types/new.html.erb index 60cc30a16a0e..933de72555f4 100644 --- a/app/views/types/new.html.erb +++ b/app/views/types/new.html.erb @@ -39,8 +39,7 @@ See COPYRIGHT and LICENSE files for more details. end %> -<%= error_messages_for 'type' %> - -<%= form_for controller.type, builder: TabularFormBuilder, lang: current_language do |f| %> - <%= render partial: 'types/form/settings', locals: { f: f } %> -<% end %> +<%= + copy_workflow_from = maybe_integer(params.dig(:type, :copy_workflow_from)).value_or(nil) + render WorkPackages::Types::SettingsComponent.new(@type, copy_workflow_from:) +%> diff --git a/app/views/work_package_relations_tab/_index.html.erb b/app/views/work_package_relations_tab/_index.html.erb deleted file mode 100644 index 43c920b15910..000000000000 --- a/app/views/work_package_relations_tab/_index.html.erb +++ /dev/null @@ -1,6 +0,0 @@ -<%= render( - WorkPackageRelationsTab::IndexComponent.new( - work_package: @work_package, - relations: @relations - ) -) %> diff --git a/app/workers/notifications/schedule_date_alerts_notifications_job.rb b/app/workers/notifications/schedule_date_alerts_notifications_job.rb index 7628edcc73d2..b7d914700fcc 100644 --- a/app/workers/notifications/schedule_date_alerts_notifications_job.rb +++ b/app/workers/notifications/schedule_date_alerts_notifications_job.rb @@ -35,7 +35,7 @@ class ScheduleDateAlertsNotificationsJob < ApplicationJob def perform return unless EnterpriseToken.allows_to?(:date_alerts) - Service.new(every_quater_hour_between_predecessor_cron_at_and_own_cron_at).call + Service.new(every_quarter_hour_between_predecessor_cron_at_and_own_cron_at).call end # What cannot be controlled is the time at which a job is actually performed. @@ -70,9 +70,14 @@ def perform # for 1:00 am local time are covered. The sole exception would be the case where previously finished jobs # have been removed from the database and the current job took longer to start executing. This is for now # an accepted shortcoming as the likelihood of this happening is considered to be very low. - def every_quater_hour_between_predecessor_cron_at_and_own_cron_at - (lower_boundary.to_i..upper_boundary.to_i) - .step(15.minutes) + def every_quarter_hour_between_predecessor_cron_at_and_own_cron_at + quarters = (lower_boundary.to_i..upper_boundary.to_i).step(15.minutes).to_a + + if quarters.empty? && lower_boundary.present? + quarters = [lower_boundary] + end + + quarters .map do |time| Time.zone.at(time) end diff --git a/bin/rubocop b/bin/rubocop index 671f09c3ee74..c782a0ff9bbb 100755 --- a/bin/rubocop +++ b/bin/rubocop @@ -1,4 +1,3 @@ #!/usr/bin/env ruby -load File.expand_path("spring", __dir__) require 'bundler/setup' load Gem.bin_path('rubocop', 'rubocop') diff --git a/config/application.rb b/config/application.rb index 0b5c8cff7a79..01330dc51641 100644 --- a/config/application.rb +++ b/config/application.rb @@ -243,7 +243,7 @@ class Application < Rails::Application config.good_job.max_cache = OpenProject::Configuration[:good_job_max_cache] config.good_job.enable_cron = OpenProject::Configuration[:good_job_enable_cron] config.good_job.shutdown_timeout = 30 - config.good_job.smaller_number_is_higher_priority = false + config.good_job.smaller_number_is_higher_priority = true config.action_controller.asset_host = OpenProject::Configuration::AssetHost.value diff --git a/config/constants/settings/definition.rb b/config/constants/settings/definition.rb index 081b92e5a2a5..a266f667f58e 100644 --- a/config/constants/settings/definition.rb +++ b/config/constants/settings/definition.rb @@ -701,8 +701,8 @@ class Definition default: 60000 }, oauth_allow_remapping_of_existing_users: { - description: "When set to false, prevent users from other identity providers to take over accounts connected " \ - "to another identity provider.", + description: "When set to false, prevent users from other identity providers to take over accounts " \ + "that exist in OpenProject.", default: true }, omniauth_direct_login_provider: { @@ -956,6 +956,19 @@ class Definition format: :hash, string_values: true }, + seed_design: { + description: "Seed enterprise-edition theme colors and logos through ENV", + writable: false, + default: nil, + format: :hash, + string_values: true + }, + seed_enterprise_token: { + description: "Seed enterprise-edition token through ENV", + writable: false, + format: :string, + default: nil + }, self_registration: { default: 2 }, diff --git a/config/database.production.yml b/config/database.production.yml index d122a4969771..b4a6ee5f56a7 100644 --- a/config/database.production.yml +++ b/config/database.production.yml @@ -34,6 +34,7 @@ DATABASE_OPTIONS = %w[ pool username password + passfile sslmode sslcompression sslcert @@ -41,8 +42,18 @@ DATABASE_OPTIONS = %w[ sslpassword sslrootcert sslcrl + ssl_min_protocol_version application_name statement_timeout + channel_binding + connect_timeout + client_encoding + keepalives + keepalives_idle + keepalives_interval + keepalives_count + gssencmode + replication ].freeze DATABASE_VARIABLES = %w[ diff --git a/config/initializers/custom_field_format.rb b/config/initializers/custom_field_format.rb index 5ac81f1759f9..12470f70b510 100644 --- a/config/initializers/custom_field_format.rb +++ b/config/initializers/custom_field_format.rb @@ -50,6 +50,7 @@ fields.register OpenProject::CustomFieldFormat.new("list", label: :label_list, order: 6, + multi_value_possible: true, formatter: "CustomValue::ListStrategy") fields.register OpenProject::CustomFieldFormat.new("date", label: :label_date, @@ -64,12 +65,14 @@ only: %w(WorkPackage TimeEntry Version Project), edit_as: "list", order: 9, + multi_value_possible: true, formatter: "CustomValue::UserStrategy") fields.register OpenProject::CustomFieldFormat.new("version", label: Proc.new { Version.model_name.human }, only: %w(WorkPackage TimeEntry Version Project), edit_as: "list", order: 10, + multi_value_possible: true, formatter: "CustomValue::VersionStrategy") # This is an internal formatter used as a fallback in case a value is not found. # Setting the label to nil in order to avoid it becoming available for selection as a custom value format. @@ -82,5 +85,6 @@ label: :label_hierarchy, only: %w(WorkPackage), order: 12, + multi_value_possible: true, formatter: "CustomValue::HierarchyStrategy") end diff --git a/config/initializers/feature_decisions.rb b/config/initializers/feature_decisions.rb index 5a969cf8e5cd..31818c3f5db1 100644 --- a/config/initializers/feature_decisions.rb +++ b/config/initializers/feature_decisions.rb @@ -39,7 +39,6 @@ # OpenProject::FeatureDecisions.add :some_flag # end -OpenProject::FeatureDecisions.add :primerized_work_package_activities OpenProject::FeatureDecisions.add :built_in_oauth_applications, description: "Allows the display and use of built-in OAuth applications." @@ -47,20 +46,10 @@ description: "Allows to generate a PDF document from a work package description. " \ "See #45896 for details." -OpenProject::FeatureDecisions.add :recurring_meetings, - description: "Differentiate between one-time and recurring meetings." - OpenProject::FeatureDecisions.add :generate_work_package_subjects, description: "Allows the configuration for work package types to have " \ "automatically generated work package subjects." -# TODO: Remove once the feature flag primerized_work_package_activities is removed altogether -OpenProject::FeatureDecisions.define_singleton_method(:primerized_work_package_activities_active?) do - Rails.env.production? || - (Setting.exists?("feature_primerized_work_package_activities_active") && - Setting.send(:feature_primerized_work_package_activities_active?)) -end - OpenProject::FeatureDecisions.add :stages_and_gates, description: "Enables the under construction feature of stages and gates." @@ -68,3 +57,8 @@ description: "Enables the under construction OAuth2 token exchange, allowing " \ "users to interact with storage providers without consenting " \ "in OAuth screens before first use." + +OpenProject::FeatureDecisions.add :work_package_comment_id_url, + description: "Introduced a new WP comment URL identifier structure " \ + "`#comment-` replacing the old " \ + "`#activity-`." diff --git a/config/initializers/menus.rb b/config/initializers/menus.rb index 7b8402e4669e..60d74aaa7e1c 100644 --- a/config/initializers/menus.rb +++ b/config/initializers/menus.rb @@ -36,7 +36,7 @@ context: :modules, caption: I18n.t("label_projects_menu"), icon: "project", - if: Proc.new { + if: ->(_) { User.current.logged? || !Setting.login_required? } @@ -50,7 +50,7 @@ context: :modules, caption: I18n.t("label_work_package_plural"), icon: "op-view-list", - if: Proc.new { + if: ->(_) { (User.current.logged? || !Setting.login_required?) && User.current.allowed_in_any_work_package?(:view_work_packages) } @@ -59,7 +59,7 @@ context: :modules, caption: I18n.t("label_news_plural"), icon: "megaphone", - if: Proc.new { + if: ->(_) { (User.current.logged? || !Setting.login_required?) && User.current.allowed_in_any_project?(:view_news) } @@ -76,10 +76,10 @@ Redmine::MenuManager.map :quick_add_menu do |menu| menu.push :new_project, - Proc.new { |project| + ->(project) { { controller: "/projects", action: :new, project_id: nil, parent_id: project&.id } }, - caption: ->(*) { Project.model_name.human }, + caption: ->(_) { Project.model_name.human }, icon: "plus", html: { aria: { label: I18n.t(:label_project_new) }, @@ -97,7 +97,7 @@ html: { "invite-user-modal-augment": "invite-user-modal-augment" }, - if: Proc.new { User.current.allowed_in_any_project?(:manage_members) } + if: ->(_) { User.current.allowed_in_any_project?(:manage_members) } end Redmine::MenuManager.map :account_menu do |menu| @@ -107,22 +107,22 @@ menu.push :my_page, :my_page_path, caption: I18n.t("js.my_page.label"), - if: Proc.new { User.current.logged? } + if: ->(_) { User.current.logged? } menu.push :my_profile, { controller: "/users", action: "show", id: "me" }, caption: :label_my_activity, - if: Proc.new { User.current.logged? } + if: ->(_) { User.current.logged? } menu.push :my_account, { controller: "/my", action: "account" }, - if: Proc.new { User.current.logged? } + if: ->(_) { User.current.logged? } menu.push :administration, { controller: "/admin", action: "index" }, - if: Proc.new { + if: ->(_) { User.current.allowed_globally?({ controller: "/admin", action: "index" }) } menu.push :logout, :signout_path, - if: Proc.new { User.current.logged? } + if: ->(_) { User.current.logged? } end Redmine::MenuManager.map :global_menu do |menu| @@ -138,7 +138,7 @@ caption: I18n.t("label_projects_menu"), icon: "project", after: :home, - if: Proc.new { + if: ->(_) { User.current.logged? || !Setting.login_required? } @@ -176,7 +176,7 @@ caption: I18n.t("label_news_plural"), icon: "megaphone", after: :boards, - if: Proc.new { + if: ->(_) { (User.current.logged? || !Setting.login_required?) && User.current.allowed_in_any_project?(:view_news) } @@ -200,7 +200,7 @@ menu.push :password, { controller: "/my", action: "password" }, caption: :button_change_password, - if: Proc.new { User.current.change_password_allowed? }, + if: ->(_) { User.current.change_password_allowed? }, icon: "lock" menu.push :access_token, { controller: "/my", action: "access_token" }, @@ -222,7 +222,7 @@ menu.push :delete_account, :delete_my_account_info_path, caption: I18n.t("account.delete"), param: :user_id, - if: Proc.new { Setting.users_deletable_by_self? }, + if: ->(_) { Setting.users_deletable_by_self? }, last: :delete_account, icon: "trash" end @@ -230,14 +230,14 @@ Redmine::MenuManager.map :admin_menu do |menu| menu.push :admin_overview, { controller: "/admin", action: :index }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_overview, icon: "home", first: true menu.push :users, { controller: "/users" }, - if: Proc.new { + if: ->(_) { !User.current.admin? && (User.current.allowed_globally?(:manage_user) || User.current.allowed_globally?(:create_user)) }, @@ -246,129 +246,141 @@ menu.push :placeholder_users, { controller: "/placeholder_users" }, - if: Proc.new { !User.current.admin? && User.current.allowed_globally?(:manage_placeholder_user) }, + if: ->(_) { !User.current.admin? && User.current.allowed_globally?(:manage_placeholder_user) }, caption: :label_placeholder_user_plural, icon: "people" menu.push :users_and_permissions, { controller: "/users" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_user_and_permission, icon: "people" menu.push :user_settings, { controller: "/admin/settings/users_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_users_settings, parent: :users_and_permissions menu.push :users, { controller: "/users" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_user_plural, parent: :users_and_permissions menu.push :placeholder_users, { controller: "/placeholder_users" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_placeholder_user_plural, parent: :users_and_permissions, enterprise_feature: "placeholder_users" menu.push :groups, { controller: "/groups" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_group_plural, parent: :users_and_permissions menu.push :roles, { controller: "/roles" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_role_and_permissions, parent: :users_and_permissions menu.push :permissions_report, { controller: "/roles", action: "report" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_permissions_report, parent: :users_and_permissions menu.push :user_avatars, { controller: "/admin/settings", action: "show_plugin", id: :openproject_avatars }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_avatar_plural, parent: :users_and_permissions menu.push :admin_work_packages, { controller: "/admin/settings/work_packages_general", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_work_package_plural, icon: "op-view-list" menu.push :work_packages_general, { controller: "/admin/settings/work_packages_general", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_general, parent: :admin_work_packages menu.push :types, { controller: "/types" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_type_plural, parent: :admin_work_packages menu.push :statuses, { controller: "/statuses" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_status, parent: :admin_work_packages menu.push :progress_tracking, { controller: "/admin/settings/progress_tracking", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_progress_tracking, parent: :admin_work_packages menu.push :workflows, { controller: "/workflows", action: "edit" }, - if: Proc.new { User.current.admin? }, - caption: Proc.new { Workflow.model_name.human }, + if: ->(_) { User.current.admin? }, + caption: ->(_) { Workflow.model_name.human }, parent: :admin_work_packages menu.push :admin_projects_settings, - { controller: "/admin/settings/project_custom_fields", action: :index }, - if: Proc.new { User.current.admin? }, + ->(_) { # TODO: doesn't need to be a proc when condition is removed + if OpenProject::FeatureDecisions.stages_and_gates_active? + { controller: "/admin/settings/project_life_cycle_step_definitions", action: :index } + else + { controller: "/admin/settings/project_custom_fields", action: :index } + end + }, + if: ->(_) { User.current.admin? }, caption: :label_project_plural, icon: "project" + menu.push :project_life_cycle_step_definitions_settings, + { controller: "/admin/settings/project_life_cycle_step_definitions", action: :index }, + if: ->(_) { User.current.admin? && OpenProject::FeatureDecisions.stages_and_gates_active? }, + caption: :label_project_lifecycle, + parent: :admin_projects_settings + menu.push :project_custom_fields_settings, { controller: "/admin/settings/project_custom_fields", action: :index }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_project_attributes_plural, parent: :admin_projects_settings menu.push :new_project_settings, { controller: "/admin/settings/new_project_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_project_new, parent: :admin_projects_settings menu.push :project_lists_settings, { controller: "/admin/settings/projects_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_project_list_plural, parent: :admin_projects_settings menu.push :custom_fields, { controller: "/custom_fields" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_custom_field_plural, icon: "op-custom-fields", html: { class: "custom_fields" } menu.push :custom_actions, { controller: "/custom_actions" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :"custom_actions.plural", parent: :admin_work_packages, enterprise_feature: "custom_actions" @@ -377,118 +389,118 @@ { controller: "/attribute_help_texts" }, caption: :"attribute_help_texts.label_plural", icon: "question", - if: Proc.new { User.current.allowed_globally?(:edit_attribute_help_texts) } + if: ->(_) { User.current.allowed_globally?(:edit_attribute_help_texts) } menu.push :enumerations, { controller: "/enumerations" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, icon: "multi-select" menu.push :calendars_and_dates, { controller: "/admin/settings/working_days_and_hours_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_calendars_and_dates, icon: "calendar" menu.push :working_days_and_hours, { controller: "/admin/settings/working_days_and_hours_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_working_days_and_hours, parent: :calendars_and_dates menu.push :date_format, { controller: "/admin/settings/date_format_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_date_format, parent: :calendars_and_dates menu.push :icalendar, { controller: "/admin/settings/icalendar_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_calendar_subscriptions, parent: :calendars_and_dates menu.push :settings, { controller: "/admin/settings/general_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_system_settings, icon: "gear" menu.push :settings_general, { controller: "/admin/settings/general_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_general, parent: :settings menu.push :settings_languages, { controller: "/admin/settings/languages_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_languages, parent: :settings menu.push :settings_repositories, { controller: "/admin/settings/repositories_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_repository_plural, parent: :settings menu.push :settings_experimental, { controller: "/admin/settings/experimental_settings", action: :show }, - if: Proc.new { User.current.admin? && Rails.env.development? }, + if: ->(_) { User.current.admin? && Rails.env.development? }, caption: :label_experimental, parent: :settings menu.push :mail_and_notifications, { controller: "/admin/settings/aggregation_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :"menus.admin.mails_and_notifications", icon: "mail" menu.push :notification_settings, { controller: "/admin/settings/aggregation_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :"menus.admin.aggregation", parent: :mail_and_notifications menu.push :mail_notifications, { controller: "/admin/settings/mail_notifications_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :"menus.admin.mail_notification", parent: :mail_and_notifications menu.push :incoming_mails, { controller: "/admin/settings/incoming_mails_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_incoming_emails, parent: :mail_and_notifications menu.push :api_and_webhooks, { controller: "/admin/settings/api_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :"menus.admin.api_and_webhooks", icon: "op-relations" menu.push :api, { controller: "/admin/settings/api_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_api_access_key_type, parent: :api_and_webhooks menu.push :authentication, { controller: "/admin/settings/authentication_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_authentication, icon: "shield-lock" menu.push :authentication_settings, { controller: "/admin/settings/authentication_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_authentication_settings, parent: :authentication menu.push :ldap_authentication, { controller: "/ldap_auth_sources", action: "index" }, - if: Proc.new { User.current.admin? && !OpenProject::Configuration.disable_password_login? }, + if: ->(_) { User.current.admin? && !OpenProject::Configuration.disable_password_login? }, parent: :authentication, caption: :label_ldap_auth_source_plural, html: { class: "server_authentication" }, @@ -496,47 +508,47 @@ menu.push :oauth_applications, { controller: "/oauth/applications", action: "index" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, parent: :authentication, caption: :"oauth.application.plural", html: { class: "oauth_applications" } menu.push :announcements, { controller: "/announcements", action: "edit" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_announcement, icon: "megaphone" menu.push :plugins, { controller: "/admin", action: "plugins" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, last: true, icon: "plug" menu.push :backups, { controller: "/admin/backups", action: "show" }, - if: Proc.new { OpenProject::Configuration.backup_enabled? && User.current.allowed_globally?(Backup.permission) }, + if: ->(_) { OpenProject::Configuration.backup_enabled? && User.current.allowed_globally?(Backup.permission) }, caption: :label_backup, last: true, icon: "op-save" menu.push :info, { controller: "/admin", action: "info" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_information_plural, last: true, icon: "info" menu.push :custom_style, { controller: "/custom_styles", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_custom_style, icon: "paintbrush", enterprise_feature: "define_custom_style" menu.push :colors, { controller: "/colors", action: "index" }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_color_plural, icon: "meter" @@ -548,7 +560,7 @@ menu.push :admin_backlogs, { controller: "/backlogs_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :label_backlogs, icon: "op-backlogs" end @@ -556,24 +568,24 @@ Redmine::MenuManager.map :project_menu do |menu| menu.push :activity, { controller: "/activities", action: "index" }, - if: Proc.new { |p| p.module_enabled?("activity") }, + if: ->(project) { project.module_enabled?("activity") }, icon: "history" menu.push :activity_filters, { controller: "/activities", action: "index" }, - if: Proc.new { |p| p.module_enabled?("activity") }, + if: ->(project) { project.module_enabled?("activity") }, parent: :activity, partial: "activities/filters_menu" menu.push :roadmap, { controller: "/versions", action: "index" }, - if: Proc.new { |p| p.shared_versions.any? }, + if: ->(project) { project.shared_versions.any? }, icon: "milestone" menu.push :work_packages, { controller: "/work_packages", action: "index" }, caption: :label_work_package_plural, - if: Proc.new { |p| p.module_enabled?("work_package_tracking") }, + if: ->(project) { project.module_enabled?("work_package_tracking") }, icon: "op-view-list", html: { id: "main-menu-work-packages", @@ -599,7 +611,7 @@ menu.push :repository, { controller: "/repositories", action: :show }, - if: Proc.new { |p| p.repository && !p.repository.new_record? }, + if: ->(p) { p.repository && !p.repository.new_record? }, icon: "file-directory-open-fill" # Wiki menu items are added by WikiMenuItemHelper @@ -628,7 +640,7 @@ life_cycle_steps: { caption: :label_life_cycle_step_plural, action: :index, - if: ->(*) { OpenProject::FeatureDecisions.stages_and_gates_active? } + if: ->(_) { OpenProject::FeatureDecisions.stages_and_gates_active? } }, project_custom_fields: { caption: :label_project_attributes_plural }, modules: { caption: :label_module_plural }, @@ -680,7 +692,7 @@ { tab: :relations }, skip_permissions_check: true, badge: ->(work_package:, **) { - work_package.relations.visible.count + work_package.children.visible.count + WorkPackageRelationsTab::RelationsMediator.new(work_package: work_package).all_relations_count }, caption: :"js.work_packages.tabs.relations" menu.push :watchers, diff --git a/config/initializers/permissions.rb b/config/initializers/permissions.rb index 9b6ce3a8e1ce..ec1480716828 100644 --- a/config/initializers/permissions.rb +++ b/config/initializers/permissions.rb @@ -136,14 +136,16 @@ map.permission :view_project_stages_and_gates, {}, permissible_on: :project, - dependencies: :view_project + dependencies: :view_project, + visible: -> { OpenProject::FeatureDecisions.stages_and_gates_active? } map.permission :edit_project_stages_and_gates, {}, permissible_on: :project, require: :member, dependencies: :view_project_stages_and_gates, - contract_actions: { projects: %i[update] } + contract_actions: { projects: %i[update] }, + visible: -> { OpenProject::FeatureDecisions.stages_and_gates_active? } map.permission :select_project_life_cycle, { @@ -291,19 +293,19 @@ permissible_on: %i[work_package project], dependencies: :view_work_packages - wpt.permission :edit_work_package_notes, + wpt.permission :edit_own_work_package_notes, { "work_packages/activities_tab": %i[edit cancel_edit update] }, - permissible_on: :project, + permissible_on: %i[work_package project], require: :loggedin, dependencies: :view_work_packages - wpt.permission :edit_own_work_package_notes, + wpt.permission :edit_work_package_notes, { "work_packages/activities_tab": %i[edit cancel_edit update] }, - permissible_on: %i[work_package project], + permissible_on: :project, require: :loggedin, dependencies: :view_work_packages diff --git a/config/initializers/retry_failed_jobs_with_name_error.rb b/config/initializers/retry_failed_jobs_with_name_error.rb index d8ce5849ccc0..0efa810509aa 100644 --- a/config/initializers/retry_failed_jobs_with_name_error.rb +++ b/config/initializers/retry_failed_jobs_with_name_error.rb @@ -38,6 +38,8 @@ # # Once the migration is over and the worker gets restarted, the job will be # retried thanks to this piece of code below. + next unless ActiveRecord::Base.connection.table_exists?(:good_jobs) + GoodJob::Job .discarded .where("error LIKE ?", "NameError: uninitialized constant %Job") @@ -47,8 +49,6 @@ rescue StandardError => e Rails.logger.error("Failed to enqueue job for retry #{job.display_name} (job id: #{job.id}): #{e.message}") end - rescue ActiveRecord::StatementInvalid - # will happen when we currently are migrating rescue LoadError # Ignore LoadError that happens when nulldb://db database adapter is used end diff --git a/config/initializers/store_attribute.rb b/config/initializers/store_attribute.rb new file mode 100644 index 000000000000..37d5e4e99e3d --- /dev/null +++ b/config/initializers/store_attribute.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2025 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +# From v1.0 to v2.0 of store_attribute, the value for store_attribute_unset_values_fallback_to_default changed from +# false to true. This initializer sets it back to false to keep the behavior consistent with the previous version. + +StoreAttribute.store_attribute_unset_values_fallback_to_default = false diff --git a/config/locales/crowdin/af.yml b/config/locales/crowdin/af.yml index 844f12c6ce38..59d1c2c5d73f 100644 --- a/config/locales/crowdin/af.yml +++ b/config/locales/crowdin/af.yml @@ -229,6 +229,10 @@ af: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ af: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ af: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ af: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ af: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ af: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ af: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ af: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Verwyder rekening" @@ -790,6 +804,7 @@ af: is_required: "Verpligtend" max_length: "Maksimum lengte" min_length: "Minimum lengte" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Moontlike waardes" regexp: "Standaard uitdrukking" @@ -825,6 +840,8 @@ af: attr_lastname: "Van kenmerk" attr_login: "Username attribute" attr_mail: "Epos kenmerk" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Basis (Onderskeidende Naam) ON" host: "Gasheer" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ af: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolomme" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ af: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Werkspakket" + from: "Related work package" to: "Verwante werk pakket" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ af: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ af: button_copy_and_follow: "Kopieer en volg" button_create: "Skep" button_create_and_continue: "Skep en gaan voort" - button_delete: "Skrap" button_decline: "Decline" + button_delete: "Skrap" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Verwyder kyker %{name}" button_download: "Laai af" button_duplicate: "Dupliseer" @@ -1765,6 +1790,9 @@ af: hour: one: "uur" other: "ure" + day: + one: "day" + other: "days" description_active: "Aktief?" description_attachment_toggle: "Wys/Versteek aanhegsels" description_autocomplete: > @@ -1800,6 +1828,10 @@ af: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ af: label_add_subtask: "Voeg subtaak by" label_added: "bygevoeg" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Bygevoeg deur %{author} %{age} gelede" label_additional_workflow_transitions_for_assignee: "Bykomende oorgange toegelaat wanneer die gebruiker die gedelegeerde is" label_additional_workflow_transitions_for_author: "Bykomende oorgange toegelaat wanneer die gebruiker die outeur is" @@ -2582,6 +2615,7 @@ af: label_project_new: "Nuwe projek" label_project_plural: "Projekte" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Projek-instellings" @@ -2608,6 +2642,7 @@ af: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Oorblywende werk" @@ -3024,6 +3059,7 @@ af: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ af: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ af: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ af: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktiwiteit" project_module_forums: "Forums" project_module_work_package_tracking: "Werkspakkete" @@ -3334,6 +3371,7 @@ af: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ af: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ af: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ af: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ af: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/ar.yml b/config/locales/crowdin/ar.yml index a893a8fd3658..9c613e078730 100644 --- a/config/locales/crowdin/ar.yml +++ b/config/locales/crowdin/ar.yml @@ -229,6 +229,10 @@ ar: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ ar: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ ar: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -497,6 +503,7 @@ ar: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -682,6 +689,7 @@ ar: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -704,14 +712,15 @@ ar: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -726,6 +735,9 @@ ar: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -762,6 +774,8 @@ ar: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: دعوة account: delete: "حذف الحساب" @@ -826,6 +840,7 @@ ar: is_required: "مطلوب" max_length: "الطول الأقصى" min_length: "الطول الأدنى" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "القيم المحتملة" regexp: "التعبير الاعتيادي" @@ -861,6 +876,8 @@ ar: attr_lastname: "سمة الاسم الأخير" attr_login: "Username attribute" attr_mail: "سمة البريد الإلكتروني" + filter_string: "Filter string" + admin: "Administrator" base_dn: "قاعدة DN" host: "المضيف" onthefly: "Automatic user creation" @@ -904,6 +921,9 @@ ar: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "الأعمدة" relations_to_type_column: "Relations to %{type}" @@ -913,7 +933,7 @@ ar: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "مجموعة العمل" + from: "Related work package" to: "مجموعة عمل ذات صلة" reminder: remind_at_date: "Date" @@ -1237,12 +1257,16 @@ ar: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "الإرتباطات الحالية غير قابلة للتغيير" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "علاقة الارتباط هذه غير ممكن تغييرها" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "بائع SCM غير متاح" not_whitelisted: "غير مسموح بالتكوين." @@ -1637,8 +1661,9 @@ ar: button_copy_and_follow: "انسخ واتبع" button_create: "إنشاء" button_create_and_continue: "إنشاء ومواصلة" - button_delete: "احذف" button_decline: "Decline" + button_delete: "احذف" + button_delete_permanently: "Delete permanently" button_delete_watcher: "حذف المراقب %{name}" button_download: "تحميل" button_duplicate: "كرِّر" @@ -1913,6 +1938,13 @@ ar: few: "ساعه" many: "ساعه" other: "ساعه" + day: + zero: "days" + one: "day" + two: "days" + few: "days" + many: "days" + other: "days" description_active: "نشط؟" description_attachment_toggle: "إظهار/إخفاء المرفقات" description_autocomplete: > @@ -1948,6 +1980,10 @@ ar: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2310,6 +2346,7 @@ ar: label_add_subtask: "اضف مهمة فرعية" label_added: "تمت الإضافة" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "أضيفت من قبل %{age} %{author} قبل ذلك" label_additional_workflow_transitions_for_assignee: "يسمح بالتحولات إضافية عندما يكون العمل قد احيل للمستخدم" label_additional_workflow_transitions_for_author: "يسمح بالتحولات الإضافية عندما يكون المستخدم هو منشئ مجموعة العمل" @@ -2730,6 +2767,7 @@ ar: label_project_new: "مشروع جديد" label_project_plural: "المشاريع" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "إعدادات المشروع" @@ -2756,6 +2794,7 @@ ar: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "حذف علاقة" + label_relation_edit: "Edit relation" label_relation_new: "علاقة جديدة" label_release_notes: "ملاحظات الإصدار" label_remaining_work: "Remaining work" @@ -3176,6 +3215,7 @@ ar: notice_bad_request: "طلب غير صحيح." notice_not_authorized: "غير مسموح لك بالوصول إلى هذه الصفحة." notice_not_authorized_archived_project: "المشروع الذي تحاول الوصول إليه تمت أرشفته." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "وُجِد %{number} من النتائج.\nإضغط كي تحدد على النتيجة الأولى." notice_principals_found_single: "هنالك نتيجة واحدة.\nإضغط لتحديدها." @@ -3228,7 +3268,7 @@ ar: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "إضافة ملاحظات" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "إضافة مجموعات عمل" permission_add_messages: "نشر الرسائل" permission_add_project: "أنشئ مشروعات" @@ -3258,10 +3298,11 @@ ar: permission_delete_timelines: "حذف الجداول الزمنية" permission_delete_wiki_pages: "حذف صفحات wiki" permission_delete_wiki_pages_attachments: "حذف المرفقات" - permission_edit_work_package_notes: "تحرير ملاحظات" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "تحرير مجموعات العمل" permission_edit_messages: "تحرير الرسائل" - permission_edit_own_work_package_notes: "تحرير الملاحظات الخاصة" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "تحرير الرسائل الخاصة" permission_edit_own_time_entries: "تحرير سجلات الوقت الخاصة" permission_edit_project: "تحرير المشروع" @@ -3354,9 +3395,9 @@ ar: are_you_sure: "هل أنت متأكد من أنك تريد أرشفة المشروع '%{name}'؟" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "النشاط" project_module_forums: "منتديات" project_module_work_package_tracking: "مجموعات العمل" @@ -3488,6 +3529,7 @@ ar: activated: "activated" deactivated: "deactivated" search_input_placeholder: "بحث..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3713,6 +3755,27 @@ ar: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3746,6 +3809,7 @@ ar: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "حذف مجموعة العمل وكافة حزم عمل الأطفال؟" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "المخصصة للمشروع" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3825,6 +3889,7 @@ ar: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "أنت على وشك إزالة بعض أو كافة الأذونات الخاصة بك، وقد لن تكون قادراً على تحرير هذا المشروع بعد ذلك. هل أنت متأكد من أنك تريد المتابعة؟" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "دليل أصول البرنامج المساعدة القابل للكتابة" text_powered_by: "بواسطة %{link}" text_project_identifier_info: "يتم السماح فقط رسائل الحالة الأدنى (أ-ي) وأرقام، والشرطات وتسطير، يجب أن تبدأ بحرف حالة الأدنى." @@ -4197,6 +4262,8 @@ ar: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/az.yml b/config/locales/crowdin/az.yml index 3c3439e49657..c46fd655ca74 100644 --- a/config/locales/crowdin/az.yml +++ b/config/locales/crowdin/az.yml @@ -229,6 +229,10 @@ az: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ az: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ az: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ az: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ az: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ az: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ az: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ az: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ az: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ az: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ az: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ az: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ az: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ az: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Sil" button_decline: "Decline" + button_delete: "Sil" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Çoxalt" @@ -1765,6 +1790,9 @@ az: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ az: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ az: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ az: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ az: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ az: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ az: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ az: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ az: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ az: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ az: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ az: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ az: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ az: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/be.yml b/config/locales/crowdin/be.yml index 4c12c8e5fe2f..277ae923639e 100644 --- a/config/locales/crowdin/be.yml +++ b/config/locales/crowdin/be.yml @@ -229,6 +229,10 @@ be: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ be: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ be: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -483,6 +489,7 @@ be: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -664,6 +671,7 @@ be: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -686,14 +694,15 @@ be: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -708,6 +717,9 @@ be: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -744,6 +756,8 @@ be: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -808,6 +822,7 @@ be: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -843,6 +858,8 @@ be: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -886,6 +903,9 @@ be: project_custom_field: is_required: "Required for all projects" custom_field_section: Раздзел + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -895,7 +915,7 @@ be: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1219,12 +1239,16 @@ be: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1599,8 +1623,9 @@ be: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Выдаліць" button_decline: "Decline" + button_delete: "Выдаліць" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1839,6 +1864,11 @@ be: few: "hours" many: "hours" other: "hours" + day: + one: "day" + few: "days" + many: "days" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1874,6 +1904,10 @@ be: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2236,6 +2270,7 @@ be: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2656,6 +2691,7 @@ be: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2682,6 +2718,7 @@ be: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3100,6 +3137,7 @@ be: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3150,7 +3188,7 @@ be: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3180,10 +3218,11 @@ be: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3276,9 +3315,9 @@ be: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3412,6 +3451,7 @@ be: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3637,6 +3677,27 @@ be: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3670,6 +3731,7 @@ be: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3749,6 +3811,7 @@ be: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4119,6 +4182,8 @@ be: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/bg.yml b/config/locales/crowdin/bg.yml index e5f058bbbb00..e6d0a11ca989 100644 --- a/config/locales/crowdin/bg.yml +++ b/config/locales/crowdin/bg.yml @@ -229,6 +229,10 @@ bg: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ bg: confirm_destroy_option: "Изтриването на опция ще изтрие всички нейни срещания (напр. в работните пакети). Сигурни ли сте, че искате да я изтриете?" reorder_alphabetical: "Пренареждане на стойностите по азбучен ред" reorder_confirmation: "Внимание: Текущият ред на наличните стойности ще бъде загубен. Желаете ли да продължите?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ bg: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Търсене в %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ bg: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ bg: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ bg: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ bg: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ bg: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Покана account: delete: "Изтриване на профил" @@ -790,6 +804,7 @@ bg: is_required: "Задължително" max_length: "Максимална дължина" min_length: "Минимална дължина" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Възможните стойности" regexp: "Регулярен израз" @@ -825,6 +840,8 @@ bg: attr_lastname: "Фамилно име атрибут" attr_login: "Username attribute" attr_mail: "Имейл атрибут" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Базов DN" host: "Хост" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ bg: project_custom_field: is_required: "Required for all projects" custom_field_section: Раздел + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Колони" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ bg: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Работен пакет" + from: "Related work package" to: "Свързани работени пакети" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ bg: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM доставчик не е наличен" not_whitelisted: "не е позволено от конфигурацията." @@ -1561,8 +1585,9 @@ bg: button_copy_and_follow: "Копирате и следвайте" button_create: "Създаване" button_create_and_continue: "Създаване и продължи" - button_delete: "Изтрий" button_decline: "Отказване" + button_delete: "Изтрий" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Изтриване на наблюдател %{name}" button_download: "Изтегли" button_duplicate: "Дублиране" @@ -1765,6 +1790,9 @@ bg: hour: one: "час" other: "Часове" + day: + one: "day" + other: "days" description_active: "Активен?" description_attachment_toggle: "Показване/скриване на прикачени файлове" description_autocomplete: > @@ -1800,6 +1828,10 @@ bg: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Добавяне на нови групи атрибути" @@ -2162,6 +2194,7 @@ bg: label_add_subtask: "Добави подзадача" label_added: "добавено" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Добавено от %{author} преди %{age}" label_additional_workflow_transitions_for_assignee: "Допълнителни промени са рарзрешени, когато потребителят е назначен към задачата" label_additional_workflow_transitions_for_author: "Допълнителни промени са рарзрешени, когато потребителят е автор" @@ -2582,6 +2615,7 @@ bg: label_project_new: "Нов проект" label_project_plural: "Проекти" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Атрибути на проекта" label_project_custom_field_plural: "Атрибути на проекта" label_project_settings: "Настройки на проекта" @@ -2608,6 +2642,7 @@ bg: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Изтриване на връзка" + label_relation_edit: "Edit relation" label_relation_new: "Нова връзка" label_release_notes: "Бележки по изданието" label_remaining_work: "Оставаща работа" @@ -3024,6 +3059,7 @@ bg: notice_bad_request: "Грешна заявка." notice_not_authorized: "Нямате право на достъп до тази страница." notice_not_authorized_archived_project: "Проектът, до който се опитвате да получите достъп е бил архивиран." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Паролата ви е неправилна! Не може да продължите!" notice_principals_found_multiple: "Има намерени %{number} резултата. \n Таб, за да се фокусира първият резултат." notice_principals_found_single: "Резултатът е един. \n Таб, за да го фокусирате." @@ -3072,7 +3108,7 @@ bg: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Изберете езика си" - permission_add_work_package_notes: "Добавяне на бележки" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ bg: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Редактиране на бележки" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Редактиране на съобщенията" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ bg: are_you_sure: "Наистина ли искате да архивирате на проекта \"%{name}\"?" archived: "Архивирано" count: - zero: "0 Проекти" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Активност" project_module_forums: "Форуми" project_module_work_package_tracking: "Работни пакети" @@ -3334,6 +3371,7 @@ bg: activated: "активиран" deactivated: "деактивиран" search_input_placeholder: "Търсене ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Активирайте CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) позволява разрешения" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ bg: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Настройки за нови проекти" @@ -3592,6 +3651,7 @@ bg: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ bg: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ bg: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/ca.yml b/config/locales/crowdin/ca.yml index e302eb8ad951..55703f68e737 100644 --- a/config/locales/crowdin/ca.yml +++ b/config/locales/crowdin/ca.yml @@ -226,6 +226,10 @@ ca: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -246,6 +250,7 @@ ca: confirm_destroy_option: "Eliminant una opció n'eliminareu totes les ocurrències (ex. en un paquet de treball). Segur que vols eliminar-ho?" reorder_alphabetical: "Reorganitza els valors alfabèticament" reorder_confirmation: "Alerta: L'ordre actual dels valors disponibles es perdran. Vols continuar?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -284,6 +289,7 @@ ca: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Cerca a %{app_title}" overwritten_tabs: @@ -466,6 +472,7 @@ ca: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -643,6 +650,7 @@ ca: title: "Falta un flux de treball per compartir paquets de treball" message: "No s'ha configurat cap flux de treball per a la funció \"Editor de paquets de treball\". Sense un flux de treball, el que es comparteix amb l'usuari no pot alterar l'estat del paquet de treball. Els fluxos de treball es poden copiar. Seleccioneu un tipus d'origen (p. ex., \"Tasca\") i una funció d'origen (p. ex., \"Membre\"). A continuació, seleccioneu els tipus d'objectius. Per començar, podeu seleccionar tots els tipus com a objectius. Finalment, seleccioneu la funció \"Editor de paquets de treball\" com a objectiu i premeu \"Copia\". Després d'haver creat els valors predeterminats, ajusteu els fluxos de treball com ho feu per a qualsevol altra funció." link_message: "Configura els fluxos de treball a l'administració." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -665,14 +673,15 @@ ca: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -687,6 +696,9 @@ ca: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -723,6 +735,8 @@ ca: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitació account: delete: "Elimina el compte" @@ -787,6 +801,7 @@ ca: is_required: "Obligatori" max_length: "Longitud màxima" min_length: "Longitud mínima" + content_right_to_left: "Right-to-Left content" multi_value: "Permet la selecció múltiple" possible_values: "Valors possibles" regexp: "Expressió regular" @@ -822,6 +837,8 @@ ca: attr_lastname: "Atribut Cognom" attr_login: "Atribut Nom d'usuari" attr_mail: "Atribut de Correu electrònic" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Servidor" onthefly: "Creació d'usuari automàtica" @@ -865,6 +882,9 @@ ca: project_custom_field: is_required: "Required for all projects" custom_field_section: Secció + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columnes" relations_to_type_column: "Relacions a %{type}" @@ -874,7 +894,7 @@ ca: timeline_labels: "Etiquetes de cronologia" relation: lag: "Retard" - from: "Paquet de treball" + from: "Related work package" to: "Paquet de treball relacionat" reminder: remind_at_date: "Date" @@ -1198,12 +1218,16 @@ ca: typed_dag: circular_dependency: "La relació crea un cercle de relacions." attributes: - to: - error_not_found: "paquet de treball en posició \"cap a\" no trobada o no visible" - error_readonly: "una relació d'enllaç existent \"cap a\" és inamovible" - from: - error_not_found: "paquet de treball en posició \"des de\" no trobada o no visible" - error_readonly: "una relació d'enllaç existent \"des de\" és inamovible" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "El proveïdor SCM no està disponible" not_whitelisted: "no està permès per la configuració." @@ -1558,8 +1582,9 @@ ca: button_copy_and_follow: "Copiar i continuar" button_create: "Crear" button_create_and_continue: "Crear i continuar" - button_delete: "Esborrar" button_decline: "Rebutja" + button_delete: "Esborrar" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Suprimir l'observador %{name}" button_download: "Descàrrega" button_duplicate: "Duplicar" @@ -1762,6 +1787,9 @@ ca: hour: one: "hora" other: "hores" + day: + one: "day" + other: "days" description_active: "Actiu?" description_attachment_toggle: "Mostra o amaga els fitxers adjunts" description_autocomplete: > @@ -1797,6 +1825,10 @@ ca: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Personalitza la configuració del formulari amb aquestes extensions addicionals:" add_groups: "Afegir un nou atribut de grups" @@ -2159,6 +2191,7 @@ ca: label_add_subtask: "Afegir subtasca" label_added: "afegit" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Afegit per %{author} fa %{age}" label_additional_workflow_transitions_for_assignee: "Transicions addicionals permeses quan l'usuari és l'assignat" label_additional_workflow_transitions_for_author: "Transicions addicionals permeses quan l'usuari és l'autor" @@ -2579,6 +2612,7 @@ ca: label_project_new: "Nou projecte" label_project_plural: "Projectes" label_project_list_plural: "Llistes de projectes" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Atributs de projecte" label_project_custom_field_plural: "Atributs de projecte" label_project_settings: "Configuració del projecte" @@ -2605,6 +2639,7 @@ ca: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Suprimir relació" + label_relation_edit: "Edit relation" label_relation_new: "Nova Relació" label_release_notes: "Notes de llançament" label_remaining_work: "Treball restant" @@ -3018,6 +3053,7 @@ ca: notice_bad_request: "Sol·licitud incorrecte." notice_not_authorized: "No tens permís per accedir a aquesta pàgina." notice_not_authorized_archived_project: "El projecte al que intentes accedir està arxivat." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "La teva contrasenya no és correcta, no es pot continuar." notice_principals_found_multiple: "S'han trobat %{number} resultats.\nPrem per focalitzar el primer resultat." notice_principals_found_single: "S'han trobat un resultat.\nPrem per focalitzar-lo." @@ -3065,7 +3101,7 @@ ca: text_getting_started_description: "Obté una visió general ràpida de la gestió de projectes i col·laboració d'equips amb OpenProject. Pots tornar a veure aquest vídeo des del menú d'ajuda." welcome: "Benvingut a %{app_title}" select_language: "Si us plau, selecciona el teu idioma" - permission_add_work_package_notes: "Afegir notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Afegir paquets de treball" permission_add_messages: "Publicar missatges" permission_add_project: "Create projects" @@ -3095,10 +3131,11 @@ ca: permission_delete_timelines: "Suprimir les línies de temps" permission_delete_wiki_pages: "Suprimir les pàgines wiki" permission_delete_wiki_pages_attachments: "Suprimir adjunts" - permission_edit_work_package_notes: "Editar notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Editar paquets de treball" permission_edit_messages: "Editar missatges" - permission_edit_own_work_package_notes: "Editar notes pròpies" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Editar missatges propis" permission_edit_own_time_entries: "Editar els registres de temps propis" permission_edit_project: "Editar projecte" @@ -3191,9 +3228,9 @@ ca: are_you_sure: "Estàs segur que vols arxivar el projecte \"%{name}\"?" archived: "Arxivat" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activitat" project_module_forums: "Fòrums" project_module_work_package_tracking: "Paquets de treball" @@ -3325,6 +3362,7 @@ ca: activated: "activat" deactivated: "desactivat" search_input_placeholder: "Cerca..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Habilitar CORS" setting_apiv3_cors_origins: "\"API V3 Cross-Origin Resource Sharing (CORS)\" orígens permesos" setting_apiv3_cors_origins_text_html: > @@ -3550,6 +3588,27 @@ ca: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Configuració per a projectes nous" @@ -3583,6 +3642,7 @@ ca: text_are_you_sure_continue: "Estàs segur que vols continuar?" text_are_you_sure_with_children: "Vols suprimir el paquet de treball i tots els paquets de treball fills?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assignar al projecte" text_form_configuration: > Pots configurar quins camps seran mostrats en el formulari del paquet de treball. Pots agrupar els camps lliurement per mostrar les necessitats del teu domini. @@ -3662,6 +3722,7 @@ ca: text_notice_security_badge_displayed_html: > Nota: si està activat, es mostra un indicador amb l'estat de la teva instal·lació %{information_panel_label} en el panell d'administració i a la pàgina inicial. Només es mostra als administradors.
    L'indicador comprova la teva versió d'OpenProject actual amb la versió oficial i t'avisa si hi ha actualitzacions o qualsevol vulnerabilitat. Per a més informació en quina informació es proveïx, quines dades són necessàries per actualitzacions i com desactivar aquesta funció, si us plau, visita la documentació de configuració. text_own_membership_delete_confirmation: "Estàs a punt d'eliminar algun o tots els teus permisos i potser no podreu editar més aquest projecte.\nEstàs segur que vols continuar?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Es pot escriure als complements actius" text_powered_by: "Desenvolupat per %{link}" text_project_identifier_info: "Només es permeten lletres minúscules (a-z), números, guions i guions baixos, i ha de començar amb una lletra minúscula." @@ -4030,6 +4091,8 @@ ca: builtin: Built-in instance application confidential: Confidential singular: "Aplicació OAuth" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "Aplicacions OAuth" named: "Aplicació OAuth \"%{name}\"." new: "Nova aplicació OAuth" diff --git a/config/locales/crowdin/ckb-IR.yml b/config/locales/crowdin/ckb-IR.yml index 53407f8f4683..efb45d1fc406 100644 --- a/config/locales/crowdin/ckb-IR.yml +++ b/config/locales/crowdin/ckb-IR.yml @@ -229,6 +229,10 @@ ckb-IR: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ ckb-IR: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ ckb-IR: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ ckb-IR: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ ckb-IR: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ ckb-IR: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ ckb-IR: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ ckb-IR: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ ckb-IR: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ ckb-IR: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ ckb-IR: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ ckb-IR: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ ckb-IR: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ ckb-IR: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ ckb-IR: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ ckb-IR: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ ckb-IR: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ ckb-IR: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ ckb-IR: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ ckb-IR: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ ckb-IR: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ ckb-IR: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ ckb-IR: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ ckb-IR: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ ckb-IR: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ ckb-IR: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ ckb-IR: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ ckb-IR: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/cs.yml b/config/locales/crowdin/cs.yml index 2d97fa9e5b87..186914750b22 100644 --- a/config/locales/crowdin/cs.yml +++ b/config/locales/crowdin/cs.yml @@ -229,6 +229,10 @@ cs: item: title: Tato položka nemá žádnou úroveň hierarchie níže description: Přidat položky do tohoto seznamu k vytvoření podpoložek uvnitř jiného + delete_dialog: + title: "Odstranění položku vlastního pole" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Štítek položky" short: "Krátký název" @@ -249,13 +253,14 @@ cs: confirm_destroy_option: "Smazáním možnosti smažete všechny výskyty (např. v pracovních balíčcích). Opravdu ji chcete odstranit?" reorder_alphabetical: "Změnit pořadí abecedně" reorder_confirmation: "Varování: Aktuální pořadí dostupných hodnot bude ztraceno. Pokračovat?" + placeholder_version_select: "Nejprve je nutné vybrat pracovní balíček nebo projekt" instructions: is_required: "Označit vlastní pole jako povinné. Bude povinné vyplnit pole při vytváření nových nebo aktualizaci existujících zdrojů." is_required_for_project: "Zaškrtnutím tento atribut povolíte a bude vyžadován ve všech projektech. U jednotlivých projektů jej nelze zrušit." is_for_all: "Označit vlastní pole jako dostupné ve všech existujících a nových projektech." multi_select: "Umožňuje uživateli přiřadit tomuto vlastnímu poli více hodnot." searchable: "Zahrnout hodnoty polí při použití globální funkce vyhledávání." - searchable_for_project: "Check to make this attribute available as a filter in project lists." + searchable_for_project: "Zaškrtněte pro zpřístupnění tohoto atributu jako filtru v seznamech projektů." editable: "Umožnit editaci pole samotnými uživateli." admin_only: "Check to make this attribute only visible to administrators. Users without admin rights will not be able to view or edit it." is_filter: > @@ -287,6 +292,7 @@ cs: label: "Popisek" short: "Krátký název" parent: "Nadřazený" + blueprint: "Vzhled plánu" global_search: placeholder: "Hledat v %{app_title}" overwritten_tabs: @@ -483,6 +489,7 @@ cs: my: access_token: create_dialog: + title: Token generated header: '%{type} token byl vygenerován' warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -664,6 +671,7 @@ cs: title: "Pro sdílení pracovního balíčku chybí pracovní postup" message: "Pro roli 'Pracovní balíček' není nastaven žádný pracovní postup. Bez pracovního postupu nemůže sdílení s uživatelem změnit stav pracovního balíčku. Pracovní toky mohou být zkopírovány. Vyberte typ zdroje (např. 'Úkol') a zdrojovou roli (např. 'Člen'). Pak vyberte cílové typy. Na začátku můžete vybrat všechny typy jako cíle. Nakonec vyberte roli 'Editor pracovních balíčků' jako cíl a stiskněte 'Kopírovat'. Poté, co jste tak vytvořili výchozí nastavení, vyladit pracovní postupy, jak to děláte pro každou jinou roli." link_message: "Konfigurace pracovních postupů v administraci." + templated_subject_hint: Automaticky generováno pomocí typu %{type} summary: reports: category: @@ -686,14 +694,15 @@ cs: no_results_title_text: V současné době nejsou k dispozici žádné vztahy. blankslate_heading: "Žádné vztahy" blankslate_description: "Tento pracovní balíček ještě nemá žádné vztahy." + label_add_child_button: "Potomek" label_add_x: "Přidat %{x}" label_edit_x: "Upravit %{x}" label_add_description: "Přidat popis" lag: subject: "Zpožďování" - title: "Zpoždění (ve dnech)" caption: "Minimální počet pracovních dnů mezi oběma pracovními balíčky." relations: + label_new_child_created: "Nový pracovní balíček vytvořen a přidán jako potomek" label_relates_singular: "související s" label_relates_plural: "související s" label_relates_to_singular: "související s" @@ -708,6 +717,9 @@ cs: follows_description: "Související pracovní balíček musí být ukončen dříve, než bude možné začít tento" label_child_singular: "dítě" label_child_plural: "Potomci" + new_child: "Novy potomek" + new_child_text: "Vytvoří související pracovní balíček jako podpoložku aktuálního (nadřazeného) pracovního balíčku" + existing_child: "Existujici potomek" child_description: "Udělá související pracovní balíček podpoložkou aktuálního (nadřazeného) pracovního balíčku" label_blocks_singular: "bloky" label_blocks_plural: "bloky" @@ -729,7 +741,7 @@ cs: duplicated_description: "Související pracovní balíček je kopií tohoto" label_includes_singular: "zahrnuje" label_includes_plural: "zahrnuje" - includes_description: "Marks the related work package as including this one with no additional effect" + includes_description: "označí související pracovní balíček jako zahrnující tento balíček bez dalšího účinku." label_partof_singular: "část" label_partof_plural: "část" label_part_of_singular: "část" @@ -744,6 +756,8 @@ cs: required_description: "Označí tento pracovní balíček jako nevyhnutnost na související" label_parent_singular: "nadřazený" label_parent_plural: "nadřazený" + ghost_relation_title: "Související pracovní balíček" + ghost_relation_description: "Toto není viditelné z důvodu oprávnění." label_invitation: Pozvánka account: delete: "Odstranit účet" @@ -808,6 +822,7 @@ cs: is_required: "Požadováno" max_length: "Maximální délka" min_length: "Minimální délka" + content_right_to_left: "Obsah zprava dolev\na" multi_value: "Povolit multi-select" possible_values: "Možné hodnoty" regexp: "Regulární výraz" @@ -843,6 +858,8 @@ cs: attr_lastname: "Příjmení (atribut)" attr_login: "Atribut uživatelského jména" attr_mail: "Email (atribut)" + filter_string: "Řetězec filtru" + admin: "Administrátor" base_dn: "Base DN" host: "Hostitel" onthefly: "Automatické vytváření uživatele" @@ -886,6 +903,9 @@ cs: project_custom_field: is_required: "Vyžadováno pro všechny projekty" custom_field_section: Sekce + project/life_cycle_step_definition: + name: "Název" + color: "Barva" query: column_names: "Sloupce" relations_to_type_column: "Vztahy s %{type}" @@ -895,7 +915,7 @@ cs: timeline_labels: "Štítky časové osy" relation: lag: "Lag" - from: "Pracovní balíček" + from: "Related work package" to: "Související pracovní balíček" reminder: remind_at_date: "Datum" @@ -1219,12 +1239,16 @@ cs: typed_dag: circular_dependency: "Vztah vytvoří cyklický vztah." attributes: - to: - error_not_found: "pracovní balíček v pozici „to“ nenalezen nebo není viditelný" - error_readonly: "existující odkaz `to` je neměnný" - from: - error_not_found: "pracovní balíček v pozici `od` nebyl nalezen nebo není viditelný" - error_readonly: "existující odkaz `od` je neměnný" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Prodejce SCM není k dispozici" not_whitelisted: "není povoleno konfigurací." @@ -1599,8 +1623,9 @@ cs: button_copy_and_follow: "Kopírovat a pokračovat" button_create: "Vytvořit" button_create_and_continue: "Vytvořit a pokračovat" - button_delete: "Odstranit" button_decline: "Zamítnout" + button_delete: "Odstranit" + button_delete_permanently: "Trvale odstranit" button_delete_watcher: "Odstranit sledujícího %{name}" button_download: "Stáhnout" button_duplicate: "Kopie" @@ -1839,6 +1864,11 @@ cs: few: "hodiny" many: "hodiny" other: "hodiny" + day: + one: "den" + few: "dny" + many: "dnů" + other: "dnů" description_active: "Aktivní?" description_attachment_toggle: "Zobrazit/skrýt přílohy" description_autocomplete: > @@ -1874,6 +1904,10 @@ cs: upsale: title: "Doplňky Enterprise Edice" link_title: "Více informací" + automatic_subject_generation: + description: "Vytváření automaticky generovaných předmětů pomocí odkazovaných atributů a textu." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Přizpůsobte si konfiguraci formuláře s těmito doplňky:" add_groups: "Přidat nové skupiny atributů" @@ -1988,7 +2022,7 @@ cs: caption: "Vyloučit obrázky pro zmenšení velikosti exportu PDF." gantt_zoom_levels: label: "Úrovně přiblížení" - caption: "Select what is the zoom level for dates displayed in the chart." + caption: "Vyberte úroveň přiblížení pro data zobrazená v grafu." options: days: "Dny" weeks: "Týdny" @@ -2003,7 +2037,7 @@ cs: very_wide: "Velmi široký" paper_size: label: "Velikost papíru" - caption: "Depending on the chart size more than one page might be exported." + caption: "V závislosti na velikosti grafu může být exportováno více než jedna stránka." long_text_fields: input_caption: "Ve výchozím nastavení jsou vybrána všechna dlouhá textová pole." input_label: "Přidat dlouhá textová pole" @@ -2051,7 +2085,7 @@ cs: caption: Text, který se zobrazí uprostřed zápatí hyphenation: label: Dělení slov - caption: Break words between lines to improve text justification and readability. + caption: Zlomte slova mezi řádky, abyste zlepšili odůvodnění textu a jeho čitelnost. paper_size: label: Velikost papíru caption: Velikost papíru, který se má použít pro PDF. @@ -2236,6 +2270,7 @@ cs: label_add_subtask: "Přidat podúkol" label_added: "přidáno" label_added_by: "Přidáno %{author}" + label_added_by_on: "Přidáno %{author} na %{date}" label_added_time_by: "Přidáno %{author} před %{age}" label_additional_workflow_transitions_for_assignee: "Povolené dodatečné přechody, pokud je uživatel přiřazený" label_additional_workflow_transitions_for_author: "Povolené dodatečné přechody, pokud je uživatel autor" @@ -2656,6 +2691,7 @@ cs: label_project_new: "Nový projekt" label_project_plural: "Projekty" label_project_list_plural: "Seznamy projektů" + label_project_lifecycle: "Životní cyklus projektu" label_project_attributes_plural: "Atributy projektu" label_project_custom_field_plural: "Atributy projektu" label_project_settings: "Nastavení projektu" @@ -2682,6 +2718,7 @@ cs: label_relation: "Vztah" label_relation_actions: "akce k Vztahu" label_relation_delete: "Odstranit vztah" + label_relation_edit: "Upravit vztah" label_relation_new: "Nový vztah" label_release_notes: "Poznámky k verzi" label_remaining_work: "Zbývající práce" @@ -2918,7 +2955,7 @@ cs: created_at: "Vytvořeno v %{timestamp} uživatelem %{user} " login_to_see_all: "Přihlaste se pro zobrazení všech notifikací." mentioned: "Byli jste zmíněni v komentáři" - mentioned_by: "%{user} vás zmínil v komentáři" + mentioned_by: "%{user} vás zmínil v komentáři OpenProject" more_to_see: one: "Existuje ještě 1 pracovní balíček s notifikací." few: "Existuje ještě %{count} pracovních balíčků s notifikacema." @@ -3099,6 +3136,7 @@ cs: notice_bad_request: "Chybný požadavek." notice_not_authorized: "Nemáte oprávnění k přístupu na tuto stránku." notice_not_authorized_archived_project: "Projekt, na který se pokoušíte přistoupit byl archivován." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Heslo není správné. Nelze pokračovat." notice_principals_found_multiple: "Nalezeno %{number} výsledků. \nStiskněte Tab pro přechod na první výsledek." notice_principals_found_single: "Existuje jeden výsledek. \n Záložka pro zaměření." @@ -3149,7 +3187,7 @@ cs: text_getting_started_description: "Získejte rychlý přehled o řízení projektu a spolupráci týmu s OpenProject. Toto video můžete restartovat z nabídky nápovědy." welcome: "Vítejte v %{app_title}" select_language: "Vyberte prosím svůj jazyk" - permission_add_work_package_notes: "Přidat poznámky" + permission_add_work_package_notes: "Přidat komentáře" permission_add_work_packages: "Přidat pracovní balíčky" permission_add_messages: "Odesílat zprávy" permission_add_project: "Vytvořit projekty" @@ -3179,10 +3217,11 @@ cs: permission_delete_timelines: "Odstranit časové osy" permission_delete_wiki_pages: "Odstranit wiki stránky" permission_delete_wiki_pages_attachments: "Odstranit přílohy" - permission_edit_work_package_notes: "Upravit poznámky" + permission_edit_work_package_notes: "Moderovat komentáře" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Upravit pracovní balíčky" permission_edit_messages: "Upravit zprávy" - permission_edit_own_work_package_notes: "Upravit vlastní poznámky" + permission_edit_own_work_package_notes: "Upravit vlastní komentáře" permission_edit_own_messages: "Upravit vlastní zprávy" permission_edit_own_time_entries: "Upravit vlastní časové záznamy" permission_edit_project: "Upravit projekt" @@ -3277,7 +3316,7 @@ cs: count: zero: "0 projektů" one: "1 projekt" - other: "%{count} Projektů" + other: "%{count} projektů" project_module_activity: "Aktivita" project_module_forums: "Fóra" project_module_work_package_tracking: "Pracovní balíčky" @@ -3411,6 +3450,7 @@ cs: activated: "Aktivováno " deactivated: "Deaktivováno" search_input_placeholder: "Hledat ..." + setting_apiv3_cors_title: "Sdílení zdrojů Cross-Origin (CORS)" setting_apiv3_cors_enabled: "Povolit CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) povolené počátky" setting_apiv3_cors_origins_text_html: > @@ -3493,7 +3533,7 @@ cs: setting_work_package_done_ratio: "Režim výpočtu průběhu" setting_work_package_done_ratio_field: "Na základě práce" setting_work_package_done_ratio_field_caption_html: >- - % Complete can be freely set to any value. If you optionally enter a value for Work, Remaining work will automatically be derived. + Upravit vlastní komentáře setting_work_package_done_ratio_status: "Na základě stavu" setting_work_package_done_ratio_status_caption_html: >- Každý stav má přiřazenou hodnotu % kompletní . Změna stavu změní % Dokončeno. @@ -3636,6 +3676,27 @@ cs: new: heading: "Nový atribut" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Životní cyklus projektu" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Přidat" + label_add_description: "Přidat definici životního cyklu" + label_add_stage: "Etapa" + label_add_gate: "Gate" + filter: + label: "Hledat fázi projektu nebo gatey" + section_header: "Etapy a gatey" + non_defined: "V současné době nejsou definovány žádné etapy ani gatey." + new: + description: "Změny v tomto kroku projektu se odrazí ve všech projektech, kde je povoleno." + new_stage: + heading: "Nová etapa" + new_gate: + heading: "Nová gate" + edit_stage: + heading: "Upravit etapu" + edit_gate: + heading: "Upravit gate" projects: missing_dependencies: "Projektový modul %{module} byl zkontrolován, který závisí na %{dependencies}. Tyto závislosti musíte také zkontrolovat." section_new_projects: "Nastavení pro nové projekty" @@ -3669,6 +3730,7 @@ cs: text_are_you_sure_continue: "Jste si jisti, že chcete pokračovat?" text_are_you_sure_with_children: "Smazat pracovní balíček a všechny podřízené pracovní balíčky?" text_are_you_sure_with_project_custom_fields: "Smazání tohoto atributu také smaže jeho hodnoty ve všech projektech. Jste si jisti, že to chcete udělat?" + text_are_you_sure_with_project_life_cycle_step: "Odstraněním tohoto kroku se také odstraní jeho použití ve všech projektech. Jste si jisti, že to chcete udělat?" text_assign_to_project: "Přiřadit k projektu" text_form_configuration: > Můžete si upravit, která pole budou zobrazena ve formulářích pracovních balíčků. Pole můžete volně seskupit tak, aby odrážela potřeby vaší domény. @@ -3748,6 +3810,7 @@ cs: text_notice_security_badge_displayed_html: > Poznámka: Pokud je povoleno, bude zobrazen odznak se stavem instalace v %{information_panel_label} administrativním panelu, a na domovské stránce. Zobrazuje se pouze administrátorům.
    Odznak zkontroluje vaši aktuální verzi OpenProject proti oficiální databázi OpenProject release, aby vás upozornil na jakékoliv aktualizace nebo známá slabá místa. Pro více informací o tom, co kontrola stanoví, jaké údaje jsou potřebné k poskytnutí dostupných aktualizací, a jak tuto kontrolu zakázat, navštivte konfigurační dokumentaci. text_own_membership_delete_confirmation: "Chystáte se odebrat si některá nebo všechna svá oprávnění, potom již nemusíte být schopni upravit tento projekt.\nOpravdu chcete pokračovat?" + text_permanent_delete_confirmation_checkbox_label: "Beru na vědomí, že toto vymazání nelze vzít zpět." text_plugin_assets_writable: "Zapisovatelný adresář aktiv pluginu" text_powered_by: "Běží na %{link}" text_project_identifier_info: "Jsou povolena pouze malá písmena (a-z), číslice, pomlčky a podtržítka. Musí začínat malým písmenem." @@ -3899,9 +3962,9 @@ cs: progress: label_note: "Poznámka:" modal: - work_based_help_text: "Each field is automatically calculated from the two others when possible." + work_based_help_text: "Každé pole se automaticky vypočítá ze dvou ostatních, pokud je to možné." status_based_help_text: "% Dokončeno je nastaveno podle stavu pracovního balíčku." - migration_warning_text: "In work-based progress calculation mode, % Complete cannot be manually set and is tied to Work. The existing value has been kept but cannot be edited. Please input Work first." + migration_warning_text: "V režimu výpočtu postupu založeného na práci nelze % dokončeno nastavit ručně a je vázáno na práci. Stávající hodnota byla zachována, ale nelze ji upravovat. Zadejte prosím nejprve položku Práce." derivation_hints: done_ratio: cleared_because_remaining_work_is_empty: "Vymazáno, protože zbývající práce je prázdná." @@ -4117,6 +4180,8 @@ cs: builtin: Vestavěná aplikace confidential: Důvěrné singular: "OAuth aplikace" + scopes: "Rozsahy" + client_credentials: "Přihlašovací údaje klienta" plural: "OAuth aplikace" named: "OAuth aplikace '%{name}'" new: "Nová OAuth aplikace" diff --git a/config/locales/crowdin/da.yml b/config/locales/crowdin/da.yml index 09f61e6cd3e1..305a43b9722b 100644 --- a/config/locales/crowdin/da.yml +++ b/config/locales/crowdin/da.yml @@ -227,6 +227,10 @@ da: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -247,6 +251,7 @@ da: confirm_destroy_option: "Sletning af en indstilling vil slette alle dens forekomster (f.eks. i arbejdspakker). Er du sikker på, at du vil slette den?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -285,6 +290,7 @@ da: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -467,6 +473,7 @@ da: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -644,6 +651,7 @@ da: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -666,14 +674,15 @@ da: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -688,6 +697,9 @@ da: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -724,6 +736,8 @@ da: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Slet konto" @@ -788,6 +802,7 @@ da: is_required: "Påkrævet" max_length: "Største længde" min_length: "Mindste længde" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Mulige værdier" regexp: "Normalt udtryk" @@ -823,6 +838,8 @@ da: attr_lastname: "Efternavn" attr_login: "Username attribute" attr_mail: "E-mail" + filter_string: "Filter string" + admin: "Administrator" base_dn: "DN base" host: "Vært" onthefly: "Automatic user creation" @@ -866,6 +883,9 @@ da: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolonner" relations_to_type_column: "Relations to %{type}" @@ -875,7 +895,7 @@ da: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Arbejdspakke" + from: "Related work package" to: "Sammenhørende arbejdspakker" reminder: remind_at_date: "Date" @@ -1199,12 +1219,16 @@ da: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM-leverandør utilgængelig" not_whitelisted: "tillades ikke af opsætningen." @@ -1559,8 +1583,9 @@ da: button_copy_and_follow: "Kopier og følg" button_create: "Opret" button_create_and_continue: "Opret og fortsæt" - button_delete: "Slet" button_decline: "Decline" + button_delete: "Slet" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Slet tilsynsførende %{name}" button_download: "Hent" button_duplicate: "Lav dublet" @@ -1763,6 +1788,9 @@ da: hour: one: "time" other: "timer" + day: + one: "day" + other: "days" description_active: "Aktiv?" description_attachment_toggle: "Vis/Skjul vedhæftede" description_autocomplete: > @@ -1798,6 +1826,10 @@ da: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2160,6 +2192,7 @@ da: label_add_subtask: "Tilføj underopgave" label_added: "tilføjet" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Tilføjet af %{author} for %{age} siden" label_additional_workflow_transitions_for_assignee: "Yderligere overgange tilladt når brugeren er opdragsgiveren" label_additional_workflow_transitions_for_author: "Yderligere overgange tilladt når brugeren er forfatteren" @@ -2580,6 +2613,7 @@ da: label_project_new: "Nyt projekt" label_project_plural: "Projekter" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Projektindstillinger" @@ -2606,6 +2640,7 @@ da: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Slet forbindelse" + label_relation_edit: "Edit relation" label_relation_new: "Ny forbindelse" label_release_notes: "Udgivelsesnoter" label_remaining_work: "Remaining work" @@ -3022,6 +3057,7 @@ da: notice_bad_request: "Uanvendelig anmodning." notice_not_authorized: "Du har ikke tilladelser til at gå til denne side." notice_not_authorized_archived_project: "Det projekt du forsøger at tilgå er blevet arkiveret." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3070,7 +3106,7 @@ da: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Tilføj noter" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Tilføj arbejdspakker" permission_add_messages: "Send beskeder" permission_add_project: "Create projects" @@ -3100,10 +3136,11 @@ da: permission_delete_timelines: "Slet tidslinjer" permission_delete_wiki_pages: "Slet wiki-sider" permission_delete_wiki_pages_attachments: "Slet vedhæftninger" - permission_edit_work_package_notes: "Rediger noter" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Rediger arbejdspakker" permission_edit_messages: "Rediger meddelelser" - permission_edit_own_work_package_notes: "Rediger egne noter" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Rediger egne meddelelser" permission_edit_own_time_entries: "Rediger egne tidsregistringer" permission_edit_project: "Rediger projekt" @@ -3196,9 +3233,9 @@ da: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktivivtet" project_module_forums: "Fora" project_module_work_package_tracking: "Arbejdspakker" @@ -3330,6 +3367,7 @@ da: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Søg ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3555,6 +3593,27 @@ da: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3588,6 +3647,7 @@ da: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Slet arbejdspakker og alle underordnede pakker?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Tilknyt til projektet" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3667,6 +3727,7 @@ da: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "Du er ved at fjerne nogle af, eller alle dine tilladelser og vil muligvis ikke kunne redigere projektet herefter.\nEr du sikker på, du vil fortsætte?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Brug af plugin forudsætter at dette arkiv er skrivbart" text_powered_by: "Drevet af %{link}" text_project_identifier_info: "Kun små bogstaver (a-z), tal, - og _ er tilladt; først tegn skal være et bogstav." @@ -4035,6 +4096,8 @@ da: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/de.yml b/config/locales/crowdin/de.yml index b2fe53bbea56..d4ba5bc174ed 100644 --- a/config/locales/crowdin/de.yml +++ b/config/locales/crowdin/de.yml @@ -226,6 +226,10 @@ de: item: title: Dieses Element hat keine untergeordnete Hierarchieebene description: Füge Elemente zu dieser Liste hinzu, um Unterelemente innerhalb eines anderen zu erstellen + delete_dialog: + title: "Benutzerdefiniertes Feldelement löschen" + heading: "Benutzerdefiniertes Feldelement löschen?" + description: "Mit dieser Aktion werden das Element und alle seine Unterelemente unwiderruflich entfernt. Alle zugewiesenen Werte werden endgültig gelöscht. Wenn dieses Feld erforderlich ist, kann das Entfernen von Elementen dazu führen, dass bestehende Arbeitspakete ungültig werden." placeholder: label: "Elementbezeichnung" short: "Kurzname" @@ -246,6 +250,7 @@ de: confirm_destroy_option: "Löschen eines Werts entfernt alle bereits gesetzten Werte (z.B. bei Arbeitspaketen). Sind Sie sicher, dass Sie den Wert löschen möchten?" reorder_alphabetical: "Alphabetisch umsortieren" reorder_confirmation: "Warnung: Die aktuelle Reihenfolge der verfügbaren Werte geht verloren. Fortfahren?" + placeholder_version_select: "Zunächst muss ein Arbeitspaket oder ein Projekt ausgewählt werden" instructions: is_required: "Markieren Sie das benutzerdefinierte Feld als erforderlich. Dies macht es zwingend erforderlich, das Feld auszufüllen, wenn neue oder aktualisierte Ressourcen erstellt werden." is_required_for_project: "Das Attribut in allen Projekten erforderlich machen. Es kann dann nicht für einzelne Projekte deaktiviert werden." @@ -277,13 +282,14 @@ de: short: not_unique: "muss innerhalb der gleichen Hierarchieebene eindeutig sein." parent: - not_descendant: "muss ein Abkömmling der Hierarchiewurzel sein." + not_descendant: "muss ein Unterelement der Hierarchiewurzel sein." rules: depth: "Tiefe" item: "Element" label: "Bezeichnung" short: "Kurzname" parent: "Übergeordnetes Arbeitspaket" + blueprint: "Blaupause für Muster" global_search: placeholder: "Suche in %{app_title}" overwritten_tabs: @@ -466,6 +472,7 @@ de: my: access_token: create_dialog: + title: Token generiert header: Das %{type}-Token wurde generiert warning: 'Hinweis: Dieser Token ist nur einmal sichtbar, der Token kann jetzt kopiert werden.' errors: @@ -592,15 +599,15 @@ de: tab: "Einstellungen" type_color_text: "Die ausgewählte Farbe unterscheidet verschiedene Typen\nin Gantt-Diagrammen und Arbeitspakettabellen. Es wird daher empfohlen, gut unterscheidbare Farben zu verwenden." subject_configuration: - tab: "Thema konfigurieren" + tab: "Titel konfigurieren" manually_editable_subjects: - label: "Manuell bearbeitbare Themen" - caption: "Benutzer können die Themen der Arbeitspakete ohne Einschränkungen manuell eingeben und bearbeiten." + label: "Manuell bearbeitbare Titel" + caption: "Benutzer können die Titel der Arbeitspakete ohne Einschränkungen manuell eingeben und bearbeiten." automatically_generated_subjects: - label: "Automatisch generierte Themen" - caption: "Definieren Sie ein Schema aus referenzierten Attributen und Freitext für die automatische Generierung von Arbeitspaketthemen. Nutzer können diese nicht manuell editieren." + label: "Automatisch generierte Titel" + caption: "Definieren Sie ein Schema aus referenzierten Attributen und Freitext für die automatische Generierung von Arbeitspakettiteln. Nutzer können diese nicht manuell editieren." pattern: - label: "Thema-Schema" + label: "Titel-Schema" caption: "Suchen Sie nach einem Attribut oder fügen Sie Text hinzu. Um ein Leerzeichen zwischen Elementen zu erstellen, fügen Sie es als Text hinzu." versions: overview: @@ -639,6 +646,7 @@ de: title: "Der Workflow für das Teilen von Arbeitspaketen fehlt" message: "Es ist kein Workflow für die Rolle ‚Work package editor‘ konfiguriert. Nur mit einem solchen Workflow können Benutzer, mit denen ein Arbeitspaket geteilt wurde, den Status des Arbeitspakets ändern. Workflows lassen sich einfach kopieren. Wählen Sie dazu einen Quell-Typ (z. B. ‚Task‘) und eine Quell-Rolle (z. B. 'Member') aus. Wählen Sie dann die Ziel-Typen aus. Als ersten Schritt können Sie alle Typen als Ziel-Typen auswählen. Danach wählen Sie die Ziel-Rolle ‚Work package editor‘ aus und drücken Sie auf den Knopf ‚Kopieren‘. Nachdem Sie hiermit eine Grundlage geschaffen haben, können Sie danach diese Workflows weiter anpassen, ganz genau wie Sie es für jede andere Rolle bereits getan haben." link_message: "Konfigurieren Sie die Workflows in der Administration." + templated_subject_hint: Automatisch durch den Typ %{type} erzeugt summary: reports: category: @@ -661,14 +669,15 @@ de: no_results_title_text: Derzeit sind keine Beziehungen verfügbar. blankslate_heading: "Keine Beziehungen" blankslate_description: "Dieses Arbeitspaket hat noch keine Beziehungen." + label_add_child_button: "Kind" label_add_x: "%{x} hinzufügen" label_edit_x: "%{x} editieren" label_add_description: "Beschreibung hinzufügen" lag: subject: "Verzögerung" - title: "Verzögerung (in Tagen)" caption: "Die minimale Anzahl von Arbeitstagen zwischen den zwei Arbeitspaketen." relations: + label_new_child_created: "Neues Arbeitspaket erstellt und als Kind hinzugefügt" label_relates_singular: "Beziehung mit" label_relates_plural: "Beziehungen mit" label_relates_to_singular: "Beziehung mit" @@ -683,6 +692,9 @@ de: follows_description: "Das verknüpfte Arbeitspaket muss beendet sein bevor dieses Arbeitspaket starten kann" label_child_singular: "Untergeordnetes Arbeitspaket" label_child_plural: "Untergeordnete Arbeitspakete" + new_child: "Neues Kind" + new_child_text: "Erstellt ein zugehöriges Arbeitspaket als Unterelement des aktuellen (übergeordneten) Arbeitspakets" + existing_child: "Vorhandenes Kind" child_description: "Macht das zugehörige Arbeitspaket zu einem Unterelement des aktuellen (übergeordneten) Arbeitspakets" label_blocks_singular: "Blockiert" label_blocks_plural: "Blockiert" @@ -719,6 +731,8 @@ de: required_description: "Markiert dieses Arbeitspaket als Voraussetzung für das verknüpfte Arbeitspaket" label_parent_singular: "Übergeordnetes Arbeitspaket" label_parent_plural: "Übergeordnete Arbeitspakete" + ghost_relation_title: "Zugehöriges Arbeitspaket" + ghost_relation_description: "Dies ist für Sie aufgrund von Berechtigungen nicht sichtbar." label_invitation: Einladung account: delete: "Konto löschen" @@ -783,6 +797,7 @@ de: is_required: "Erforderlich" max_length: "Maximale Länge" min_length: "Minimale Länge" + content_right_to_left: "Linksläufiger Inhalt" multi_value: "Mehrfachauswahl zulassen" possible_values: "Mögliche Werte" regexp: "Regulärer Ausdruck" @@ -818,6 +833,8 @@ de: attr_lastname: "Attribut für Nachname" attr_login: "Attribut für Benutzername" attr_mail: "Attribut für E-Mail" + filter_string: "Zeichenketten filtern" + admin: "Administrator" base_dn: "Basis-DN" host: "Host" onthefly: "Benutzer automatisch erzeugen" @@ -861,6 +878,9 @@ de: project_custom_field: is_required: "In allen Projekten erforderlich" custom_field_section: Abschnitt + project/life_cycle_step_definition: + name: "Name" + color: "Farbe" query: column_names: "Spalten" relations_to_type_column: "Beziehungen zu %{type}" @@ -870,7 +890,7 @@ de: timeline_labels: "Timeline-Beschriftungen" relation: lag: "Verzögerung" - from: "Arbeitspaket" + from: "Verknüpftes Arbeitspaket" to: "Zugehöriges Arbeitspaket" reminder: remind_at_date: "Datum" @@ -1194,12 +1214,16 @@ de: typed_dag: circular_dependency: "Die Beziehung erzeugt eine zirkuläre Abhängigkeit." attributes: - to: - error_not_found: "Arbeitspaket in 'zu' Position nicht gefunden oder nicht sichtbar" - error_readonly: "der 'zu' Link einer bestehenden Relation kann nicht geändert werden" - from: - error_not_found: "Arbeitspaket in 'von' Position nicht gefunden oder nicht sichtbar" - error_readonly: "der 'von' Link einer bestehenden Relation kann nicht geändert werden" + to_id: + error_not_found: "nicht gefunden oder nicht sichtbar." + error_readonly: "kann für bestehende Beziehungen nicht geändert werden." + from_id: + error_not_found: "nicht gefunden oder nicht sichtbar." + error_readonly: "kann für bestehende Beziehungen nicht geändert werden." + lag: + greater_than_or_equal_to: + zero: "darf nicht negativ sein." + less_than_or_equal_to: "ist zu hoch." repository: not_available: "SCM-Anbieter ist nicht verfügbar" not_whitelisted: "wird durch die Konfiguration nicht erlaubt." @@ -1554,8 +1578,9 @@ de: button_copy_and_follow: "Kopieren und Arbeitspaket anzeigen" button_create: "Anlegen" button_create_and_continue: "Anlegen und weiter" - button_delete: "Löschen" button_decline: "Ablehnen" + button_delete: "Löschen" + button_delete_permanently: "Endgültig löschen" button_delete_watcher: "Lösche Beobachter %{name}" button_download: "Download" button_duplicate: "Duplizieren" @@ -1758,6 +1783,9 @@ de: hour: one: "Stunde" other: "Stunde" + day: + one: "Tag" + other: "Tage" description_active: "Aktiv?" description_attachment_toggle: "Dateien ein-/ausblenden" description_autocomplete: > @@ -1793,6 +1821,10 @@ de: upsale: title: "Enterprise Add-on" link_title: "Weitere Informationen" + automatic_subject_generation: + description: "Erstellen Sie automatisch generierte Betreffe mit referenzierten Attributen und Text." + customize_life_cycle: + description: "Erstellen und organisieren Sie andere Projektstages und Gates als die nach PM2 vorgesehenen." form_configuration: description: "Anpassen der Form-Konfiguration mit diesen zusätzlichen Add-ons:" add_groups: "Neue Attributgruppen hinzufügen" @@ -2155,6 +2187,7 @@ de: label_add_subtask: "Unteraufgabe hinzufügen" label_added: "hinzugefügt" label_added_by: "Von %{author} hinzugefügt" + label_added_by_on: "Hinzugefügt von %{author} am %{date}" label_added_time_by: "Von %{author} vor %{age} hinzugefügt" label_additional_workflow_transitions_for_assignee: "Zusätzliche Workflow-Übergänge für den Nutzer, dem ein Arbeitspaket zugewiesen ist" label_additional_workflow_transitions_for_author: "Zusätzliche Workflow-Übergänge wenn der Nutzer der Autor des Arbeitspakets ist" @@ -2575,6 +2608,7 @@ de: label_project_new: "Neues Projekt" label_project_plural: "Projekte" label_project_list_plural: "Projektlisten" + label_project_lifecycle: "Projektlebenszyklus" label_project_attributes_plural: "Projektattribute" label_project_custom_field_plural: "Projektattribute" label_project_settings: "Projektkonfiguration" @@ -2601,6 +2635,7 @@ de: label_relation: "Beziehung" label_relation_actions: "Beziehungsaktionen" label_relation_delete: "Beziehung löschen" + label_relation_edit: "Beziehung bearbeiten" label_relation_new: "Neue Beziehung" label_release_notes: "Release Notes" label_remaining_work: "Verbleibender Aufwand" @@ -3017,6 +3052,7 @@ de: notice_bad_request: "Fehlerhafte Anfrage." notice_not_authorized: "Sie sind nicht berechtigt, auf diese Seite zuzugreifen." notice_not_authorized_archived_project: "Das Projekt wurde archiviert und ist daher nicht verfügbar." + notice_requires_enterprise_token: "Kein Enterprise-Token vorhanden oder das vorhandene Token erlaubt keinen Zugriff auf diese Seite." notice_password_confirmation_failed: "Ihr Passwort ist nicht korrekt. Kann nicht fortgesetzt werden." notice_principals_found_multiple: "Es wurden %{number} Ergebnisse gefunden.\nDrücke Tab um das erste Ergebnis zu fokussieren." notice_principals_found_single: "Es wurde ein Ergebnis gefunden.\nDrücke Tab um es zu fokussieren." @@ -3095,7 +3131,8 @@ de: permission_delete_timelines: "Zeitplan-Reporte löschen" permission_delete_wiki_pages: "Wiki-Seiten löschen" permission_delete_wiki_pages_attachments: "Anhänge löschen" - permission_edit_work_package_notes: "Kommentare bearbeiten" + permission_edit_work_package_notes: "Kommentare moderieren" + permission_edit_work_package_notes_explanation: "Achtung: Benutzer mit dieser Berechtigung können den Kommentar eines anderen Benutzers bearbeiten." permission_edit_work_packages: "Arbeitspakete bearbeiten" permission_edit_messages: "Forenbeiträge bearbeiten" permission_edit_own_work_package_notes: "Eigene Kommentare bearbeiten" @@ -3327,6 +3364,7 @@ de: activated: "Aktiviert" deactivated: "Deaktiviert" search_input_placeholder: "Suchen ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "CORS aktivieren" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) erlaubte Origins" setting_apiv3_cors_origins_text_html: > @@ -3552,6 +3590,27 @@ de: new: heading: "Neues Attribut" description: "Änderungen an diesem Projektattribut werden in allen Projekten übernommen, in denen es aktiviert ist. Erforderliche Attribute können nicht projektweise deaktiviert werden." + project_life_cycle_step_definitions: + heading: "Projektlebenszyklus" + heading_description: "Der Projektlebenszyklus besteht aus Stages und Gates, die Ihre Projekte strukturieren. Sie werden auf der Übersichtsseite eines Projekts angezeigt und sind in der Projektliste verfügbar. Einzelne Stages und Gates können ausgewählt werden, um ein Projekt anzupassen, aber eine Neuordnung ist auf Projektebene nicht möglich." + label_add: "Hinzufügen" + label_add_description: "Lebenszyklus-Definition hinzufügen" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Stage oder Gate suchen" + section_header: "Stage und Gate" + non_defined: "Derzeit sind keine Stages oder Gates definiert." + new: + description: "Änderungen an diesem Lebenszyklus-Schritt werden in allen ihn verwendenden Projekten sichtbar." + new_stage: + heading: "Neue Stage" + new_gate: + heading: "Neues Gate" + edit_stage: + heading: "Stage bearbeiten" + edit_gate: + heading: "Gate bearbeiten" projects: missing_dependencies: "Projektmodul %{module} wurde aktiviert, hängt aber ab von %{dependencies}. Sie müssen diese Module ebenfalls aktivieren." section_new_projects: "Einstellungen für neue Projekte" @@ -3585,6 +3644,7 @@ de: text_are_you_sure_continue: "Sind Sie sicher, dass Sie fortfahren möchten?" text_are_you_sure_with_children: "Lösche Aufgabe und alle Unteraufgaben?" text_are_you_sure_with_project_custom_fields: "Wenn Sie dieses Attribut löschen, werden auch dessen Werte in allen Projekten gelöscht. Sind Sie sicher, dass Sie dies tun möchten?" + text_are_you_sure_with_project_life_cycle_step: "Das Entfernen dieses Lebenszyklus-Schritts entfernt ihn auch aus allen Projekten, in denen er bisher Verwendung fand. Sind Sie sicher, dass sie dies möchten?" text_assign_to_project: "Dem Projekt zuweisen" text_form_configuration: > Sie können anpassen, welche Felder in den Arbeitspaket-Formularen angezeigt werden. Sie können die Felder entsprechend Ihren Bedürfnissen frei gruppieren. @@ -3664,6 +3724,7 @@ de: text_notice_security_badge_displayed_html: > Hinweis: Wenn aktiviert, wird dies eine Plakette mit dem Status Ihrer Installation in der %{information_panel_label} unter Administration und auf der Startseite anzeigen. Es wird nur Administratoren gezeigt.
    Die Plakette überprüft Ihre aktuelle OpenProject-Version gegen die offizielle Release Datenbank, um Sie über Updates oder bekannten Sicherheitslücken zu informieren. Für die Überprüfung der Version werden Daten benötigt, um verfügbare Updates für Ihre Umgebung zurückzugeben. Für mehr Informationen über die Plakette, welche Daten sie benötigt und wie Sie diese Überprüfung deaktivieren können, besuchen Sie bitte die Konfigurationsdokumentation. text_own_membership_delete_confirmation: "Sie sind dabei, einige oder alle Ihre Berechtigungen zu entfernen. Es ist möglich, dass Sie danach das Projekt nicht mehr ansehen oder bearbeiten dürfen.\nSind Sie sicher, dass Sie dies tun möchten?" + text_permanent_delete_confirmation_checkbox_label: "Ich verstehe, dass diese Löschung nicht rückgängig gemacht werden kann" text_plugin_assets_writable: "Verzeichnis für Plugin-Assets beschreibbar" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Kleinbuchstaben (a-z), Ziffern, Binde- und Unterstriche erlaubt. Muss mit einem Kleinbuchstaben beginnen." @@ -4031,6 +4092,8 @@ de: builtin: Interne Anwendung für diese Instanz confidential: Vertraulich singular: "OAuth-Anwendung" + scopes: "Geltungsbereiche" + client_credentials: "Anmeldeinformationen des Clients" plural: "OAuth-Anwendungen" named: "OAuth-Anwendung '%{name}'" new: "Neue OAuth-Anwendung" diff --git a/config/locales/crowdin/el.yml b/config/locales/crowdin/el.yml index e2f496cb1a08..e6672700cea2 100644 --- a/config/locales/crowdin/el.yml +++ b/config/locales/crowdin/el.yml @@ -225,6 +225,10 @@ el: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -245,6 +249,7 @@ el: confirm_destroy_option: "Η διαγραφή μιας επιλογής θα διαγράψει όλα τα περιστατικά της (π.χ. σε πακέτα εργασίας). Είστε βέβαιοι ότι θέλετε να το διαγράψετε;" reorder_alphabetical: "Αναδιάταξη τιμών αλφαβητικά" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -283,6 +288,7 @@ el: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -465,6 +471,7 @@ el: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -642,6 +649,7 @@ el: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -664,14 +672,15 @@ el: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -686,6 +695,9 @@ el: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -722,6 +734,8 @@ el: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Πρόσκληση account: delete: "Διαγραφή λογαριασμού" @@ -786,6 +800,7 @@ el: is_required: "Απαιτείται" max_length: "Μέγιστο μήκος" min_length: "Ελάχιστο μήκος" + content_right_to_left: "Right-to-Left content" multi_value: "Επιτρέψτε την πολλαπλή επιλογή" possible_values: "Πιθανές τιμές" regexp: "Κανονική έκφραση" @@ -821,6 +836,8 @@ el: attr_lastname: "Χαρακτηριστικό επωνύμου" attr_login: "Χαρακτηριστικό ονόματος χρήστη" attr_mail: "Χαρακτηριστικό email" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Διακομιστής" onthefly: "Αυτόματη δημιουργία χρήστη" @@ -864,6 +881,9 @@ el: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Στήλες" relations_to_type_column: "Συσχετίσεις με %{type}" @@ -873,7 +893,7 @@ el: timeline_labels: "Ετικέτες χρονοδιαγράμματος" relation: lag: "Lag" - from: "Εργασία" + from: "Related work package" to: "Σχετικές εργασίες" reminder: remind_at_date: "Date" @@ -1197,12 +1217,16 @@ el: typed_dag: circular_dependency: "Η σχέση αυτή δημιουργεί έναν κύκλο σχέσεων." attributes: - to: - error_not_found: "το πακέτο εργασίας στην θέση 'σε' δεν βρέθηκε ή δεν είναι ορατό" - error_readonly: "ο σύνδεσμος 'σε' μιας υπάρχουσας συσχέτισης είναι αμετάβλητος" - from: - error_not_found: "το πακέτο εργασίας στην θέση 'από' δεν βρέθηκε ή δεν είναι ορατό" - error_readonly: "ο σύνδεσμος 'από' μιας υπάρχουσας συσχέτισης είναι αμετάβλητος" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Ο προμηθευτής SCM δεν είναι διαθέσιμος" not_whitelisted: "δεν επιτρέπεται από την διαμόρφωση." @@ -1557,8 +1581,9 @@ el: button_copy_and_follow: "Αντιγραφή και ακολούθηση" button_create: "Δημιουργία" button_create_and_continue: "Δημιουργία και συνέχεια" - button_delete: "Διαγραφή" button_decline: "Απόρριψη" + button_delete: "Διαγραφή" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Διαγραφή παρατηρητή %{name}" button_download: "Λήψη" button_duplicate: "Δημιουργία αντιγράφου" @@ -1761,6 +1786,9 @@ el: hour: one: "ώρα" other: "ώρες" + day: + one: "day" + other: "days" description_active: "Ενεργό;" description_attachment_toggle: "Εμφάνιση/Απόκρυψη συνημμένων" description_autocomplete: > @@ -1796,6 +1824,10 @@ el: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Προσθήκη καινούργιων ομάδων χαρακτηριστικών" @@ -2158,6 +2190,7 @@ el: label_add_subtask: "Προσθήκη υποεργασίας" label_added: "προστέθηκε" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Προστέθηκε από τον %{author} πριν από %{age}" label_additional_workflow_transitions_for_assignee: "Επιτρέπονται επιπλέον μεταβάσεις όταν ο χρήστης είναι το άτομο που του έχει ανατεθεί" label_additional_workflow_transitions_for_author: "Επιτρέπονται επιπλέον μεταβάσεις όταν ο χρήστης είναι ο συγγραφέας" @@ -2578,6 +2611,7 @@ el: label_project_new: "Νέο έργο" label_project_plural: "Έργα" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Ρυθμίσεις έργου" @@ -2604,6 +2638,7 @@ el: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Διαγραφή συσχέτισης" + label_relation_edit: "Edit relation" label_relation_new: "Νέα συσχέτιση" label_release_notes: "Σημειώσεις έκδοσης" label_remaining_work: "Remaining work" @@ -3019,6 +3054,7 @@ el: notice_bad_request: "Εσφαλμένο Αίτημα." notice_not_authorized: "Δεν έχετε δικαίωμα πρόσβασης σε αυτή τη σελίδα." notice_not_authorized_archived_project: "Το έργο που προσπαθείτε να ανοίξετε έχει αρχειοθετηθεί." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Ο κωδικός πρόσβασης δεν είναι σωστός. Δεν μπορείτε να συνεχίσετε." notice_principals_found_multiple: "Βρέθηκαν %{number} αποτελέσματα. \n Πατήστε Tab για να εστιάσετε στο πρώτο αποτέλεσμα." notice_principals_found_single: "Υπάρχει ένα αποτέλεσμα. \n Πατήστε Tab για να εστιάσετε σε αυτό." @@ -3067,7 +3103,7 @@ el: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Παρακαλούμε επιλέξτε την γλώσσα σας" - permission_add_work_package_notes: "Προσθήκη σημειώσεων" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Προσθήκη πακέτων εργασίας" permission_add_messages: "Δημοσίευση μηνυμάτων" permission_add_project: "Create projects" @@ -3097,10 +3133,11 @@ el: permission_delete_timelines: "Διαγραφή χρονοδιαγραμμάτων" permission_delete_wiki_pages: "Διαγραφή σελίδων wiki" permission_delete_wiki_pages_attachments: "Διαγραφή συνημμένων" - permission_edit_work_package_notes: "Επεξεργασία σημειώσεων" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Επεξεργασία πακέτων εργασίας" permission_edit_messages: "Επεξεργασία μηνυμάτων" - permission_edit_own_work_package_notes: "Επεξεργασία δικών μου σημειώσεων" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Επεξεργασία δικών μου μηνυμάτων" permission_edit_own_time_entries: "Επεξεργασία των δικών μου καταγραφών χρόνου" permission_edit_project: "Επεξεργασία του έργου" @@ -3193,9 +3230,9 @@ el: are_you_sure: "Είστε σίγουροι ότι θέλετε να αρχειοθετήσετε το έργο %{name};" archived: "Αρχειοθετημένο" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Δραστηριότητα" project_module_forums: "Φόρουμ" project_module_work_package_tracking: "Πακέτα εργασίας" @@ -3329,6 +3366,7 @@ el: activated: "ενεργοποιημένο" deactivated: "απενεργοποιημένο" search_input_placeholder: "Αναζήτηση ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Ενεργοποίηση CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) επιτρεπόμενες προελεύσεις" setting_apiv3_cors_origins_text_html: > @@ -3554,6 +3592,27 @@ el: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Ρυθμίσεις για νέα έργα" @@ -3587,6 +3646,7 @@ el: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Διαγραφή πακέτου εργασίας και όλων των πακέτων-παιδιά;" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Ανάθεση στο έργο" text_form_configuration: > Μπορείτε να διαμορφώσετε σε ποια πεδία θα εμφανίζονται στις φόρμες πακέτων εργασίας. Μπορείτε ελεύθερα να ομαδοποιήσετε τα πεδία ώστε να αντικατοπτρίζουν τις ανάγκες του τομέα σας. @@ -3666,6 +3726,7 @@ el: text_notice_security_badge_displayed_html: > Σημείωση: Εάν ενεργοποιηθεί, θα εμφανιστεί ένα σήμα με την κατάσταση της εγκατάστασής σας στον %{information_panel_label} πίνακα διαχείρισης, καθώς και στην αρχική σελίδα. Εμφανίζεται μόνο στους διαχειριστές.
    Το σήμα θα ελέγξει την τρέχουσα έκδοση του OpenProject σε σύγκριση με την επίσημη βάση δεδομένων εκδόσεων OpenProject για να σας ειδοποιήσει ενημερώσεις ή γνωστές ευπάθειες. Για περισσότερες πληροφορίες στο τι παρέχει αυτός ο έλεγχος, τι δεδομένα χρειάζονται για να παρέχονται οι διαθέσιμες ενημερώσεις και πως να απενεργοποιήσετε αυτό τον έλεγχο, παρακαλούμε επισκεφθείτε την τεκμηρίωση διαμόρφωσης. text_own_membership_delete_confirmation: "Πρόκειται να αφαιρέσετε μερικά ή όλα τα δικαιώματα και ενδέχεται να μην μπορείτε να επεξεργαστείτε πλέον το έργο μετά από αυτό.\nΕίστε βέβαιοι ότι θέλετε να συνεχίσετε;" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Εγγράψιμος κατάλογος plugin assets" text_powered_by: "Υποστηρίζεται από %{link}" text_project_identifier_info: "Επιτρέπονται μόνο πεζά γράμματα (α-ω), αριθμοί, παύλες και κάτω παύλες, πρέπει να αρχίζουν με πεζό γράμμα." @@ -4033,6 +4094,8 @@ el: builtin: Built-in instance application confidential: Confidential singular: "OAuth εφαρμογή" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth εφαρμογές" named: "OAuth εφαρμογή '%{name}'" new: "Νέα OAuth εφαρμογή" diff --git a/config/locales/crowdin/eo.yml b/config/locales/crowdin/eo.yml index 98d0e187d31e..43877442adec 100644 --- a/config/locales/crowdin/eo.yml +++ b/config/locales/crowdin/eo.yml @@ -229,6 +229,10 @@ eo: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ eo: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ eo: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ eo: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ eo: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ eo: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ eo: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ eo: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invito account: delete: "Forigi konton" @@ -790,6 +804,7 @@ eo: is_required: "Deviga" max_length: "Maksimuma longeco" min_length: "Minimuma longeco" + content_right_to_left: "Right-to-Left content" multi_value: "Permesi plurelekton" possible_values: "Eblaj valoroj" regexp: "Regula esprimo" @@ -825,6 +840,8 @@ eo: attr_lastname: "Atribuo Familinomo" attr_login: "Atribuo uzantnomo" attr_mail: "Atribuo retpoŝto" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Bazo DN" host: "Gastiganto" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ eo: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolumnoj" relations_to_type_column: "Rilatoj kun %{type}" @@ -877,7 +897,7 @@ eo: timeline_labels: "Kronologiaj etikedoj" relation: lag: "Lag" - from: "Laborpakaĵo" + from: "Related work package" to: "Rilata laborpakaĵo" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ eo: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ eo: button_copy_and_follow: "Copy and follow" button_create: "Krei" button_create_and_continue: "Krei kaj daŭrigi" - button_delete: "Forigi" button_decline: "Malakcepti" + button_delete: "Forigi" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Forigi la observanton %{name}" button_download: "Elŝuti" button_duplicate: "Duobligi" @@ -1765,6 +1790,9 @@ eo: hour: one: "horo" other: "horoj" + day: + one: "day" + other: "days" description_active: "Aktiva?" description_attachment_toggle: "Vidigi/Kaŝi aldonaĵojn" description_autocomplete: > @@ -1800,6 +1828,10 @@ eo: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ eo: label_add_subtask: "Aldoni subtaskon" label_added: "aldonita" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Aldonita de %{author} antaŭ %{age}" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ eo: label_project_new: "Nova projekto" label_project_plural: "Projektoj" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Projektaj agordoj" @@ -2608,6 +2642,7 @@ eo: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ eo: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ eo: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ eo: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ eo: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktiveco" project_module_forums: "Forumoj" project_module_work_package_tracking: "Laborpakaĵoj" @@ -3334,6 +3371,7 @@ eo: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Serĉi ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ eo: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ eo: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ eo: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ eo: builtin: Built-in instance application confidential: Confidential singular: "OAuth aplikaĵo" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/es.yml b/config/locales/crowdin/es.yml index 2300d1e9ac53..3ec377b44e9e 100644 --- a/config/locales/crowdin/es.yml +++ b/config/locales/crowdin/es.yml @@ -226,6 +226,10 @@ es: item: title: Este elemento no tiene ningún nivel de jerarquía inferior description: Añada elementos a esta lista para crear subelementos dentro de otra + delete_dialog: + title: "Eliminar elemento de campo personalizado" + heading: "¿Eliminar elemento de campo personalizado?" + description: "Esta acción eliminará de forma irreversible el elemento y todos sus subelementos. Cualquier valor asignado se eliminará de forma permanente. Si este campo es obligatorio, la eliminación de elementos puede hacer que los paquetes de trabajo existentes dejen de ser válidos." placeholder: label: "Etiqueta del elemento" short: "Nombre corto" @@ -246,6 +250,7 @@ es: confirm_destroy_option: "Al eliminar una opción, se eliminarán todas las repeticiones (por ejemplo, en paquetes de trabajo). ¿Está seguro de que desea eliminarla?" reorder_alphabetical: "Ordenar los valores alfabéticamente" reorder_confirmation: "Advertencia: Se perderá el orden actual de los valores disponibles. ¿Quiere continuar?" + placeholder_version_select: "Primero debe seleccionar el paquete de trabajo o el proyecto" instructions: is_required: "Marcar el campo personalizado como necesario. Esto hará obligatorio rellenar el campo cuando se creen nuevos o se actualicen los recursos existentes." is_required_for_project: "Marque esta casilla para activar este atributo y hacerlo obligatorio en todos los proyectos. No puede desactivarse para proyectos individuales." @@ -284,6 +289,7 @@ es: label: "Etiqueta" short: "Nombre corto" parent: "Principal" + blueprint: "Plano de patrón" global_search: placeholder: "Buscar en %{app_title}" overwritten_tabs: @@ -466,6 +472,7 @@ es: my: access_token: create_dialog: + title: Token generado header: Se ha generado el token %{type} warning: Tenga en cuenta que esta es la única vez que le mostraremos este token, asegúrese de copiarlo ahora. errors: @@ -643,6 +650,7 @@ es: title: "Falta el flujo de trabajo para compartir paquetes de trabajo" message: "Ningún flujo de trabajo está configurado para el rol 'Editor de paquetes de trabajo'. Sin un flujo de trabajo, el usuario compartido no puede alterar el estado del paquete de trabajo. Los flujos de trabajo pueden ser copiados. Seleccione un tipo de base (por ejemplo, 'Tarea') y el rol de base (por ejemplo, 'Miembro'). Luego seleccione los tipos de destino. Para empezar, puede seleccionar todos los tipos como objetivos. Por último, seleccione el papel de \"Editor de paquetes de trabajo\" como objetivo y presione \"Copiar\". Después de haber creado así los valores predeterminados, ajuste los flujos de trabajo como lo hace para cualquier otro rol." link_message: "Configure un flujo de trabajo en la administración." + templated_subject_hint: Generado automáticamente a través del tipo %{type} summary: reports: category: @@ -665,14 +673,15 @@ es: no_results_title_text: No hay relaciones disponibles por el momento. blankslate_heading: "Sin relaciones" blankslate_description: "Este paquete de trabajo aún no tiene relaciones." + label_add_child_button: "Niño" label_add_x: "Añadir %{x}" label_edit_x: "Editar %{x}" label_add_description: "Añadir descripción" lag: subject: "Retraso" - title: "Retraso (en días)" caption: "El número mínimo de días laborables que debe haber entre los dos paquetes de trabajo." relations: + label_new_child_created: "Nuevo paquete de trabajo creado y añadido como elemento secundario" label_relates_singular: "relacionado con" label_relates_plural: "relacionado con" label_relates_to_singular: "relacionado con" @@ -687,6 +696,9 @@ es: follows_description: "El paquete de trabajo relacionado tiene que terminar necesariamente antes de que este pueda empezar" label_child_singular: "secundario" label_child_plural: "secundarios" + new_child: "Niño nuevo" + new_child_text: "Crea un paquete de trabajo relacionado como un subelemento del paquete de trabajo actual (principal)" + existing_child: "Niño existente" child_description: "Hace que el paquete de trabajo relacionado sea un subelemento del paquete de trabajo actual (principal)" label_blocks_singular: "bloques" label_blocks_plural: "bloques" @@ -723,6 +735,8 @@ es: required_description: "Marca este paquete de trabajo como requisito del relacionado" label_parent_singular: "principal" label_parent_plural: "principal" + ghost_relation_title: "Paquete de trabajo relacionado" + ghost_relation_description: "No tiene los permisos necesarios para ver esto." label_invitation: Invitación account: delete: "Borrar cuenta" @@ -787,6 +801,7 @@ es: is_required: "Obligatorio" max_length: "Longitud máxima" min_length: "Longitud mínima" + content_right_to_left: "Contenido de derecha a izquierda" multi_value: "Permitir selección múltiple" possible_values: "Valores posibles" regexp: "Expresión regular" @@ -822,6 +837,8 @@ es: attr_lastname: "Atributo Apellido" attr_login: "Atributo Nombre de usuario" attr_mail: "Atributo Correo electrónico" + filter_string: "Texto del filtro" + admin: "Administrador" base_dn: "Base DN" host: "Host" onthefly: "Creación automática de usuarios" @@ -865,6 +882,9 @@ es: project_custom_field: is_required: "Obligatorio para todos los proyectos" custom_field_section: Sección + project/life_cycle_step_definition: + name: "Nombre" + color: "Color" query: column_names: "Columnas" relations_to_type_column: "Relaciones con %{type}" @@ -874,7 +894,7 @@ es: timeline_labels: "Etiquetas de cronograma" relation: lag: "Retraso" - from: "Paquete de trabajo" + from: "Paquete de trabajo relacionado" to: "Paquete de trabajo relacionado" reminder: remind_at_date: "Fecha" @@ -1198,12 +1218,16 @@ es: typed_dag: circular_dependency: "La relación crea un bucle de relaciones." attributes: - to: - error_not_found: "el paquete de trabajo en posición 'a' no se ha encontrado o no es visible" - error_readonly: "la relación existente no se puede modificar 'a' enlace es inmutable" - from: - error_not_found: "el paquete de trabajo en la posición 'de' no se ha encontrado o no es visible" - error_readonly: "la relación existente no se puede modificar 'de' enlace es inmutable" + to_id: + error_not_found: "no se encuentra o no es visible." + error_readonly: "no se puede cambiar para las relaciones existentes." + from_id: + error_not_found: "no se encuentra o no es visible." + error_readonly: "no se puede cambiar para las relaciones existentes." + lag: + greater_than_or_equal_to: + zero: "no puede ser negativo." + less_than_or_equal_to: "es demasiado alto." repository: not_available: "El proveedor SMC no está disponible" not_whitelisted: "no está permitido por la configuración." @@ -1558,8 +1582,9 @@ es: button_copy_and_follow: "Copiar y seguir" button_create: "Crear" button_create_and_continue: "Crear y continuar" - button_delete: "Borrar" button_decline: "Declinar" + button_delete: "Borrar" + button_delete_permanently: "Eliminar permanentemente" button_delete_watcher: "Eliminar observador %{name}" button_download: "Descargar" button_duplicate: "Duplicar" @@ -1762,6 +1787,9 @@ es: hour: one: "una hora" other: "hora" + day: + one: "día" + other: "días" description_active: "Activo?" description_attachment_toggle: "Mostrar/ocultar archivos adjuntos" description_autocomplete: > @@ -1797,6 +1825,10 @@ es: upsale: title: "Extensión Enterprise" link_title: "Más información" + automatic_subject_generation: + description: "Cree asuntos generados automáticamente utilizando atributos y texto referenciados." + customize_life_cycle: + description: "Cree y organice etapas y puertas de proyecto diferentes de las que ofrece la planificación del ciclo del proyecto PM2." form_configuration: description: "Personalice la configuración del formulario con estas extensiones:" add_groups: "Añadir nuevos grupos de atributos" @@ -2159,6 +2191,7 @@ es: label_add_subtask: "Agregar subtarea" label_added: "agregado" label_added_by: "Añadido por %{author}" + label_added_by_on: "Añadido por %{author} el %{date}" label_added_time_by: "Añadida por %{author} hace %{age}" label_additional_workflow_transitions_for_assignee: "Transiciones adicionales permitidas cuando el usuario es el asignado" label_additional_workflow_transitions_for_author: "Transiciones adicionales permitidas cuando el usuario es el autor" @@ -2579,6 +2612,7 @@ es: label_project_new: "Nuevo proyecto" label_project_plural: "Proyectos" label_project_list_plural: "Listas de proyectos" + label_project_lifecycle: "Ciclo de vida del proyecto" label_project_attributes_plural: "Atributos del proyecto" label_project_custom_field_plural: "Atributos del proyecto" label_project_settings: "Configuración del proyecto" @@ -2605,6 +2639,7 @@ es: label_relation: "Relación" label_relation_actions: "Acciones de relación" label_relation_delete: "Eliminar relación" + label_relation_edit: "Editar relación" label_relation_new: "Nueva relación" label_release_notes: "Notas de lanzamiento" label_remaining_work: "Trabajo restante" @@ -3021,6 +3056,7 @@ es: notice_bad_request: "Petición incorrecta." notice_not_authorized: "No está autorizado a acceder a esta página." notice_not_authorized_archived_project: "El proyecto que usted esta tratando de acceder ha sido archivado." + notice_requires_enterprise_token: "Falta el token de la empresa o no permite el acceso a esta página." notice_password_confirmation_failed: "La contraseña es incorrecta. No se puede continuar." notice_principals_found_multiple: "Hemos encontrado %{number} resultados. \n Pulse TAB para ver el primer resultado." notice_principals_found_single: "Se ha encontrado solo un resultado. \n Pulse TAB para verlo." @@ -3068,7 +3104,7 @@ es: text_getting_started_description: "Obtenga un resumen rápido sobre la gestión de proyectos y la colaboración en equipo con OpenProject. Puedes volver a ver este video des del menú de ayuda." welcome: "Bienvenido a %{app_title}" select_language: "Seleccione su idioma" - permission_add_work_package_notes: "Añadir notas" + permission_add_work_package_notes: "Añadir comentarios" permission_add_work_packages: "Añadir paquetes de trabajo" permission_add_messages: "Publicar mensajes" permission_add_project: "Crear proyectos" @@ -3098,10 +3134,11 @@ es: permission_delete_timelines: "Eliminar cronogramas" permission_delete_wiki_pages: "Eliminar wiki página" permission_delete_wiki_pages_attachments: "Eliminar adjuntos" - permission_edit_work_package_notes: "Editar notas" + permission_edit_work_package_notes: "Moderar comentarios" + permission_edit_work_package_notes_explanation: "Precaución: Los usuarios con este permiso pueden editar los comentarios de cualquier persona." permission_edit_work_packages: "Editar paquetes de trabajo" permission_edit_messages: "Editar mensajes" - permission_edit_own_work_package_notes: "Editar notas propias" + permission_edit_own_work_package_notes: "Editar comentarios propios" permission_edit_own_messages: "Editar mensajes propios" permission_edit_own_time_entries: "Editar registros de tiempo propios" permission_edit_project: "Editar proyecto" @@ -3196,7 +3233,7 @@ es: count: zero: "0 proyectos" one: "1 proyecto" - other: "%{count} proyectos" + other: "%{count} projectos" project_module_activity: "Actividad" project_module_forums: "Foros" project_module_work_package_tracking: "Paquetes de trabajo" @@ -3330,6 +3367,7 @@ es: activated: "Habilitado" deactivated: "deshabilitado" search_input_placeholder: "Buscar..." + setting_apiv3_cors_title: "Intercambio de recursos entre orígenes (CORS)" setting_apiv3_cors_enabled: "Habilitar CORS" setting_apiv3_cors_origins: "Orígenes permitidos de la API de CORS (uso compartido de recursos entre orígenes) V3" setting_apiv3_cors_origins_text_html: > @@ -3555,6 +3593,27 @@ es: new: heading: "Nuevo atributo" description: "Los cambios en este atributo del proyecto se reflejarán en todos los proyectos en los que esté habilitado. Los atributos obligatorios no pueden desactivarse por proyecto." + project_life_cycle_step_definitions: + heading: "Ciclo de vida del proyecto" + heading_description: "El ciclo de vida de un proyecto consta de etapas y puertas que estructuran sus proyectos. Aparecerán en la página de resumen de un proyecto y estarán disponibles en la lista de proyectos. Se pueden seleccionar etapas y puertas individuales para personalizar un proyecto, pero no es posible reordenarlas a nivel de proyecto." + label_add: "Añadir" + label_add_description: "Añadir definición de ciclo de vida" + label_add_stage: "Etapa" + label_add_gate: "Puerta" + filter: + label: "Buscar etapa o puerta del proyecto" + section_header: "Etapas y puertas" + non_defined: "Actualmente no están definidas ni las etapas ni las puertas." + new: + description: "Los cambios en este paso del proyecto se reflejarán en todos los proyectos en los que esté habilitado." + new_stage: + heading: "Nueva etapa" + new_gate: + heading: "Nueva puerta" + edit_stage: + heading: "Editar etapa" + edit_gate: + heading: "Editar puerta" projects: missing_dependencies: "Se ha comprobado el módulo de proyecto %{module} que depende de %{dependencies}. Necesitas comprobar estas dependencias también." section_new_projects: "Configuración para nuevos proyectos" @@ -3588,6 +3647,7 @@ es: text_are_you_sure_continue: "¿Seguro que quiere continuar?" text_are_you_sure_with_children: "¿Eliminar el paquete de trabajo y todos sus paquetes dependientes?" text_are_you_sure_with_project_custom_fields: "Al eliminar este atributo también se eliminarán sus valores en todos los proyectos. ¿Seguro que desea hacerlo?" + text_are_you_sure_with_project_life_cycle_step: "Al eliminar este paso también se eliminarán sus usos en todos los proyectos. ¿seguro que desea hacerlo?" text_assign_to_project: "Asignar al proyecto" text_form_configuration: > Puede personalizar los campos que se mostrarán en forma de paquete de trabajo. Puede agrupar libremente los campos para adaptarlos a las necesidades de su dominio. @@ -3667,6 +3727,7 @@ es: text_notice_security_badge_displayed_html: > Nota: al activarse, se mostrará una insignia con el estado de instalación en el %{information_panel_label} panel de administración, y en la página principal. Solamente será visible para administradores.
    La insignia comprobará tu versión actual de OpenProject comparada con la base de datos oficial de OpenProject para alertarte de cualquier actualización o vulnerabilidad. Para más información sobre las funciones de la comprobación, los datos necesarios para conseguir actualizaciones disponibles, o para desactivar esta comprobación, por favor visita la documentación de configuración. text_own_membership_delete_confirmation: "Estás a punto de eliminar algunos o todos tus permisos, y podrías no poder volver a editar este proyecto.\n¿Estás seguro/a de que quieres continuar?" + text_permanent_delete_confirmation_checkbox_label: "Entiendo que esta eliminación no se puede revertir" text_plugin_assets_writable: "Directorio de extensiones activos escribible" text_powered_by: "Con tecnología de %{link}" text_project_identifier_info: "Se permiten sólo letras minúsculas (a-z), números, guiones y guiones bajos, debe comenzar con una letra minúscula." @@ -4034,6 +4095,8 @@ es: builtin: Aplicación de instancia incorporada confidential: Confidencial singular: "Aplicación OAuth" + scopes: "Ámbitos" + client_credentials: "Credenciales de cliente" plural: "Aplicaciones OAuth" named: "Aplicación OAuth '%{name}'" new: "Nueva aplicación OAuth" diff --git a/config/locales/crowdin/et.yml b/config/locales/crowdin/et.yml index 1853f46a29da..07e225e770af 100644 --- a/config/locales/crowdin/et.yml +++ b/config/locales/crowdin/et.yml @@ -229,6 +229,10 @@ et: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ et: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ et: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ et: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ et: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ et: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ et: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ et: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Kutse account: delete: "Kustuta konto" @@ -790,6 +804,7 @@ et: is_required: "Nõutav" max_length: "Maksimaalne pikkus" min_length: "Lühima lubatud parooli pikkus" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Võimalikud väärtused" regexp: "Regulaaravaldis" @@ -825,6 +840,8 @@ et: attr_lastname: "Perekonnanimi" attr_login: "Username attribute" attr_mail: "E-posti aadress" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Põhiline domeeninimi" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ et: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Väljad" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ et: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Teema" + from: "Related work package" to: "Seotud teema" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ et: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ et: button_copy_and_follow: "Kopeeri ja järgne" button_create: "Loo uus" button_create_and_continue: "Loo uus ja jätka" - button_delete: "Kustuta" button_decline: "Keeldu" + button_delete: "Kustuta" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Kustuta jälgija %{name}" button_download: "Laadi alla" button_duplicate: "Duplitseeri" @@ -1765,6 +1790,9 @@ et: hour: one: "tund" other: "tundi" + day: + one: "day" + other: "days" description_active: "Aktiivne?" description_attachment_toggle: "Kuva/peida manused" description_autocomplete: > @@ -1800,6 +1828,10 @@ et: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ et: label_add_subtask: "Lisa alamtoiming" label_added: "lisatud" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Lisatud %{author} poolt %{age} tagasi" label_additional_workflow_transitions_for_assignee: "Täiendavad üleminekud on lubatud juhul kui kasutaja on tööpaketi teostaja" label_additional_workflow_transitions_for_author: "Täiendavad üleminekud on lubatud juhul kui kasutaja on tööpaketi autor" @@ -2582,6 +2615,7 @@ et: label_project_new: "Uus projekt" label_project_plural: "Projektid" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Projekti sätted" @@ -2608,6 +2642,7 @@ et: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Kustuta seos" + label_relation_edit: "Edit relation" label_relation_new: "Uus seos" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ et: notice_bad_request: "Vigane päring." notice_not_authorized: "Sul ei ole sellele lehele ligipääsuks õigusi." notice_not_authorized_archived_project: "See projekt on arhiveeritud." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ et: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Märkusi lisada" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Teemasid lisada" permission_add_messages: "Postitusi lisada" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ et: permission_delete_timelines: "Kustutada ajakavasid" permission_delete_wiki_pages: "Kustutada vikilehti" permission_delete_wiki_pages_attachments: "Kustutada manuseid" - permission_edit_work_package_notes: "Märkusi toimetada" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Teemasid muuta" permission_edit_messages: "Muuta sõnumeid" - permission_edit_own_work_package_notes: "Oma märkusi toimetada" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Muuta enda sõnumeid" permission_edit_own_time_entries: "Muuta enda ajalogisid" permission_edit_project: "Muuta projekti" @@ -3198,9 +3235,9 @@ et: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Tegevus" project_module_forums: "Foorumid" project_module_work_package_tracking: "Teemad" @@ -3334,6 +3371,7 @@ et: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ et: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ et: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Oled Sa kindel oma soovis see teema koos selle alamteemadega täielikult kustutada?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Määra projektile" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ et: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "Sa võtad endalt ära osa või kõik õigused ega saa edaspidi seda projekti võib-olla enam muuta.\nOled sa jätkamises kindel?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Lisamoodulite abifailide kataloog on kirjutatav" text_powered_by: "Jooksutab %{link}" text_project_identifier_info: "Lubatud on ainult väikesed tähed (a-z), numbrid ja kriipsud. Peab algama väikse tähega." @@ -4039,6 +4100,8 @@ et: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/eu.yml b/config/locales/crowdin/eu.yml index 254876a8286b..1afc07e0fd28 100644 --- a/config/locales/crowdin/eu.yml +++ b/config/locales/crowdin/eu.yml @@ -229,6 +229,10 @@ eu: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ eu: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ eu: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ eu: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ eu: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ eu: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ eu: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ eu: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ eu: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ eu: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ eu: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ eu: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ eu: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ eu: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ eu: hour: one: "hour" other: "orduak" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ eu: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ eu: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ eu: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ eu: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ eu: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ eu: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ eu: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ eu: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ eu: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ eu: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ eu: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ eu: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ eu: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/fa.yml b/config/locales/crowdin/fa.yml index fdce0d02ca5b..0c3ff2ea5320 100644 --- a/config/locales/crowdin/fa.yml +++ b/config/locales/crowdin/fa.yml @@ -229,6 +229,10 @@ fa: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ fa: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ fa: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ fa: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ fa: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ fa: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ fa: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ fa: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: دعوت نامه account: delete: "حذف حساب کاربری" @@ -790,6 +804,7 @@ fa: is_required: "الزامی" max_length: "حداکثر طول" min_length: "حداقل طول" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "مقادیر ممکن" regexp: "عبارت منظم" @@ -825,6 +840,8 @@ fa: attr_lastname: "مشخصه نام خانوادگی" attr_login: "Username attribute" attr_mail: "ویژگی ایمیل" + filter_string: "Filter string" + admin: "Administrator" base_dn: "پایه DN" host: "میزبان" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ fa: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "ستون‌ها" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ fa: timeline_labels: "برچسب های خط زمان" relation: lag: "Lag" - from: "بسته کاری" + from: "Related work package" to: "بسته کاری وابسته" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ fa: typed_dag: circular_dependency: "رابطه دایره روابط ایجاد می کند." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ fa: button_copy_and_follow: "کپی کنید و دنبال کردن" button_create: "ایجاد" button_create_and_continue: "ذخیره و ادامه" - button_delete: "حذف" button_decline: "Decline" + button_delete: "حذف" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "نسخه برداری" @@ -1765,6 +1790,9 @@ fa: hour: one: "hour" other: "ساعت" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ fa: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ fa: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ fa: label_project_new: "New project" label_project_plural: "پروژه‌ها" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ fa: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "کار باقی‌مانده" @@ -3024,6 +3059,7 @@ fa: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "رمز عبور شما درست نیست. لذا ادامه ممکن نیست." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ fa: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ fa: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ fa: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "بایگانی" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "فعالیت" project_module_forums: "Forums" project_module_work_package_tracking: "بسته های کاری" @@ -3334,6 +3371,7 @@ fa: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ fa: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ fa: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ fa: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ fa: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/fi.yml b/config/locales/crowdin/fi.yml index 4e53b14c596b..816a077f64c8 100644 --- a/config/locales/crowdin/fi.yml +++ b/config/locales/crowdin/fi.yml @@ -229,6 +229,10 @@ fi: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ fi: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ fi: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ fi: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ fi: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ fi: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ fi: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ fi: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Kutsu account: delete: "Poista tili" @@ -790,6 +804,7 @@ fi: is_required: "Pakollinen tieto" max_length: "Enimmäispituus" min_length: "Vähimmäispituus" + content_right_to_left: "Right-to-Left content" multi_value: "Salli usean kohteen valinta" possible_values: "Mahdolliset arvot" regexp: "Säännöllinen lauseke (reg exp)" @@ -825,6 +840,8 @@ fi: attr_lastname: "Sukunimi-tietue" attr_login: "Username attribute" attr_mail: "Sähköposti-tietue" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Isäntä" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ fi: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Sarakkeet" relations_to_type_column: "Riippuvuus %{type}" @@ -877,7 +897,7 @@ fi: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Tehtävä" + from: "Related work package" to: "Liittyy tehtävään" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ fi: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "ei ole sallittu kokoonpanossa." @@ -1561,8 +1585,9 @@ fi: button_copy_and_follow: "Kopioi ja seuraa" button_create: "Uusi" button_create_and_continue: "Luo ja jatka" - button_delete: "Poista" button_decline: "Hylkää" + button_delete: "Poista" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Poista seuraaja %{name}" button_download: "Lataa" button_duplicate: "Luo kopio" @@ -1765,6 +1790,9 @@ fi: hour: one: "tunti" other: "tuntia" + day: + one: "day" + other: "days" description_active: "Aktiivinen?" description_attachment_toggle: "Näytä tai Piilota liitteet" description_autocomplete: > @@ -1800,6 +1828,10 @@ fi: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ fi: label_add_subtask: "Lisätä alitehtävä" label_added: "lisätty" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Lisännyt %{author} %{age} sitten" label_additional_workflow_transitions_for_assignee: "Vastuulliselle käyttäjälle on olemassa lisää siirtymiä" label_additional_workflow_transitions_for_author: "Aloittajalle on olemassa lisää siirtymiä" @@ -2582,6 +2615,7 @@ fi: label_project_new: "Uusi projekti" label_project_plural: "Projektit" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Projektiasetukset" @@ -2608,6 +2642,7 @@ fi: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Poista riippuvuus" + label_relation_edit: "Edit relation" label_relation_new: "Uusi riippuvuus" label_release_notes: "Julkaisutiedot" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ fi: notice_bad_request: "Bad Request." notice_not_authorized: "Sinulla ole oikeuksia käyttää tätä sivua." notice_not_authorized_archived_project: "Haluamasi projekti on arkistoitu." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Salasana ei ole oikea. Ei voi jatkua." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ fi: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Valitse kieli" - permission_add_work_package_notes: "Lisää kommentteja" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Lisää tehtävä" permission_add_messages: "Jätä viesti" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ fi: permission_delete_timelines: "Poista aikajanat" permission_delete_wiki_pages: "Poista wiki sivuja" permission_delete_wiki_pages_attachments: "Poista liitteitä" - permission_edit_work_package_notes: "Muokkaa kommentteja" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Muokkaa tehtäviä" permission_edit_messages: "Muokkaa viestejä" - permission_edit_own_work_package_notes: "Muokkaa omia kommentteja" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Muokkaa omia viestejä" permission_edit_own_time_entries: "Muokka omia aikamerkintöjä" permission_edit_project: "Muokkaa projektia" @@ -3198,9 +3235,9 @@ fi: are_you_sure: "Oletko varma, että haluat arkistoida projektin \"%{name}\"?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Tapahtumat" project_module_forums: "Keskustelupalstat" project_module_work_package_tracking: "Tehtävät" @@ -3334,6 +3371,7 @@ fi: activated: "aktivoitu" deactivated: "deaktivoitu" search_input_placeholder: "Etsi..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ fi: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ fi: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ fi: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "Olet aikeissa poistaa yhden tai useamman käyttöoikeuden ja et ehkä voi enää muokata tätä projektia sen jälkeen. Haluatko varmasti jatkaa?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin varat hakemisto kirjoitettavissa" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Vain pienet kirjaimet (a-z), numerot, väliviivat ja alaviivat ovat sallittuja. Ensimmäisenä tulee olla pieni kirjain." @@ -4039,6 +4100,8 @@ fi: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/fil.yml b/config/locales/crowdin/fil.yml index 478cf6a63b20..a9afbdaa8b0c 100644 --- a/config/locales/crowdin/fil.yml +++ b/config/locales/crowdin/fil.yml @@ -229,6 +229,10 @@ fil: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ fil: confirm_destroy_option: "Kapag nagbubura ng opsyon ay makakabura sa lahat ng mga pangyayari nito (e.g. sa mga package na trabaho). Sigurado ka bang gusto mong burahin ito?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ fil: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ fil: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ fil: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ fil: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ fil: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ fil: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Imbitasyon account: delete: "Alisin ang akawnt" @@ -790,6 +804,7 @@ fil: is_required: "Kinakailangan" max_length: "Ang pinaka mahaba" min_length: "Ang pinaka mababang sukat ng haba" + content_right_to_left: "Right-to-Left content" multi_value: "Pinahintulutan ang multi-select" possible_values: "Ang mga posibleng halaga" regexp: "Ang madalas na pagpapahayag" @@ -825,6 +840,8 @@ fil: attr_lastname: "Ang huling katangian ng apelyido" attr_login: "Username attribute" attr_mail: "Ang katangian ng Email" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Ang Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ fil: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Mga hanay" relations_to_type_column: "Mga relasyon sa %{type}" @@ -877,7 +897,7 @@ fil: timeline_labels: "Ang mga label ng timeline" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Ang kaugnayan sa pakete na ginagawa" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ fil: typed_dag: circular_dependency: "Ang relasyon ay lumilikha ng mga bilog na relasyon." attributes: - to: - error_not_found: "work package sa 'to' hindi natagpuan ang posisyon o hindi nakikita" - error_readonly: "isang umiiral narelasyon 'to' ang link ay hindi mababago" - from: - error_not_found: "work package sa 'mula sa' ang posisyon ay hindi nakita o hindi nakikita" - error_readonly: "isang umiiral na realsyon 'mula sa' ang link ay hindi mababago" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Ang SCM vendor ay hindi available" not_whitelisted: "ay hindi pinayagan ng kumpigurasyon." @@ -1561,8 +1585,9 @@ fil: button_copy_and_follow: "Kopyahin at sundin" button_create: "Lumikha" button_create_and_continue: "Lumikha at magpatuloy" - button_delete: "Burahin" button_decline: "Decline" + button_delete: "Burahin" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Burahin ang manunuod %{name}" button_download: "I-download" button_duplicate: "Kapareha" @@ -1765,6 +1790,9 @@ fil: hour: one: "oras" other: "mga oras" + day: + one: "day" + other: "days" description_active: "Aktibo?" description_attachment_toggle: "Ipakita/Itagi ang mga paglalakip" description_autocomplete: > @@ -1800,6 +1828,10 @@ fil: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Magdgdag ng mga bagong attribute na grupo" @@ -2162,6 +2194,7 @@ fil: label_add_subtask: "Magdagdag ng subtask" label_added: "nadagdag" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Idinagdag ni %{author}%{age} ng nakaraan" label_additional_workflow_transitions_for_assignee: "Karagdagang transistion pinahintulutan kung ang gumagamit ay nakatalaga" label_additional_workflow_transitions_for_author: "Karagdagang transistion pinahintulutan kung ang gumagamit ay ang akda" @@ -2582,6 +2615,7 @@ fil: label_project_new: "Bagong proyekto" label_project_plural: "Mga proyekto" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Ang mga setting ng proyekto" @@ -2608,6 +2642,7 @@ fil: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Burahin ang relasyon" + label_relation_edit: "Edit relation" label_relation_new: "Bagong relasyon" label_release_notes: "Paglabas ng mga talaan" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ fil: notice_bad_request: "Masamang kahilingan." notice_not_authorized: "Hindi ka inanyayahan na i-access ang pahina na ito." notice_not_authorized_archived_project: "Ang iyong proyekto na sinusubukan mong i-access ay na archive na." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Ang iyong password ay hindi tama. Hindi maaring magpatuloy." notice_principals_found_multiple: "Mayroong %{number} mga resulta ang natagpuan.\n Ang tab ay tumuon sa unang resulta." notice_principals_found_single: "Mayroong isang resulta. \n Tab upang ituon ito." @@ -3072,7 +3108,7 @@ fil: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Magdagdag ng mga talaan" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Magdagdag ng mga work package" permission_add_messages: "Mga post na mensahe" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ fil: permission_delete_timelines: "Burahin ang mga timeline" permission_delete_wiki_pages: "Burahin ang pahina g wiki" permission_delete_wiki_pages_attachments: "Burahin ang paglalakip" - permission_edit_work_package_notes: "I-edit ang mga talaan" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "I-edit ang mga work package" permission_edit_messages: "E-edit ang mga mensahe" - permission_edit_own_work_package_notes: "I-edit ang mga sariling talaan" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "I-edit ang mga sariling mensahe" permission_edit_own_time_entries: "I-edit ang mga log ng oras" permission_edit_project: "I-edit ang proyekto" @@ -3198,9 +3235,9 @@ fil: are_you_sure: "Sigurado ka bang na gusto mong i-archive ang proyekto'%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktibidad" project_module_forums: "Mga forum" project_module_work_package_tracking: "Ang mga work package" @@ -3332,6 +3369,7 @@ fil: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Hanapin ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3557,6 +3595,27 @@ fil: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3590,6 +3649,7 @@ fil: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Burahi ang work packaage at lahag ng batang work pckage?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Nakatalaga sa proyekto" text_form_configuration: > Pwede mong i-customize kung saan ang mga patlang ay maipapakita sa mga porma ng pakete ng mga gawain. Pwede kang malayang magpapagrupo sa mga patlang para ito ay sumasalamin sa mga kailangan mo para sa iyong domain. @@ -3669,6 +3729,7 @@ fil: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "Kinakailangan mong alisin ang ilan o lahat ng iyong perniso at hindi na maaring magagawa na i-edit ang itong proyekto pagkatapos na iyan.\nSigurado ka ba gusto mong magpatuloy?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin asstes directory writable" text_powered_by: "Pinalatakbo ng %{link}" text_project_identifier_info: "Maliit na titik lamang (a-z), mga numero, mga dash at underscore ang pinahintulutan, dapat magsimula sa maliit na titik." @@ -4037,6 +4098,8 @@ fil: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/fr.yml b/config/locales/crowdin/fr.yml index 37179f031a75..ba6a45574725 100644 --- a/config/locales/crowdin/fr.yml +++ b/config/locales/crowdin/fr.yml @@ -229,6 +229,10 @@ fr: item: title: Cet élément n'a pas de niveau hiérarchique inférieur description: Ajoutez des éléments à cette liste pour créer des sous-éléments dans une autre liste + delete_dialog: + title: "Supprimer l'élément de champ personnalisé" + heading: "Supprimer l'élément de champ personnalisé ?" + description: "Cette action supprimera de manière irréversible l'élément et tous ses sous-éléments. Toutes les valeurs attribuées seront définitivement supprimées. Si ce champ est obligatoire, la suppression d'éléments peut entraîner l'invalidité des lots de travaux existants." placeholder: label: "Étiquette de l'élément" short: "Nom abrégé" @@ -249,6 +253,7 @@ fr: confirm_destroy_option: "Supprimer une option supprimera toutes ses occurrences (ex. dans les plans de travail). Êtes-vous sûr de vouloir le supprimer ?" reorder_alphabetical: "Réorganiser les valeurs par ordre alphabétique" reorder_confirmation: "Attention : l'ordre actuel des valeurs disponibles sera perdu. Continuer ?" + placeholder_version_select: "La sélection d'un lot de travaux ou d'un projet est requise en premier lieu" instructions: is_required: "Marquer le champ personnalisé comme requis. Cela rendra obligatoire de remplir le champ lors de la création ou de la mise à jour des ressources existantes." is_required_for_project: "Cocher pour activer cet attribut et le rendre nécessaire dans tous les projets. Il ne peut pas être désactivé pour certains projets." @@ -287,6 +292,7 @@ fr: label: "Étiquette" short: "Nom abrégé" parent: "Parent" + blueprint: "Modèle de plan" global_search: placeholder: "Rechercher dans %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ fr: my: access_token: create_dialog: + title: Jeton généré header: Le jeton %{type} a été généré warning: Notez que c'est la seule fois que vous verrez ce jeton, assurez-vous de le copier maintenant. errors: @@ -644,6 +651,7 @@ fr: title: "Flux de travail manquant pour le partage de lots de travaux" message: "Aucun flux de travail n'est configuré pour le rôle 'Éditeur de lots de travaux'. Sans flux de travail, le partage avec l'utilisateur ne permet pas de modifier l'état du lot de travaux. Les flux de travail peuvent être copiés. Sélectionnez un type de source (par exemple 'Tâche') et un rôle de source (par exemple 'Membre'). Sélectionnez ensuite les types cibles. Pour commencer, vous pouvez sélectionner tous les types comme cibles. Enfin, sélectionnez le rôle 'Éditeur de lot de travaux' comme cible et cliquez sur 'Copier'. Après avoir ainsi créé les valeurs par défaut, affinez les flux de travail comme vous le faites pour tous les autres rôles." link_message: "Configurez les flux de travail dans l'administration." + templated_subject_hint: Généré automatiquement par le type %{type} summary: reports: category: @@ -666,14 +674,15 @@ fr: no_results_title_text: Il n'y a actuellement aucune relation disponible. blankslate_heading: "Aucune relation" blankslate_description: "Ce lot de travaux n'a pas encore de relations." + label_add_child_button: "Enfant" label_add_x: "Ajouter %{x}" label_edit_x: "Modifier %{x}" label_add_description: "Ajouter une description" lag: subject: "Délai" - title: "Délai (en jours)" caption: "Le nombre minimum de jours ouvrables à respecter entre les deux lots de travaux." relations: + label_new_child_created: "Nouveau lot de travaux créé et ajouté en tant qu'enfant" label_relates_singular: "lié à" label_relates_plural: "liés à" label_relates_to_singular: "lié à" @@ -688,6 +697,9 @@ fr: follows_description: "Le lot de travaux lié doit nécessairement se terminer avant que celui-ci puisse commencer" label_child_singular: "enfant" label_child_plural: "enfants" + new_child: "Nouvel enfant" + new_child_text: "Crée un lot de travaux lié en tant que sous-élément du lot de travaux actuel (parent)" + existing_child: "Enfant existant" child_description: "Fait du lot de travaux lié un sous-élément du lot de travaux actuel (parent)" label_blocks_singular: "blocs" label_blocks_plural: "blocs" @@ -724,6 +736,8 @@ fr: required_description: "Marque ce lot de travaux comme étant une exigence pour le lot de travaux correspondant" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Lot de travaux associé" + ghost_relation_description: "Cela n'est pas visible pour vous en raison des autorisations." label_invitation: Invitation account: delete: "Supprimer le compte" @@ -788,6 +802,7 @@ fr: is_required: "Obligatoire" max_length: "Longueur maximale" min_length: "Longueur minimale" + content_right_to_left: "Contenu de droite à gauche" multi_value: "Autoriser la sélection multiple" possible_values: "Valeurs possibles" regexp: "Expression régulière" @@ -823,6 +838,8 @@ fr: attr_lastname: "Attribut Nom" attr_login: "Attribut Nom d'utilisateur" attr_mail: "Attribut Adresse électronique" + filter_string: "Chaîne du filtre" + admin: "Administrateur" base_dn: "DN de base" host: "Hôte" onthefly: "Création automatique des utilisateurs" @@ -866,6 +883,9 @@ fr: project_custom_field: is_required: "Requis pour tous les projets" custom_field_section: Section + project/life_cycle_step_definition: + name: "Nom" + color: "Couleur" query: column_names: "Colonnes" relations_to_type_column: "Relations avec %{type}" @@ -875,7 +895,7 @@ fr: timeline_labels: "Étiquettes de chronologie" relation: lag: "Délai" - from: "Lot de travaux" + from: "Lot de travaux associé" to: "Lot de travaux associé" reminder: remind_at_date: "Date" @@ -1199,12 +1219,16 @@ fr: typed_dag: circular_dependency: "La relation créée un cercle de relations." attributes: - to: - error_not_found: "lot de travaux dans la position 'à' introuvable ou invisible" - error_readonly: "impossible de modifier le lien d'une relation existante 'vers'" - from: - error_not_found: "lot de travaux dans la position 'depuis' introuvable ou invisible" - error_readonly: "impossible de modifier le lien d'une relation existante 'depuis'" + to_id: + error_not_found: "introuvable ou non visible." + error_readonly: "ne peut pas être modifié pour les relations existantes." + from_id: + error_not_found: "introuvable ou non visible." + error_readonly: "ne peut pas être modifié pour les relations existantes." + lag: + greater_than_or_equal_to: + zero: "ne peut pas être négatif." + less_than_or_equal_to: "est trop élevé." repository: not_available: "Le fournisseur de gestion de contrôle de sources n'est pas disponible" not_whitelisted: "n'est pas autorisé par la configuration." @@ -1559,8 +1583,9 @@ fr: button_copy_and_follow: "Copier et suivre" button_create: "Créer" button_create_and_continue: "Créer et continuer" - button_delete: "Supprimer" button_decline: "Refuser" + button_delete: "Supprimer" + button_delete_permanently: "Supprimer définitivement" button_delete_watcher: "Supprimer l'observateur %{name}" button_download: "Télécharger" button_duplicate: "Dupliquer" @@ -1763,6 +1788,9 @@ fr: hour: one: "heure" other: "heures" + day: + one: "jour" + other: "jours" description_active: "Actif ?" description_attachment_toggle: "Afficher/Masquer les pièces jointes" description_autocomplete: > @@ -1798,6 +1826,10 @@ fr: upsale: title: "Add-on Enterprise" link_title: "Plus d'informations" + automatic_subject_generation: + description: "Créez des sujets générés automatiquement à l'aide d'attributs et de textes référencés." + customize_life_cycle: + description: "Créez et organisez des étapes et des portes de projet différentes de celles fournies par la planification du cycle de projet PM2." form_configuration: description: "Personnaliser la configuration du formulaire avec ces add-ons supplémentaires :" add_groups: "Ajouter de nouveaux groupes d’attributs" @@ -2160,6 +2192,7 @@ fr: label_add_subtask: "Ajouter une sous-tâche" label_added: "ajouté" label_added_by: "Ajouté par %{author} " + label_added_by_on: "Ajouté par %{author} le %{date}" label_added_time_by: "Ajouté par %{author} il y a %{age}" label_additional_workflow_transitions_for_assignee: "Transitions supplémentaires autorisées lorsque l'utilisateur est l'assigné" label_additional_workflow_transitions_for_author: "Transitions supplémentaires autorisées lorsque l'utilisateur est l'auteur" @@ -2580,6 +2613,7 @@ fr: label_project_new: "Nouveau projet" label_project_plural: "Projets" label_project_list_plural: "Listes de projets" + label_project_lifecycle: "Cycle de vie du projet" label_project_attributes_plural: "Attributs du projet" label_project_custom_field_plural: "Attributs du projet" label_project_settings: "Paramètres du projet" @@ -2606,6 +2640,7 @@ fr: label_relation: "Relation" label_relation_actions: "Actions de relation" label_relation_delete: "Supprimer la relation" + label_relation_edit: "Éditer la relation" label_relation_new: "Nouvelle relation" label_release_notes: "Notes de version" label_remaining_work: "Travail restant" @@ -3022,6 +3057,7 @@ fr: notice_bad_request: "Mauvaise requête." notice_not_authorized: "Vous n'êtes pas autorisé à accéder à cette page." notice_not_authorized_archived_project: "Le projet auquel vous essayer d'accéder a été archivé." + notice_requires_enterprise_token: "Le jeton d'entreprise est manquant ou n'autorise pas l'accès à cette page." notice_password_confirmation_failed: "Votre mot de passe est incorrect. Impossible de continuer." notice_principals_found_multiple: "Il y a %{number} résultats trouvés. Tabulation pour sélectionner le premier résultat." notice_principals_found_single: "Il y a un seul résultat. Tabulation pour le sélectionner." @@ -3070,7 +3106,7 @@ fr: text_getting_started_description: "Obtenez un aperçu rapide de la gestion de projet et de la collaboration en équipe avec OpenProject. Vous pouvez redémarrer cette vidéo à partir du menu d'aide." welcome: "Bienvenue sur %{app_title}" select_language: "Veuillez sélectionner votre langue" - permission_add_work_package_notes: "Ajouter des notes" + permission_add_work_package_notes: "Ajouter des commentaires" permission_add_work_packages: "Ajouter des lots de travaux" permission_add_messages: "Poster des messages" permission_add_project: "Créer des projets" @@ -3100,10 +3136,11 @@ fr: permission_delete_timelines: "Supprimer lignes du temps" permission_delete_wiki_pages: "Supprimer des pages wiki" permission_delete_wiki_pages_attachments: "Supprimer des pièces jointes" - permission_edit_work_package_notes: "Éditer des notes" + permission_edit_work_package_notes: "Modérer les commentaires" + permission_edit_work_package_notes_explanation: "Attention : les utilisateurs disposant de cette autorisation peuvent modifier les commentaires de n'importe qui." permission_edit_work_packages: "Éditer des lots de travaux" permission_edit_messages: "Éditer des messages" - permission_edit_own_work_package_notes: "Éditer ses propres notes" + permission_edit_own_work_package_notes: "Modifier ses propres commentaires" permission_edit_own_messages: "Éditer ses propres messages" permission_edit_own_time_entries: "Éditer mes propres enregistrements de temps" permission_edit_project: "Éditer le projet" @@ -3332,6 +3369,7 @@ fr: activated: "activé" deactivated: "désactivé" search_input_placeholder: "Rechercher…" + setting_apiv3_cors_title: "Partage croisé des ressources (CORS)" setting_apiv3_cors_enabled: "Activer CORS" setting_apiv3_cors_origins: "Origines autorisées de l'API V3 Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_origins_text_html: > @@ -3557,6 +3595,27 @@ fr: new: heading: "Nouvel attribut" description: "Les modifications apportées à cet attribut de projet seront répercutées dans tous les projets où il est activé. Les attributs obligatoires ne peuvent pas être désactivés par projet." + project_life_cycle_step_definitions: + heading: "Cycle de vie du projet" + heading_description: "Le cycle de vie d'un projet se compose d'étapes et de portes qui structurent vos projets. Elles apparaissent dans la page de présentation du projet et sont disponibles dans la liste des projets. Vous pouvez sélectionner des étapes et des portes individuelles pour personnaliser un projet, mais il n'est pas possible de les réorganiser au niveau d'un projet." + label_add: "Ajouter" + label_add_description: "Ajouter une définition du cycle de vie" + label_add_stage: "Étape" + label_add_gate: "Porte" + filter: + label: "Recherche d'une étape ou d'une porte de projet" + section_header: "Étapes et portes" + non_defined: "Ni les étapes ni les portes ne sont actuellement définies." + new: + description: "Les modifications apportées à cette étape du projet seront répercutées dans tous les projets où elle est activée." + new_stage: + heading: "Nouvelle étape" + new_gate: + heading: "Nouvelle porte" + edit_stage: + heading: "Modifier l'étape" + edit_gate: + heading: "Modifier la porte" projects: missing_dependencies: "Le module de projet %{module} a été vérifié et dépend de %{dependencies}. Vous devez également vérifier ces dépendances." section_new_projects: "Paramètres pour les nouveaux projets" @@ -3590,6 +3649,7 @@ fr: text_are_you_sure_continue: "Voulez-vous vraiment continuer ?" text_are_you_sure_with_children: "Supprimer le lot de travaux et tous les lots de travaux enfants ?" text_are_you_sure_with_project_custom_fields: "Supprimer cet attribut supprimera également ses valeurs dans tous les projets. Voulez-vous vraiment continuer ?" + text_are_you_sure_with_project_life_cycle_step: "La suppression de cette étape entraînera également la suppression de son utilisation dans tous les projets. Voulez-vous vraiment continuer ?" text_assign_to_project: "Assigner le projet" text_form_configuration: > Vous pouvez personnaliser comment les champs seront affichés sur le plan de travail. Vous pouvez librement regrouper les champs pour refléter les besoins pour votre domaine. @@ -3669,6 +3729,7 @@ fr: text_notice_security_badge_displayed_html: > Remarque : si cette option est activée, un badge indiquant l'état de votre installation s'affichera dans le panneau %{information_panel_label} administration et sur la page d'accueil. Il n'est affiché que pour les administrateurs.
    Le badge vérifiera votre version actuelle d'OpenProject par rapport à la base de données officielle d'OpenProject pour vous avertir de toute mise à jour ou vulnérabilité connue. Pour plus d'informations sur ce que la vérification fournit, quelles données sont nécessaires pour fournir les mises à jour disponibles, et comment désactiver cette vérification, veuillez visiter la documentation de configuration. text_own_membership_delete_confirmation: "Vous êtes sur le point de retirer tout ou partie de vos permissions et ne pourrez peut-être plus modifier le projet par la suite.\nÊtes vous sûr de vouloir continuer?" + text_permanent_delete_confirmation_checkbox_label: "Je comprends que cette suppression ne peut pas être annulée" text_plugin_assets_writable: "Répertoire des « plugin assets » est accessible en écriture" text_powered_by: "Propulsé par %{link}" text_project_identifier_info: "Seulement les lettres en minuscule (a-z), les nombres, les tirets et les underscores sont autorisés, il est obligatoire de commencer avec une lettre en minuscule." @@ -4036,6 +4097,8 @@ fr: builtin: Application d'instance intégrée confidential: Confidentiel singular: "Application OAuth" + scopes: "Portées" + client_credentials: "Informations d'identification du client" plural: "Applications OAuth" named: "Application OAuth '%{name}'" new: "Nouvelle application Oauth" diff --git a/config/locales/crowdin/he.yml b/config/locales/crowdin/he.yml index 07224527abc1..e5cec2da3966 100644 --- a/config/locales/crowdin/he.yml +++ b/config/locales/crowdin/he.yml @@ -229,6 +229,10 @@ he: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ he: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ he: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -483,6 +489,7 @@ he: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -664,6 +671,7 @@ he: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -686,14 +694,15 @@ he: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -708,6 +717,9 @@ he: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -744,6 +756,8 @@ he: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "מחק חשבון" @@ -808,6 +822,7 @@ he: is_required: "נדרש" max_length: "אורך מירבי" min_length: "אורך מינימלי" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "הערכים האפשריים" regexp: "ביטוי רגולרי" @@ -843,6 +858,8 @@ he: attr_lastname: "תכונת שם משפחה" attr_login: "Username attribute" attr_mail: "תכונת דואר אלקטרוני" + filter_string: "Filter string" + admin: "Administrator" base_dn: "תכנון אלמנט" host: "שרת" onthefly: "Automatic user creation" @@ -886,6 +903,9 @@ he: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "עמודות" relations_to_type_column: "Relations to %{type}" @@ -895,7 +915,7 @@ he: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "חבילת עבודה" + from: "Related work package" to: "חבילת עבודה קשורה" reminder: remind_at_date: "Date" @@ -1219,12 +1239,16 @@ he: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1599,8 +1623,9 @@ he: button_copy_and_follow: "העתק ועקוב" button_create: "צור" button_create_and_continue: "צור והמשך" - button_delete: "מחק" button_decline: "Decline" + button_delete: "מחק" + button_delete_permanently: "Delete permanently" button_delete_watcher: "מחק את הצופה %{name}" button_download: "הורד" button_duplicate: "שכפל" @@ -1839,6 +1864,11 @@ he: two: "שעות" many: "שעות" other: "שעות" + day: + one: "day" + two: "days" + many: "days" + other: "days" description_active: "פעיל?" description_attachment_toggle: "הצג/הסתר קבצים מצורפים" description_autocomplete: > @@ -1874,6 +1904,10 @@ he: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2236,6 +2270,7 @@ he: label_add_subtask: "הוסף תת משימה" label_added: "התווסף" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "נוסף על ידי %{author} לפני %{age}" label_additional_workflow_transitions_for_assignee: "מעברים נוספים מותר כאשר המשתמש הוא מקבל ההקצאה" label_additional_workflow_transitions_for_author: "מעברים נוספים מותר כאשר המשתמש הוא המחבר" @@ -2656,6 +2691,7 @@ he: label_project_new: "פרוייקט חדש" label_project_plural: "פרויקטים" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "הגדרות הפרוייקט" @@ -2682,6 +2718,7 @@ he: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3100,6 +3137,7 @@ he: notice_bad_request: "בקשה שגויה." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3150,7 +3188,7 @@ he: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "הוסף הערות" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3180,10 +3218,11 @@ he: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "ערוך הערות" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "עריכת הודעות" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3276,9 +3315,9 @@ he: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "פעילות" project_module_forums: "פורומים" project_module_work_package_tracking: "חבילת עבודה" @@ -3412,6 +3451,7 @@ he: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3637,6 +3677,27 @@ he: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3670,6 +3731,7 @@ he: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3749,6 +3811,7 @@ he: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4119,6 +4182,8 @@ he: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/hi.yml b/config/locales/crowdin/hi.yml index 9715ef5d2185..d4cd6ec0d84b 100644 --- a/config/locales/crowdin/hi.yml +++ b/config/locales/crowdin/hi.yml @@ -229,6 +229,10 @@ hi: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ hi: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ hi: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ hi: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -644,6 +651,7 @@ hi: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -666,14 +674,15 @@ hi: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -688,6 +697,9 @@ hi: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -724,6 +736,8 @@ hi: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "खाता हटाएं" @@ -788,6 +802,7 @@ hi: is_required: "अनिवार्य" max_length: "अधिकतम लंबाई" min_length: "न्यूनतम लम्बाई" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "संभावित मिलान" regexp: "नियमित अभिव्यक्ति" @@ -823,6 +838,8 @@ hi: attr_lastname: "कुल-नाम गुण" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "बेस डी.एन." host: "होस्ट" onthefly: "Automatic user creation" @@ -866,6 +883,9 @@ hi: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "स्तंभ" relations_to_type_column: "Relations to %{type}" @@ -875,7 +895,7 @@ hi: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "कार्य पैकेज" + from: "Related work package" to: "संबंधित कार्य पैकेज" reminder: remind_at_date: "Date" @@ -1199,12 +1219,16 @@ hi: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1559,8 +1583,9 @@ hi: button_copy_and_follow: "Copy and follow" button_create: "रचना करें" button_create_and_continue: "सहेजें और जारी रखें" - button_delete: "मिटाएँ" button_decline: "Decline" + button_delete: "मिटाएँ" + button_delete_permanently: "Delete permanently" button_delete_watcher: "द्रष्टा हटाएं %{name}" button_download: "डाउनलोड" button_duplicate: "प्रतिलिपि" @@ -1763,6 +1788,9 @@ hi: hour: one: "घंटा" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1798,6 +1826,10 @@ hi: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2160,6 +2192,7 @@ hi: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2580,6 +2613,7 @@ hi: label_project_new: "नया प्रोजेक्ट" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "परियोजना सेटिंग्स" @@ -2606,6 +2640,7 @@ hi: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3022,6 +3057,7 @@ hi: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3070,7 +3106,7 @@ hi: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "कृपया अपनी भाषा चुनें:" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3100,10 +3136,11 @@ hi: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3196,9 +3233,9 @@ hi: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "गतिविधी" project_module_forums: "मंच" project_module_work_package_tracking: "कार्य पैकेज" @@ -3332,6 +3369,7 @@ hi: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3557,6 +3595,27 @@ hi: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3590,6 +3649,7 @@ hi: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3669,6 +3729,7 @@ hi: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4037,6 +4098,8 @@ hi: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/hr.yml b/config/locales/crowdin/hr.yml index 26be8fa1ced7..e13089b6713e 100644 --- a/config/locales/crowdin/hr.yml +++ b/config/locales/crowdin/hr.yml @@ -229,6 +229,10 @@ hr: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ hr: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ hr: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -476,6 +482,7 @@ hr: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -655,6 +662,7 @@ hr: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -677,14 +685,15 @@ hr: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -699,6 +708,9 @@ hr: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -735,6 +747,8 @@ hr: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Pozivnica account: delete: "Izbriši korisnički račun" @@ -799,6 +813,7 @@ hr: is_required: "Obavezno" max_length: "Maksimalna duljina" min_length: "Minimalna duljina" + content_right_to_left: "Right-to-Left content" multi_value: "Omogući odabir više stavki" possible_values: "Moguće vrijednosti" regexp: "Regularni izraz" @@ -834,6 +849,8 @@ hr: attr_lastname: "Atribut Prezime" attr_login: "Username attribute" attr_mail: "Email atribut" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Temeljni DN" host: "Host" onthefly: "Automatic user creation" @@ -877,6 +894,9 @@ hr: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Stupci" relations_to_type_column: "Relations to %{type}" @@ -886,7 +906,7 @@ hr: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Radni paket" + from: "Related work package" to: "Pripadajući radni paket" reminder: remind_at_date: "Date" @@ -1210,12 +1230,16 @@ hr: typed_dag: circular_dependency: "Odnos stvara krug odnosa." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM dobavljač nije dostupn" not_whitelisted: "nije dopušteno postavljenom konfiguracijom." @@ -1580,8 +1604,9 @@ hr: button_copy_and_follow: "Kopirajte i pratite" button_create: "Stvori" button_create_and_continue: "Stvori i nastavi" - button_delete: "Obriši" button_decline: "Odbij" + button_delete: "Obriši" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Obriši nadglednika %{name}" button_download: "Preuzmi" button_duplicate: "Dupliciraj" @@ -1802,6 +1827,10 @@ hr: one: "sat" few: "sata" other: "sata" + day: + one: "day" + few: "days" + other: "days" description_active: "Aktivno?" description_attachment_toggle: "Prikaži/Sakrij priloge" description_autocomplete: > @@ -1837,6 +1866,10 @@ hr: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2199,6 +2232,7 @@ hr: label_add_subtask: "Novi pod radni zadatak" label_added: "dodano" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Dodao korisnik %{author} %{age} prije" label_additional_workflow_transitions_for_assignee: "Dodatne workflow tranzicije su dopuštene samo kad je korisnik opunomoćen za određeni zadatak" label_additional_workflow_transitions_for_author: "Dodatne workflow tranzicije su dopuštene kada je korisnik autor" @@ -2619,6 +2653,7 @@ hr: label_project_new: "Novi projekt" label_project_plural: "Projekti" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Postavke projekta" @@ -2645,6 +2680,7 @@ hr: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Izbriši relaciju" + label_relation_edit: "Edit relation" label_relation_new: "Nova relacija" label_release_notes: "Napomene uz izdavanje" label_remaining_work: "Remaining work" @@ -3062,6 +3098,7 @@ hr: notice_bad_request: "Neispravan zahtjev." notice_not_authorized: "Niste autorizirani da pristupite ovoj stranici." notice_not_authorized_archived_project: "Projekt kojem pokušavate pristupiti je arhiviran." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3111,7 +3148,7 @@ hr: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Dodaj bilješke" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Dodaj radne pakete" permission_add_messages: "Pošalji poruke" permission_add_project: "Create projects" @@ -3141,10 +3178,11 @@ hr: permission_delete_timelines: "Izbriši kronologiju" permission_delete_wiki_pages: "Izbriši wiki stranice" permission_delete_wiki_pages_attachments: "Izbriši priloge" - permission_edit_work_package_notes: "Uredi bilješke" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Uredi radne pakete" permission_edit_messages: "Uredi poruke" - permission_edit_own_work_package_notes: "Uredi vlastite zabilješke" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Uredi vlastite poruke" permission_edit_own_time_entries: "Uređivanje vaših zapisa o vremenu" permission_edit_project: "Uredi projekt" @@ -3237,9 +3275,9 @@ hr: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktivnost" project_module_forums: "Forumi" project_module_work_package_tracking: "Radni paketi" @@ -3373,6 +3411,7 @@ hr: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Traži ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3598,6 +3637,27 @@ hr: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3631,6 +3691,7 @@ hr: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Izbriši radni paket i sve podređene radne pakete?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Pridruži projektu" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3710,6 +3771,7 @@ hr: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4079,6 +4141,8 @@ hr: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/hu.yml b/config/locales/crowdin/hu.yml index a6a37790b9be..90ec15e29e6f 100644 --- a/config/locales/crowdin/hu.yml +++ b/config/locales/crowdin/hu.yml @@ -228,6 +228,10 @@ hu: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -248,6 +252,7 @@ hu: confirm_destroy_option: "Egy opció törlése az összes eddigi használatánál (úgy, mint munkacsomagok) is törlődnek. Biztosan törölni szeretné?" reorder_alphabetical: "Név szerinti sorrendbe rendezés" reorder_confirmation: "Figyelmeztetés: A rendelkezésre álló értékek jelenlegi sorrendje elveszik. Folytatni akarod?\n" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -286,6 +291,7 @@ hu: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Keresés: %{app_title} oldalon" overwritten_tabs: @@ -468,6 +474,7 @@ hu: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -644,6 +651,7 @@ hu: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -666,14 +674,15 @@ hu: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -688,6 +697,9 @@ hu: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -724,6 +736,8 @@ hu: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Meghívó account: delete: "Felhasználói hozzáférés törölése" @@ -788,6 +802,7 @@ hu: is_required: "Kötelező" max_length: "Maximum hosszúság" min_length: "Minimum hosszúság" + content_right_to_left: "Right-to-Left content" multi_value: "Többszörös kijelölés engedélyezése" possible_values: "Lehetséges értékek" regexp: "Hagyományos kifejezések" @@ -823,6 +838,8 @@ hu: attr_lastname: "Vezetéknév attribútum" attr_login: "Felhasználónév attribútum" attr_mail: "Email attribútum" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatikus felhasználó készítés" @@ -866,6 +883,9 @@ hu: project_custom_field: is_required: "Required for all projects" custom_field_section: Szekció + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Oszlopok" relations_to_type_column: "Kapcsolatok %{type}-hoz" @@ -875,7 +895,7 @@ hu: timeline_labels: "Idővonal címkék" relation: lag: "Lag" - from: "Feladatcsoport" + from: "Related work package" to: "Kapcsolódó feladatcsoport" reminder: remind_at_date: "Date" @@ -1199,12 +1219,16 @@ hu: typed_dag: circular_dependency: "A kapcsolat körkörös függőséget hoz létre." attributes: - to: - error_not_found: "feladatcsoportban \"a\" pozíció nem található, vagy nem látható" - error_readonly: "egy létező kapcsolat ',' hivatkozása nem változhat" - from: - error_not_found: "feladatcsoportban \"a\" pozíció nem található, vagy nem látható" - error_readonly: "egy létező kapcsolat ',' hivatkozása nem változhat" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM szolgáltató nem elérhető" not_whitelisted: "a konfiguráció nem engedélyezi." @@ -1559,8 +1583,9 @@ hu: button_copy_and_follow: "Másol és folytat" button_create: "Létrehoz" button_create_and_continue: "Létrehoz és folytat" - button_delete: "Törlés" button_decline: "Elutasít" + button_delete: "Törlés" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Megfigyelő törlése %{name}" button_download: "Letöltés" button_duplicate: "Másolás ide" @@ -1763,6 +1788,9 @@ hu: hour: one: "óra" other: "óra" + day: + one: "day" + other: "days" description_active: "Aktív?" description_attachment_toggle: "Csatolmányt mutat/elrejt" description_autocomplete: > @@ -1798,6 +1826,10 @@ hu: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Testre szabhatja az űrlap konfigurációját ezekkel a további bővítményekkel:" add_groups: "Attribútum-csoport hozzáadása" @@ -2160,6 +2192,7 @@ hu: label_add_subtask: "Alfeladat hozzáadása" label_added: "Hozzáadva" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Hozzáadva %{author} %{age} ezelőtt." label_additional_workflow_transitions_for_assignee: "A következő státuszváltások engedélyezettek ha a felhasználó jogosult rá" label_additional_workflow_transitions_for_author: "A következő státuszváltások engedélyezettek a szerzők számára" @@ -2580,6 +2613,7 @@ hu: label_project_new: "Új projekt" label_project_plural: "Projektek" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Projekt attribútumok" label_project_custom_field_plural: "Projekt attribútumok" label_project_settings: "Projekt beállítások" @@ -2606,6 +2640,7 @@ hu: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Kapcsolat törlése" + label_relation_edit: "Edit relation" label_relation_new: "Új kapcsolat" label_release_notes: "Kiadási megjegyzések" label_remaining_work: "Fennmaradó órák" @@ -3021,6 +3056,7 @@ hu: notice_bad_request: "Rossz kérés." notice_not_authorized: "Ön nem jogosult a lap eléréséhez." notice_not_authorized_archived_project: "Az elérni kivánt projekt archiválva." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "A jelszó nem megfelelő. Nem lehet folytatni." notice_principals_found_multiple: "%{number} találat. \n Tab-al tudsz az első találatra fókuszálni." notice_principals_found_single: "Egyetlen találat van.\nA Tab billentyű megnyomásával ugrik rá a fókusz." @@ -3069,7 +3105,7 @@ hu: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Üdvözli a %{app_title}" select_language: "Kéjük válasszon nyelvet" - permission_add_work_package_notes: "Megjegyzések hozzáadása" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "feladatcsoport hozzáadása" permission_add_messages: "Elküldött üzenetek" permission_add_project: "Projekt létrehozása" @@ -3099,10 +3135,11 @@ hu: permission_delete_timelines: "Idővonalak törlése" permission_delete_wiki_pages: "Wiki oldalak törlése" permission_delete_wiki_pages_attachments: "Mellékletek törlése" - permission_edit_work_package_notes: "Megjegyzések szerkesztése" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "feladatcsoportok szerkesztése" permission_edit_messages: "Üzenetek szerkesztése" - permission_edit_own_work_package_notes: "Saját megjegyzések szerkesztése" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Saját üzenetek szerkesztése" permission_edit_own_time_entries: "Rögzített eltöltött időim szerkesztése" permission_edit_project: "Projekt szerkesztése" @@ -3195,9 +3232,9 @@ hu: are_you_sure: "Biztosan szeretnéd arhiválni a projektet '%{name}'?" archived: "Archiválva" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Tevékenység" project_module_forums: "Fórumok" project_module_work_package_tracking: "Munkacsomagok" @@ -3331,6 +3368,7 @@ hu: activated: "aktiválva" deactivated: "deaktiválva" search_input_placeholder: "Keresés ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "A CORS engedélyezése" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) engedélyezett származások" setting_apiv3_cors_origins_text_html: > @@ -3556,6 +3594,27 @@ hu: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Új projekt beállításai" @@ -3589,6 +3648,7 @@ hu: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Törli a feladatcsoportot és minden hozzá tartozó gyermek feladatcsoportot?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Hozzárendelés projekthez" text_form_configuration: > Testreszabhatja, hogy mely mezők jelenjenek meg a munkacsomag űrlapjánál. A mezőket szabadon csoportosíthatja, hogy kellően tükrözze a problémakör igényeit. @@ -3668,6 +3728,7 @@ hu: text_notice_security_badge_displayed_html: > Megjegyzés: ha engedélyezve van, akkor a telepítési állapotot jelző jelvény jelenik meg a %{information_panel_label} adminisztrációs panelen és a kezdőlapon. Csak a rendszergazdák számára jelenik meg.
    A jelvény ellenőrzi az aktuális OpenProject verziót a hivatalos OpenProject kiadási adatbázishoz képest, hogy figyelmeztesse Önt minden frissítésre vagy ismert biztonsági résre. Ha többet szeretne megtudni arról, hogy mit tartalmaz az ellenőrzés, milyen adatokra van szükség az elérhető frissítésekhez, és hogyan tilthatja le ezt az ellenőrzést, keresse fel a konfigurációs dokumentációt . text_own_membership_delete_confirmation: "Értesítem arról, hogy eltávolít néhány vagy az összes jogosultságot, és ezt követően már nem lehet szerkeszteni ezt a projektet. Biztosan folytatni kívánja?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin eszközök könyvtára írható" text_powered_by: "Készítette %{link}" text_project_identifier_info: "Csak kisbetű (a-z), számok, kötőjelek és aláhúzásjelek van engedélyezve, és kisbetűvel kell kezdődnie." @@ -4036,6 +4097,8 @@ hu: builtin: Built-in instance application confidential: Confidential singular: "OAuth alkalmazás" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth alkalmazások" named: "OAuth-alkalmazás neve %{name}" new: "Új OAuth alkalmazás" diff --git a/config/locales/crowdin/id.yml b/config/locales/crowdin/id.yml index fba510dce5f0..9bde11cb604f 100644 --- a/config/locales/crowdin/id.yml +++ b/config/locales/crowdin/id.yml @@ -33,7 +33,7 @@ id: label_activity_show_only_changes: "Show changes only" label_sort_asc: "Newest at the bottom" label_sort_desc: "Newest on top" - label_type_to_comment: "Add a comment. Type @ to notify people." + label_type_to_comment: "Menambahkan komentar. Ketik @ untuk memberi tahu orang lain." label_submit_comment: "Submit comment" changed_on: "changed on" created_on: "created this on" @@ -60,7 +60,7 @@ id: main-menu-bg-hover-background: "Menu utama melayang" custom_colors: "Warna kostum" customize: "Sesuaikan instalasi OpenProject Anda dengan logo dan warna Anda sendiri." - enterprise_notice: "As a special 'Thank you!' for their financial contribution to develop OpenProject, this tiny add-on is only available for Enterprise edition support subscribers." + enterprise_notice: "Sebagai ucapan 'Terima kasih!' khusus untuk kontribusi finansial mereka dalam mengembangkan OpenProject, add-on kecil ini hanya tersedia untuk pelanggan dukungan edisi Enterprise." enterprise_more_info: "Catatan: logo yang digunakan akan dapat diakses publik." manage_colors: "Edit warna pilih opsi" instructions: @@ -73,15 +73,15 @@ id: main-menu-bg-color: "Warna latar belakang menu sisi kiri." theme_warning: mengubah tema akan mengubah custom style anda. Desain akan menghilang. Apakah anda ingin melanjutkannya? enterprise: - upgrade_to_ee: "Upgrade to the Enterprise edition" - add_token: "Upload an Enterprise edition support token" + upgrade_to_ee: "Tingkatkan ke edisi Enterprise" + add_token: "Unggah sebuah token bantuan Edisi Enterprise" delete_token_modal: text: "Are you sure you want to remove the current Enterprise edition token used?" title: "Hapus token" replace_token: "Gantilah token bantuan yang sedang digunakan" - order: "Order Enterprise on-premises edition" - paste: "Paste your Enterprise edition support token" - required_for_feature: "This add-on is only available with an active Enterprise edition support token." + order: "Pesan Enterprise edisi di tempat" + paste: "Rekat sebuah token bantuan Edisi Enterprise" + required_for_feature: "Pengaya ini hanya tersedia dengan token dukungan edisi Enterprise yang aktif." enterprise_link: "Untuk informasi lebih lanjut, klik di sini." start_trial: "Mulai uji coba gratis" book_now: "Pesan sekarang" @@ -152,7 +152,7 @@ id: Jika anda ceklis box ini, OpenProject akan secara otomatis membuat pengguna baru dari seluruh LDAP saat pertamakali autentikasi dengan OpenProject. Biarkan tidak terceklis untuk mengizinkan akun yang ada di OpenProject untuk mengautentikasi melalui LDAP! connection_encryption: "Enkripsi sambungan" - encryption_details: "LDAPS / STARTTLS options" + encryption_details: "Opsi LDAPS / STARTTLS" system_account: "Akun sistem" system_account_legend: | OpenProject membutuhkan akses hanya baca melalui akun sistem untuk melihat pengguna dan grup pada pohon LDAP anda. @@ -165,16 +165,16 @@ id: plain: "kosong" simple_tls: "LDAPS" start_tls: "STARTTLS" - plain_description: "Opens an unencrypted connection to the LDAP server. Not recommended for production." - simple_tls_description: "Use LDAPS. Requires a separate port on the LDAP server. This mode is often deprecated, we recommend using STARTTLS whenever possible." - start_tls_description: "Sends a STARTTLS command after connecting to the standard LDAP port. Recommended for encrypted connections." + plain_description: "Membuka koneksi yang tidak terenkripsi ke server LDAP. Tidak direkomendasikan untuk produksi." + simple_tls_description: "Gunakan LDAPS. Membutuhkan port terpisah pada server LDAP. Mode ini sering kali tidak digunakan lagi, kami sarankan untuk menggunakan STARTTLS bila memungkinkan." + start_tls_description: "Mengirimkan perintah STARTTLS setelah menyambung ke port LDAP standar. Direkomendasikan untuk koneksi terenkripsi." section_more_info_link_html: > Bagian ini menyangkut keamanan koneksi dari sumber autentikasi LDAP ini. Untuk informasi selengkapnya, kunjungi dokumentasi Net::LDAP. tls_options: - verify_peer: "Verify SSL certificate" + verify_peer: "Verifikasi sertifikat SSL" verify_peer_description_html: > - Enables strict SSL verification of the certificate trusted chain.
    Warning: Unchecking this option disables SSL verification of the LDAP server certificate. This exposes your connection to Man in the Middle attacks. - tls_certificate_description: "If the LDAP server certificate is not in the trust sources of this system, you can add it manually here. Enter a PEM X509 certifiate string." + Memungkinkan verifikasi SSL yang ketat terhadap rantai tepercaya sertifikat.
    Peringatan: Menghilangkan centang pada opsi ini akan menonaktifkan verifikasi SSL pada sertifikat server LDAP. Hal ini membuat koneksi Anda rentan terhadap serangan Man in the Middle. + tls_certificate_description: "Jika sertifikat server LDAP tidak ada dalam sumber kepercayaan sistem ini, Anda dapat menambahkannya secara manual di sini. Masukkan string sertifikat PEM X509." forums: show: no_results_title_text: Saat ini tidak ada postingan di forum. @@ -223,6 +223,10 @@ id: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -243,17 +247,18 @@ id: confirm_destroy_option: "Menghapus sebuah pilihan akan menghapus semua kemunculan yang terjadi (mis. dalam paket pekerjaan). Apakah Anda yakin ingin menghapusnya?" reorder_alphabetical: "Susun ulang nilai menurut abjad" reorder_confirmation: "Peringatan: Urutan nilai yang tersedia saat ini akan hilang. Melanjutkan?" + placeholder_version_select: "Work package or project selection is required first" instructions: - is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." + is_required: "Tandai bidang khusus sesuai kebutuhan. Ini akan membuatnya wajib diisi saat membuat sumber daya baru atau memperbarui sumber daya yang sudah ada." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." - is_for_all: "Mark the custom field as available in all existing and new projects." + is_for_all: "Tandai bidang khusus sebagai tersedia di semua proyek yang sudah ada dan yang baru." multi_select: "Allows the user to assign multiple values to this custom field." - searchable: "Include the field values when using the global search functionality." + searchable: "Sertakan nilai bidang saat menggunakan fungsi pencarian global." searchable_for_project: "Check to make this attribute available as a filter in project lists." - editable: "Allow the field to be editable by users themselves." + editable: "Izinkan bidang tersebut diedit oleh pengguna sendiri." admin_only: "Check to make this attribute only visible to administrators. Users without admin rights will not be able to view or edit it." is_filter: > - Allow the custom field to be used in a filter in work package views. Note that only with 'For all projects' selected, the custom field will show up in global views. + Mengizinkan bidang kustom untuk digunakan dalam filter di tampilan paket kerja. Perhatikan bahwa hanya dengan memilih 'Untuk semua proyek', bidang kustom akan muncul di tampilan global. tab: no_results_title_text: Tidak ada bidang kustom saat ini. no_results_content_text: Buat bidang kustom baru @@ -281,6 +286,7 @@ id: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -315,7 +321,7 @@ id: failed_text: "Permintaan untuk menghapus proyek %{name} telah gagal. Proyek dibiarkan diarsipkan." completed: "Penghapusan proyek %{name} selesai" completed_text: "Permintaan untuk menghapus proyek '%{name}' telah selesai." - completed_text_children: "Additionally, the following subprojects have been deleted:" + completed_text_children: "Selain itu, subproyek berikut ini telah dihapus:" index: open_as_gantt: "Buka sebagai tampilan Gantt" no_results_title_text: Tidak ada proyek saat ini @@ -329,7 +335,7 @@ id: favored: "Favorite projects" archived: "Archived projects" shared: "Shared project lists" - my_lists: "My project lists" + my_lists: "Daftar proyek saya" new: placeholder: "New project list" delete_modal: @@ -369,7 +375,7 @@ id: actions: label_enable_single: "Active in this project, click to disable" label_disable_single: "Inactive in this project, click to enable" - remove_from_project: "Remove from project" + remove_from_project: "Hapus dari proyek" is_required_blank_slate: heading: Required in all projects description: This project attribute is activated in all projects since the "Required in all projects" option is checked. It cannot be deactivated for individual projects. @@ -456,8 +462,9 @@ id: my: access_token: create_dialog: - header: The %{type} token has been generated - warning: Note that this is the only time you will see this token, make sure to copy it now. + title: Token generated + header: Token %{type} telah dibuat + warning: Perhatikan bahwa ini adalah satu-satunya saat Anda akan melihat token ini, pastikan untuk menyalinnya sekarang. errors: token_name_blank: "Please provide an API token name" token_name_in_use: "This API token name is already in use, please select a different one" @@ -474,7 +481,7 @@ id: notice_reset_token: "Sebuah token baru %{type} telah dibuat. Token akses Anda adalah:" token_value_warning: "Catatan: Anda hanya akan melihat token ini satu kali, pastikan untuk membuat salinannya sekarang." no_results_title_text: There are currently no access tokens available. - notice_api_token_revoked: "The API token has been deleted. To create a new token please use the button in the API section." + notice_api_token_revoked: "Token API telah dihapus. Untuk membuat token baru, gunakan tombol di bagian API." notice_rss_token_revoked: "The RSS token has been deleted. To create a new token please use the link in the RSS section." notice_ical_token_revoked: 'Token iCalendar "%{token_name}" untuk kalender "%{calendar_name}" proyek "%{project_name}" telah dicabut. URL iCalendar dengan token ini sekarang tidak valid.' news: @@ -520,7 +527,7 @@ id: upsale: title: Pengguna placeholder description: > - Placeholder users are a way to assign work packages to users who are not part of your project. They can be useful in a range of scenarios; for example, if you need to track tasks for a resource that is not yet named or available, or if you don’t want to give that person access to OpenProject but still want to track tasks assigned to them. + Pengguna placeholder adalah cara untuk memberikan paket kerja kepada pengguna yang bukan bagian dari proyek Anda. Mereka dapat berguna dalam berbagai skenario; misalnya, jika Anda perlu melacak tugas untuk sumber daya yang belum diberi nama atau tersedia, atau jika Anda tidak ingin memberi orang tersebut akses ke OpenProject tetapi masih ingin melacak tugas yang ditugaskan kepada mereka. prioritiies: edit: priority_color_text: | @@ -577,7 +584,7 @@ id: form_configuration: tab: "Form configuration" more_info_text_html: > - Enterprise edition allows you to customize form configuration with these additional add-ons:
    • Add new attribute groups
    • Rename attribute groups
    • Add a table of related work packages
    + Edisi Enterprise memungkinkan Anda untuk menyesuaikan konfigurasi formulir dengan pengaya tambahan ini:
    • Menambahkan grup atribut baru
    • Mengganti nama grup atribut
    • Menambahkan tabel paket kerja terkait
    projects: tab: "Projects" enabled_projects: "Enabled projects" @@ -628,9 +635,10 @@ id: The current types of the work packages aren't enabled in the target project. Please enable the types in the target project if you'd like them to remain unchanged. Otherwise, select an available type in the target project from the list. sharing: missing_workflow_warning: - title: "Workflow missing for work package sharing" - message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." - link_message: "Configure the workflows in the administration." + title: "Alur kerja yang hilang untuk berbagi paket kerja" + message: "Tidak ada alur kerja yang dikonfigurasikan untuk peran 'Editor paket kerja'. Tanpa alur kerja, pengguna yang dibagikan tidak dapat mengubah status paket kerja. Alur kerja dapat disalin. Pilih jenis sumber (misalnya 'Tugas') dan peran sumber (misalnya 'Anggota'). Kemudian pilih jenis target. Sebagai permulaan, Anda dapat memilih semua jenis sebagai target. Terakhir, pilih peran 'Editor paket kerja' sebagai target dan tekan 'Salin'. Setelah membuat default, sesuaikan alur kerja seperti yang Anda lakukan untuk setiap peran lainnya." + link_message: "Mengonfigurasi alur kerja dalam administrasi." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -653,14 +661,15 @@ id: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" - caption: "The minimum number of working days to keep in between the two work packages." + caption: "Jumlah hari kerja minimum yang harus dijaga di antara dua paket pekerjaan." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -675,6 +684,9 @@ id: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -711,6 +723,8 @@ id: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Undangan account: delete: "Hapus akun" @@ -775,6 +789,7 @@ id: is_required: "Harus diisi" max_length: "Panjang maksimum" min_length: "Panjang minimum" + content_right_to_left: "Right-to-Left content" multi_value: "Membolehkan pilihan majemuk" possible_values: "Nilai yang mungkin" regexp: "Regular expression" @@ -810,6 +825,8 @@ id: attr_lastname: "Atribut nama belakang" attr_login: "Atribut nama pengguna" attr_mail: "Atribut email" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Otomatis membuat pengguna" @@ -853,6 +870,9 @@ id: project_custom_field: is_required: "Required for all projects" custom_field_section: Bagian + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolom" relations_to_type_column: "Relasi untuk %{type}" @@ -862,7 +882,7 @@ id: timeline_labels: "Label alur waktu" relation: lag: "Lag" - from: "Paket-Penugasan" + from: "Related work package" to: "Work package terkait" reminder: remind_at_date: "Date" @@ -1186,12 +1206,16 @@ id: typed_dag: circular_dependency: "Relasi menciptakan lingkaran relasi-relasi." attributes: - to: - error_not_found: "work package dalam posisi `to` tidak dapat ditemukan atau tidak terlihat" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Vendor SCM tidak tersedia" not_whitelisted: "konfigurasi tidak mengijinkan." @@ -1536,8 +1560,9 @@ id: button_copy_and_follow: "Salin dan amati" button_create: "Buat baru" button_create_and_continue: "Buat baru dan lanjut" - button_delete: "Hapus" button_decline: "Tolak" + button_delete: "Hapus" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Hapus pemantau, %{name}" button_download: "Download" button_duplicate: "Duplikasi" @@ -1722,6 +1747,8 @@ id: units: hour: other: "jam" + day: + other: "days" description_active: "Aktif?" description_attachment_toggle: "Tampil/sembunyikan lampiran" description_autocomplete: > @@ -1757,6 +1784,10 @@ id: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Menambahkan atribut kelompok-kelompok baru" @@ -2119,6 +2150,7 @@ id: label_add_subtask: "Tambahkan Sub-Tugas" label_added: "ditambahkan" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Ditambahkan oleh %{author} %{age} yang lalu" label_additional_workflow_transitions_for_assignee: "Tambahan transisi diperbolehkan ketika user mendapat penugasan" label_additional_workflow_transitions_for_author: "Tambahan transisi diperbolehkan ketika user adalah Penulis" @@ -2539,6 +2571,7 @@ id: label_project_new: "Project baru" label_project_plural: "Project" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Atribut proyek" label_project_custom_field_plural: "Atribut proyek" label_project_settings: "Projek setting" @@ -2565,6 +2598,7 @@ id: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Hapus keterkaitan" + label_relation_edit: "Edit relation" label_relation_new: "Keterkaitan baru" label_release_notes: "Release notes" label_remaining_work: "Pekerjaan yang tersisa" @@ -2980,6 +3014,7 @@ id: notice_bad_request: "Bad Request." notice_not_authorized: "Anda tidak diizinkan untuk mengakses halaman ini." notice_not_authorized_archived_project: "Project yang Anda coba akses telah diarsipkan." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Password Anda tidak tepat. Tidak dapat melanjutkan." notice_principals_found_multiple: "Ada beberapa %{number} hasil yang ditemukan. \n Tab untuk fokus ke hasil pertama." notice_principals_found_single: "Ada satu hasil.\n Tab untuk lebih fokus." @@ -3026,7 +3061,7 @@ id: text_getting_started_description: "Dapatkan ikhtisar singkat manajemen proyek dan kolaborasi tim dengan OpenProject. Anda dapat memulai ulang video ini dari menu bantuan." welcome: "Selamat datang di %{app_title}" select_language: "Silakan pilih bahasa Anda" - permission_add_work_package_notes: "Tambahkan catatan" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Tambah Paket-Penugasan" permission_add_messages: "Kirim pesan" permission_add_project: "Create projects" @@ -3056,10 +3091,11 @@ id: permission_delete_timelines: "Menghapus Timeline" permission_delete_wiki_pages: "Hapus halaman Wiki" permission_delete_wiki_pages_attachments: "Hapus lampiran" - permission_edit_work_package_notes: "Edit catatan" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit Paket-Penugasan" permission_edit_messages: "Edit pesan" - permission_edit_own_work_package_notes: "Edit catatan saya" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit pesan" permission_edit_own_time_entries: "Edit Time log" permission_edit_project: "Edit Project" @@ -3152,9 +3188,9 @@ id: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Diarsipkan" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forum" project_module_work_package_tracking: "Paket-Penugasan" @@ -3286,6 +3322,7 @@ id: activated: "diaktifkan" deactivated: "dinonaktifkan" search_input_placeholder: "Mencari ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Aktifkan CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) memungkinkan asal" setting_apiv3_cors_origins_text_html: > @@ -3511,6 +3548,27 @@ id: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3544,6 +3602,7 @@ id: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Hapus Paket-Penugasan dan semua paket turunannya?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Tetapkan untuk Project" text_form_configuration: > Anda dapat mengkustom field-field mana yang akan ditampilkan dalam form paket kerja. Anda dapat dengan bebas mengelompokkan field-field untuk mencerminkan kebutuhan-kebutuhan untuk domain Anda. @@ -3623,6 +3682,7 @@ id: text_notice_security_badge_displayed_html: > Catatan: jika diaktifkan, ini akan menampilkan lencana dengan status pemasangan Anda di panel administrasi %{information_panel_label}, dan di beranda. Ini hanya ditampilkan kepada administrator.
    Lencana akan memeriksa versi OpenProject Anda saat ini dengan database rilis OpenProject resmi untuk memberi tahu Anda tentang pembaruan atau kerentanan yang diketahui. Untuk informasi lebih lanjut tentang apa yang diberikan pemeriksaan, data apa yang diperlukan untuk menyediakan pembaruan yang tersedia, dan cara menonaktifkan pemeriksaan ini, silakan kunjungi dokumentasi konfigurasi. text_own_membership_delete_confirmation: "Anda akan menghapus hak akses Anda dan mungkin Anda tidak dapat lagi mengedit Project ini. Apakah Anda yakin Anda ingin melanjutkan?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin aset direktori, bisa ditulisi" text_powered_by: "Didukung oleh %{link}" text_project_identifier_info: "Hanya huruf kecil (a-z), angka, garis dan garis bawah yang diperbolehkan, harus diawali dengan huruf kecil." @@ -3990,6 +4050,8 @@ id: builtin: Built-in instance application confidential: Confidential singular: "aplikasi OAuth" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/it.yml b/config/locales/crowdin/it.yml index 2db65f13ab0a..9774a746a30c 100644 --- a/config/locales/crowdin/it.yml +++ b/config/locales/crowdin/it.yml @@ -226,6 +226,10 @@ it: item: title: Questo elemento non ha alcun livello gerarchico sotto description: Aggiungi elementi a questo elenco per creare sottoelementi all'interno di un altro + delete_dialog: + title: "Elimina elemento campo personalizzato" + heading: "Eliminare l'elemento campo personalizzato?" + description: "Questa azione rimuoverà in modo irreversibile l'elemento e tutte le sue sottovoci. Tutti i valori assegnati saranno eliminati in modo permanente. Se questo campo è obbligatorio, la rimozione degli elementi può causare l'invalidità delle macro-attività esistenti." placeholder: label: "Etichetta elemento" short: "Abbreviazione" @@ -246,6 +250,7 @@ it: confirm_destroy_option: "L'eliminazione di un'opzione eliminerà tutte le sue occorrenze (ad es. nelle macro-attività). Procedere all'eliminazione?" reorder_alphabetical: "Riordina i valori alfabeticamente" reorder_confirmation: "Attenzione: l'ordine corrente dei valori disponibili sarà perso. Continuare?" + placeholder_version_select: "Prima è necessario selezionare la macro-attività o il progetto" instructions: is_required: "Contrassegna il campo personalizzato come obbligatorio. Ciò renderà obbligatorio compilare il campo durante la creazione di nuove risorse o l'aggiornamento di risorse esistenti." is_required_for_project: "Spunta la casella per abilitare questo attributo e renderlo necessario in tutti i progetti. Non può essere disattivato per i singoli progetti." @@ -284,6 +289,7 @@ it: label: "Etichetta" short: "Abbreviazione" parent: "Genitore" + blueprint: "Schema del modello" global_search: placeholder: "Cerca in %{app_title}" overwritten_tabs: @@ -466,6 +472,7 @@ it: my: access_token: create_dialog: + title: Token generato header: Il token %{type} è stato generato warning: 'Nota: Questa è l''unica volta in cui vedrai questo token, assicurati di copiarlo subito.' errors: @@ -642,6 +649,7 @@ it: title: "Flusso di lavoro mancante per la condivisione di macro-attività" message: "Nessun flusso di lavoro è configurato per il ruolo \"Editor di macro-attività\". Senza un flusso di lavoro, la condivisione con l'utente non può alterare lo stato della macro-attività. I flussi di lavoro possono essere copiati. Seleziona un tipo di origine (ad esempio \"Attività\") e un ruolo di origine (ad esempio \"Membro\"). Quindi seleziona i tipi obiettivo. Per cominciare, potresti selezionare tutti i tipi come obiettivi. Infine, seleziona il ruolo \"Editor di macro-attività\" come destinazione e premi \"Copia\". Dopo aver creato le impostazioni predefinite, perfeziona i flussi di lavoro come fai per ogni altro ruolo." link_message: "Configura i flussi di lavoro nell'amministrazione." + templated_subject_hint: Generato automaticamente attraverso il tipo %{type} summary: reports: category: @@ -664,14 +672,15 @@ it: no_results_title_text: Al momento non vi sono relazioni disponibili. blankslate_heading: "Nessuna relazione" blankslate_description: "Questa macro-attività non ha ancora alcuna relazione." + label_add_child_button: "Figlio" label_add_x: "Aggiungi %{x}" label_edit_x: "Modifica %{x}" label_add_description: "Aggiungi descrizione" lag: subject: "Ritardo" - title: "Ritardo (in giorni)" caption: "Il numero minimo di giorni lavorativi da far trascorrere tra le due macro-attività." relations: + label_new_child_created: "Nuova macro-attività creata e aggiunta come figlia" label_relates_singular: "correlata con" label_relates_plural: "correlate con" label_relates_to_singular: "correlata con" @@ -686,6 +695,9 @@ it: follows_description: "La macro-attività correlata deve necessariamente terminare prima dell'inizio di questa" label_child_singular: "figlia" label_child_plural: "figlie" + new_child: "Nuovo figlio" + new_child_text: "Crea una macro-attività correlata come sottovoce della macro-attività attuale (genitore)" + existing_child: "Figlio esistente" child_description: "Rende la macro-attività correlata un sottoelemento della macro-attività corrente (genitore)" label_blocks_singular: "blocca" label_blocks_plural: "blocca" @@ -722,6 +734,8 @@ it: required_description: "Contrassegna questa macro-attività come obbligatoria per quella correlata" label_parent_singular: "genitore" label_parent_plural: "genitore" + ghost_relation_title: "Macro-attività correlata" + ghost_relation_description: "Non puoi visualizzare a causa delle autorizzazioni." label_invitation: Invito account: delete: "Cancella account" @@ -786,6 +800,7 @@ it: is_required: "Richiesto" max_length: "Lunghezza massima" min_length: "Lunghezza minima" + content_right_to_left: "Contenuto da destra a sinistra" multi_value: "Consenti selezione multipla" possible_values: "Valori possibili" regexp: "Espressione regolare" @@ -821,6 +836,8 @@ it: attr_lastname: "Attributo cognome" attr_login: "Attributo nome utente" attr_mail: "Attributo email" + filter_string: "Stringa del filtro" + admin: "Amministratore" base_dn: "Nome Dominio (DN) base" host: "Host" onthefly: "Creazione automatica degli utenti" @@ -864,6 +881,9 @@ it: project_custom_field: is_required: "Richiesto per tutti i progetti" custom_field_section: Sezione + project/life_cycle_step_definition: + name: "Nome" + color: "Colore" query: column_names: "Colonne" relations_to_type_column: "Relazioni con %{type}" @@ -873,7 +893,7 @@ it: timeline_labels: "Etichette di sequenza temporale" relation: lag: "Ritardo" - from: "Macro-attività" + from: "Macro-attività correlata" to: "Macro-attività correlata" reminder: remind_at_date: "Data" @@ -1197,12 +1217,16 @@ it: typed_dag: circular_dependency: "La relazione crea un riferimento circolare." attributes: - to: - error_not_found: "impossibile trovare o visualizzare la macro-attività in posizione \"a\"" - error_readonly: "impossibile modificare il collegamento ad una relazione esistente \"a\"" - from: - error_not_found: "impossibile trovare o visualizzare la macro-attività in posizione \"da\"" - error_readonly: "impossibile modificare il collegamento ad una relazione esistente \"da\"" + to_id: + error_not_found: "non trovato o non visibile." + error_readonly: "non può essere modificato per le relazioni esistenti." + from_id: + error_not_found: "non trovato o non visibile." + error_readonly: "non può essere modificato per le relazioni esistenti." + lag: + greater_than_or_equal_to: + zero: "non può essere negativo." + less_than_or_equal_to: "è troppo alto." repository: not_available: "Il gestore SCM non è disponibile" not_whitelisted: "non è consentito dalla configurazione." @@ -1557,8 +1581,9 @@ it: button_copy_and_follow: "Copia e segui" button_create: "Crea" button_create_and_continue: "Crea e continua" - button_delete: "Cancella" button_decline: "Rifiuto" + button_delete: "Cancella" + button_delete_permanently: "Elimina definitivamente" button_delete_watcher: "Eliminare osservatore %{name}" button_download: "Scarica" button_duplicate: "Duplica" @@ -1761,6 +1786,9 @@ it: hour: one: "ora" other: "ora" + day: + one: "giorno" + other: "giorni" description_active: "Attivo?" description_attachment_toggle: "Mostra/Nascondi allegati" description_autocomplete: > @@ -1796,6 +1824,10 @@ it: upsale: title: "Componente aggiuntivo Enterprise" link_title: "Altre informazioni" + automatic_subject_generation: + description: "Crea oggetti generati automaticamente utilizzando gli attributi e il testo di riferimento." + customize_life_cycle: + description: "Crea e organizza fasi e controlli di progetto diversi da quelli forniti dalla pianificazione del ciclo di progetto PM2." form_configuration: description: "Personalizza la configurazione del modulo con le seguenti aggiunte:" add_groups: "Aggiunta di gruppi di proprietà" @@ -2158,6 +2190,7 @@ it: label_add_subtask: "Aggiungi sotto-attività" label_added: "aggiunto" label_added_by: "Aggiunto da %{author}" + label_added_by_on: "Aggiunto da %{author} il %{date}" label_added_time_by: "Aggiunto da %{author} %{age} fa" label_additional_workflow_transitions_for_assignee: "Transizioni aggiuntive consentite quando l'utente è l'assegnatario" label_additional_workflow_transitions_for_author: "Transizioni aggiuntive consentite quando l'utente è l'autore" @@ -2578,6 +2611,7 @@ it: label_project_new: "Nuovo progetto" label_project_plural: "Progetti" label_project_list_plural: "Elenchi progetto" + label_project_lifecycle: "Ciclo di vita del progetto" label_project_attributes_plural: "Attributi del progetto" label_project_custom_field_plural: "Attributi del progetto" label_project_settings: "Impostazioni progetto" @@ -2604,6 +2638,7 @@ it: label_relation: "Relazione" label_relation_actions: "Azioni di relazione" label_relation_delete: "Eliminare la relazione" + label_relation_edit: "Modifica relazione" label_relation_new: "Nuova relazione" label_release_notes: "Note di rilascio" label_remaining_work: "Lavoro residuo" @@ -3020,6 +3055,7 @@ it: notice_bad_request: "Richiesta non valida." notice_not_authorized: "Non sei autorizzato ad accedere a questa pagina." notice_not_authorized_archived_project: "Il progetto che stai tentando di accedere è stato archiviato." + notice_requires_enterprise_token: "Il token Enterprise è assente o non consente l'accesso a questa pagina." notice_password_confirmation_failed: "La password non è corretta. Impossibile continuare." notice_principals_found_multiple: "Trovati %{number} risultati. \n Premi Tab per evidenziare il primo." notice_principals_found_single: "Trovato un solo risultato. \n Premi Tab per evidenziarlo." @@ -3068,7 +3104,7 @@ it: text_getting_started_description: "Fai una rapida panoramica della gestione dei progetti e della collaborazione in team con OpenProject. Puoi riavviare questo video dal menu di aiuto." welcome: "Benvenuto in %{app_title}" select_language: "Per favore seleziona la tua lingua" - permission_add_work_package_notes: "Aggiungi nota" + permission_add_work_package_notes: "Aggiungi commenti" permission_add_work_packages: "Aggiungere macro-attività (work package)" permission_add_messages: "Postare messaggi" permission_add_project: "Crea progetti" @@ -3098,10 +3134,11 @@ it: permission_delete_timelines: "Elimina cronologie" permission_delete_wiki_pages: "Eliminare pagine wiki" permission_delete_wiki_pages_attachments: "Elimina allegati" - permission_edit_work_package_notes: "Modificare note" + permission_edit_work_package_notes: "Modera i commenti" + permission_edit_work_package_notes_explanation: "Attenzione: gli utenti con questa autorizzazione possono modificare i commenti di chiunque." permission_edit_work_packages: "Modificare macro-attività" permission_edit_messages: "Modificare messaggi" - permission_edit_own_work_package_notes: "Modificare le proprie note" + permission_edit_own_work_package_notes: "Modifica i commenti propri" permission_edit_own_messages: "Modificare i propri messaggi" permission_edit_own_time_entries: "Modificare i propri registri di orario effettuato" permission_edit_project: "Modificare un progetto" @@ -3194,9 +3231,9 @@ it: are_you_sure: "Sicuro di voler archiviare il progetto '%{name}'?" archived: "Archiviato" count: - zero: "0 Progetti" - one: "1 Progetto" - other: "%{count} Progetti" + zero: "0 progetti" + one: "1 progetto" + other: "%{count} progetti" project_module_activity: "Attività" project_module_forums: "Forum" project_module_work_package_tracking: "Macro-attività" @@ -3330,6 +3367,7 @@ it: activated: "attivato" deactivated: "disattivato" search_input_placeholder: "Ricerca..." + setting_apiv3_cors_title: "Condivisione incrociata delle risorse (CORS - Cross-Origin Resource Sharing)" setting_apiv3_cors_enabled: "Abilita CORS" setting_apiv3_cors_origins: "Origini di condivisione CORS (Cross-Origin Resource Sharing) API V3 consentite" setting_apiv3_cors_origins_text_html: > @@ -3555,6 +3593,27 @@ it: new: heading: "Nuovo attributo" description: "Le modifiche a questo attributo di progetto si rifletteranno in tutti i progetti in cui è abilitato. Gli attributi obbligatori non possono essere disabilitati per progetto." + project_life_cycle_step_definitions: + heading: "Ciclo di vita del progetto" + heading_description: "Il ciclo di vita del progetto consiste in fasi e controlli che strutturano i suoi progetti. Appariranno nella pagina di panoramica di un progetto e saranno disponibili nell'elenco dei progetti. Le singole fasi e i controlli possono essere selezionati per personalizzare un progetto, ma non è possibile riordinarli a livello di progetto." + label_add: "Aggiungi" + label_add_description: "Aggiungi definizione di ciclo di vita" + label_add_stage: "Fase" + label_add_gate: "Controllo" + filter: + label: "Cerca la fase o il controllo di progetto" + section_header: "Fasi e controlli" + non_defined: "Attualmente non sono definiti né controlli né fasi." + new: + description: "Le modifiche a questa fase di progetto si rifletteranno in tutti i progetti in cui è abilitata." + new_stage: + heading: "Nuova fase" + new_gate: + heading: "Nuovo controllo" + edit_stage: + heading: "Modifica fase" + edit_gate: + heading: "Modifica controllo" projects: missing_dependencies: "È stato controllato il modulo del progetto %{module} che dipende da %{dependencies}. È necessario controllare anche queste dipendenze." section_new_projects: "Impostazioni per i nuovi progetti" @@ -3588,6 +3647,7 @@ it: text_are_you_sure_continue: "Vuoi davvero continuare?" text_are_you_sure_with_children: "Eliminare la macro-attività e tutte le sue sotto-attività?" text_are_you_sure_with_project_custom_fields: "L'eliminazione di questo attributo eliminerà anche i suoi valori in tutti i progetti. Continuare?" + text_are_you_sure_with_project_life_cycle_step: "L'eliminazione di questa fase eliminerà anche i suoi utilizzi in tutti i progetti. Continuare?" text_assign_to_project: "Assegna al progetto" text_form_configuration: > È possibile personalizzare quali campi verranno visualizzati nei moduli della macro-attività. È possibile raggruppare liberamente i campi per soddisfare le esigenze per il tuo dominio. @@ -3667,6 +3727,7 @@ it: text_notice_security_badge_displayed_html: > Nota: se abilitata questa opzione visualizzerà un badge con lo stato dell'installazione nel pannello di amministrazione di %{information_panel_label} e sulla home page. Verrà visualizzata solo agli amministratori.
    il badge controllerà la tua attuale versione di OpenProject con l'ultima versione rilasciata per avvisarti di eventuali aggiornamenti o risoluzioni di vulnerabilità note. Per ulteriori informazioni sulle funzionalità offerte dal controllo, su quali dati è necessario fornire per ottenere gli aggiornamenti disponibili e su come disabilitare questo controllo, visita la documentazione sulla configurazione. text_own_membership_delete_confirmation: "Stai per rimuovere qualcuno o tutti i tuoi permessi e potresti non essere più in grado di modificare questo progetto dopo questo passo.\nSei sicuro di voler continuare?" + text_permanent_delete_confirmation_checkbox_label: "Sono consapevole che questa cancellazione non può essere annullata" text_plugin_assets_writable: "Cartella del pool di plugin installati scrivibile" text_powered_by: "Offerto da %{link}" text_project_identifier_info: "Solo le lettere minuscole (a-z), numeri, trattini e trattini bassi sono consentiti, devi iniziare con una lettera maiuscola." @@ -4035,6 +4096,8 @@ it: builtin: Applicazione di istanza integrata confidential: Confidenziale singular: "Applicazione OAuth" + scopes: "Ambiti" + client_credentials: "Credenziali del cliente" plural: "Applicazioni OAuth" named: "Applicazione OAuth \"%{name}\"" new: "Nuova Applicazione OAuth" diff --git a/config/locales/crowdin/ja.yml b/config/locales/crowdin/ja.yml index fe63a61a5283..abfb2a81c25c 100644 --- a/config/locales/crowdin/ja.yml +++ b/config/locales/crowdin/ja.yml @@ -227,6 +227,10 @@ ja: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -247,6 +251,7 @@ ja: confirm_destroy_option: "オプションを削除すると、そのすべての派生 (例えばワークパッケージ) が削除されます。削除してもよろしいですか?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "必要に応じてカスタムフィールドをマークします。新規または既存のリソースを作成する際にフィールドを入力することが必須になります。" is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -285,6 +290,7 @@ ja: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -460,6 +466,7 @@ ja: my: access_token: create_dialog: + title: Token generated header: '%{type} トークンが生成されました' warning: このトークンが表示されるのは今回だけなので、必ずコピーしてください。 errors: @@ -633,6 +640,7 @@ ja: title: "作業項目の共有のためのワークフローがありません" message: "「作業項目エディタ」ロールに対してワークフローが設定されていません。ワークフローがなければ、ユーザーと共有された作業項目のステータスは変更できません。 ワークフローをコピーすることができます。ソースタイプ(例:「タスク」)とソースロール(例:「メンバー」)を選択します。 次に、ターゲットタイプを選択します。最初に、すべてのタイプをターゲットとして選択できます。 最後に、「作業項目の編集」ロールをターゲットとして選択し、「コピー」を押します。 このようにしてデフォルトを作成した後、他のすべてのロールに対して行うようにワークフローを微調整します。" link_message: "管理画面でワークフローを構成します。" + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -655,14 +663,15 @@ ja: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "遅れ(日)" caption: "2つの作業パッケージの間に空ける最低作業日数。" relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -677,6 +686,9 @@ ja: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "関連するワークパッケージを現在の(親)ワークパッケージのサブ項目にします。" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -713,6 +725,8 @@ ja: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: 案内 account: delete: "アカウントを削除" @@ -777,6 +791,7 @@ ja: is_required: "必須" max_length: "最大値の長さ" min_length: "最短長" + content_right_to_left: "Right-to-Left content" multi_value: "複数選択を許可" possible_values: "選択肢" regexp: "正規表現" @@ -812,6 +827,8 @@ ja: attr_lastname: "苗字" attr_login: "ユーザー名属性" attr_mail: "メール" + filter_string: "Filter string" + admin: "Administrator" base_dn: "ベースDN" host: "ホスト" onthefly: "ユーザーの自動作成" @@ -855,6 +872,9 @@ ja: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "列" relations_to_type_column: "%{type} との関連" @@ -864,7 +884,7 @@ ja: timeline_labels: "タイムラインのラベル" relation: lag: "Lag" - from: "ワーク パッケージ" + from: "Related work package" to: "関係するワークパッケージ" reminder: remind_at_date: "Date" @@ -1188,12 +1208,16 @@ ja: typed_dag: circular_dependency: "関係が、関係のループを作ります。" attributes: - to: - error_not_found: "「終了」の位置のワークパッケージが存在しないか表示されません" - error_readonly: "既存の関係の「終了」のリンクは変更できません" - from: - error_not_found: "「開始」の位置にワークパッケージが存在しないか表示されません" - error_readonly: "既存の関係の「開始」のリンクは変更できません" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCMベンダーは使用できません。" not_whitelisted: "は設定で許可されていません。" @@ -1538,8 +1562,9 @@ ja: button_copy_and_follow: "コピー後表示" button_create: "作成" button_create_and_continue: "連続作成" - button_delete: "削除" button_decline: "同意しない" + button_delete: "削除" + button_delete_permanently: "Delete permanently" button_delete_watcher: "ウォッチャー「%{name}」を削除" button_download: "ダウンロード" button_duplicate: "複製" @@ -1724,6 +1749,8 @@ ja: units: hour: other: "時" + day: + other: "days" description_active: "有効？" description_attachment_toggle: "添付ファイルの表示/非表示" description_autocomplete: > @@ -1759,6 +1786,10 @@ ja: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "これらの追加機能でフォームの設定をカスタマイズします:" add_groups: "新しい属性グループを追加" @@ -2121,6 +2152,7 @@ ja: label_add_subtask: "子タスクを追加" label_added: "追加" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "%{author}が%{age}前に追加" label_additional_workflow_transitions_for_assignee: "ユーザーが担当者である場合、追加遷移を許可する" label_additional_workflow_transitions_for_author: "ユーザーが作成者である場合、追加遷移を許可する" @@ -2541,6 +2573,7 @@ ja: label_project_new: "新規プロジェクト" label_project_plural: "プロジェクト" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "プロジェクトの設定" @@ -2567,6 +2600,7 @@ ja: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "関係の削除" + label_relation_edit: "Edit relation" label_relation_new: "新しい関係" label_release_notes: "リリースノート" label_remaining_work: "残りの作業" @@ -2982,6 +3016,7 @@ ja: notice_bad_request: "不正な要求です。" notice_not_authorized: "このページにアクセスする権限がありません。" notice_not_authorized_archived_project: "アクセスしようとしたプロジェクトはアーカイブされています。" + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "パスワードが正しくありません。続行できません。" notice_principals_found_multiple: "%{number} の検索結果があります。 \n タブで最初の結果へフォーカスします。" notice_principals_found_single: "1 つの結果があります。 \n タブでフォーカスします。" @@ -3029,7 +3064,7 @@ ja: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "言語を選択してください" - permission_add_work_package_notes: "注記の追加" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "ワークパッケージの追加" permission_add_messages: "メッセージの投稿" permission_add_project: "プロジェクトの作成" @@ -3059,10 +3094,11 @@ ja: permission_delete_timelines: "タイムラインの削除" permission_delete_wiki_pages: "Wikiページの削除" permission_delete_wiki_pages_attachments: "添付ファイルの削除" - permission_edit_work_package_notes: "注記の編集" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "ワークパッケージの編集" permission_edit_messages: "メッセージの編集" - permission_edit_own_work_package_notes: "自分が記入した注記の編集" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "自分の投稿したメッセージの編集" permission_edit_own_time_entries: "自分が記入した作業時間の編集" permission_edit_project: "プロジェクトの編集" @@ -3155,9 +3191,9 @@ ja: are_you_sure: "プロジェクト '%{name}' をアーカイブしてもよろしいですか？" archived: "アーカイブ済み" count: - zero: "0 個のプロジェクト" - one: "1 個のプロジェクト" - other: "%{count}個のプロジェクト" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "活動" project_module_forums: "フォーラム" project_module_work_package_tracking: "ワークパッケージ" @@ -3291,6 +3327,7 @@ ja: activated: "有効化" deactivated: "無効化" search_input_placeholder: "検索…" + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "CORSを有効にする" setting_apiv3_cors_origins: "API V3のオリジン間リソース共有 (CORS) が許可されています" setting_apiv3_cors_origins_text_html: > @@ -3516,6 +3553,27 @@ ja: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "新規プロジェクトの設定" @@ -3549,6 +3607,7 @@ ja: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "仕事項目と子項目を削除してもよろしいですか？" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "プロジェクト自体に割り当てする" text_form_configuration: > ワークパッケージのフォームに表示されるフィールドをカスタマイズできます。自由にフィールドをグループ化して、あなたのドメインのニーズを反映できます。 @@ -3628,6 +3687,7 @@ ja: text_notice_security_badge_displayed_html: > 602/5000 注：有効にすると、%{information_panel_label}管理パネルとホームページに、インストールステータスのバッジが表示されます。 管理者のみに表示されます。
    バッジは、最新のOpenProjectバージョンを公式のOpenProjectリリースデータベースと照合して、アップデートや既知の脆弱性について警告します。 チェックの内容、利用可能なアップデートを提供するために必要なデータ、およびこのチェックを無効にする方法の詳細については、設定ドキュメントをご覧ください。 text_own_membership_delete_confirmation: "一部またはすべての権限を自分自身から剥奪しようとしているため、このプロジェクトを編集できなくなる可能性があります。\n本当に続けますか？" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "プラグインの「assets」ディレクトリが書き込み可能" text_powered_by: "Powered by %{link}" text_project_identifier_info: "アルファベット小文字(a-z)・数字・ハイフン・アンダースコアが使えます。アルファベット小文字で始まる必要があります。" @@ -3994,6 +4054,8 @@ ja: builtin: Built-in instance application confidential: Confidential singular: "OAuthアプリケーション" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuthアプリケーション" named: "OAuthアプリケーション '%{name}'" new: "新しいOAuthアプリケーション" diff --git a/config/locales/crowdin/js-af.yml b/config/locales/crowdin/js-af.yml index 1779f0b7f5d3..ec29ee93d2ec 100644 --- a/config/locales/crowdin/js-af.yml +++ b/config/locales/crowdin/js-af.yml @@ -357,10 +357,10 @@ af: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-ar.yml b/config/locales/crowdin/js-ar.yml index 182406d201e8..bab753d11e9b 100644 --- a/config/locales/crowdin/js-ar.yml +++ b/config/locales/crowdin/js-ar.yml @@ -357,10 +357,10 @@ ar: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-az.yml b/config/locales/crowdin/js-az.yml index a11862af646d..4d1675ced005 100644 --- a/config/locales/crowdin/js-az.yml +++ b/config/locales/crowdin/js-az.yml @@ -357,10 +357,10 @@ az: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-be.yml b/config/locales/crowdin/js-be.yml index 2c2947d55d02..423b4667c274 100644 --- a/config/locales/crowdin/js-be.yml +++ b/config/locales/crowdin/js-be.yml @@ -357,10 +357,10 @@ be: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-bg.yml b/config/locales/crowdin/js-bg.yml index e766a9c70ba6..93af79be9904 100644 --- a/config/locales/crowdin/js-bg.yml +++ b/config/locales/crowdin/js-bg.yml @@ -357,10 +357,10 @@ bg: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-ca.yml b/config/locales/crowdin/js-ca.yml index 8ca2e3e2460d..0f4e8ab5f50a 100644 --- a/config/locales/crowdin/js-ca.yml +++ b/config/locales/crowdin/js-ca.yml @@ -357,10 +357,10 @@ ca: learn_about: "Més informació sobre les noves funcions" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "S'ha produït un error en carregar les dades." diff --git a/config/locales/crowdin/js-ckb-IR.yml b/config/locales/crowdin/js-ckb-IR.yml index 0fd41f61726e..f5f15b541c5a 100644 --- a/config/locales/crowdin/js-ckb-IR.yml +++ b/config/locales/crowdin/js-ckb-IR.yml @@ -357,10 +357,10 @@ ckb-IR: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-cs.yml b/config/locales/crowdin/js-cs.yml index 89ea1d4ee425..5e1937a649f4 100644 --- a/config/locales/crowdin/js-cs.yml +++ b/config/locales/crowdin/js-cs.yml @@ -356,10 +356,10 @@ cs: learn_about: "Další informace o nových funkcích" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Přihlásit kalendář k odběru" inital_setup_error_message: "Při načítání dat došlo k chybě." diff --git a/config/locales/crowdin/js-da.yml b/config/locales/crowdin/js-da.yml index f2151e79097a..8de8b18cbd3d 100644 --- a/config/locales/crowdin/js-da.yml +++ b/config/locales/crowdin/js-da.yml @@ -356,10 +356,10 @@ da: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-de.yml b/config/locales/crowdin/js-de.yml index b44181613fb2..c4ac20452a0b 100644 --- a/config/locales/crowdin/js-de.yml +++ b/config/locales/crowdin/js-de.yml @@ -356,10 +356,10 @@ de: learn_about: "Erfahren Sie mehr über die neuen Funktionen" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Die Version bringt Ihnen verschiedene Funktionen und Verbesserungen, z.B.
    • Legen Sie Erinnerungen für Arbeitspakete fest, um Benachrichtigungen zu generieren.
    • Erstellen Sie neue Ordner direkt beim Hochladen einer Datei.
    • Legen Sie einen gewünschten Abstand zwischen Nachfolgern und Vorgängern von Arbeitspaketen fest.
    • Aktivieren Sie die Sortierung und Gruppierung von Arbeitspaketen nach ihren Werten für benutzerdefinierte Felder vom Typ Hierarchie.
    • Exportieren Sie Zeiteinträge als PDF-Zeiterfassungsbögen.
    • Nutzen Sie ein Popover mit Benutzerinformationen indem Sie den Mauszeiger über Avatare bewegen.
    + Das Release enthält verschiedene neue Funktionen und Verbesserungen, z.B.
    • Planen Sie wiederkehrende Besprechungen, um Ihre wöchentlichen, zweiwöchentlichen oder individuellen Termine zu organisieren.
    • Erstellen Sie untergeordnete Arbeitspakete direkt über die Registerkarte Beziehungen.
    • Erfassen Sie Gesamtsummen in Zeiterfassungs-PDF-Exporten, um einen besseren Überblick zu erhalten.
    • Beziehen Sie untergeordnete Arbeitspakete in Kostenberichte ein, um eine genauere Nachvollziehbarkeit zu gewährleisten.
    • Sehen Sie Datumsangaben von zuvor verborgenen Beziehungen trotz eingeschränkter Berechtigungen, um fundierte Planungsentscheidungen zu treffen.
    ical_sharing_modal: title: "Kalender abonnieren" inital_setup_error_message: "Beim Abrufen der Daten ist ein Fehler aufgetreten." diff --git a/config/locales/crowdin/js-el.yml b/config/locales/crowdin/js-el.yml index 2e35faf513d1..0d9f1852347f 100644 --- a/config/locales/crowdin/js-el.yml +++ b/config/locales/crowdin/js-el.yml @@ -356,10 +356,10 @@ el: learn_about: "Μάθετε περισσότερα για τις νέες λειτουργίες" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-eo.yml b/config/locales/crowdin/js-eo.yml index 21aff1710c70..7dfd121991fa 100644 --- a/config/locales/crowdin/js-eo.yml +++ b/config/locales/crowdin/js-eo.yml @@ -357,10 +357,10 @@ eo: learn_about: "Lerni pli pri la novaj plibonigoj" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-es.yml b/config/locales/crowdin/js-es.yml index caff16230e5e..a262806230a5 100644 --- a/config/locales/crowdin/js-es.yml +++ b/config/locales/crowdin/js-es.yml @@ -357,10 +357,10 @@ es: learn_about: "Más información sobre las nuevas funciones" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Esta versión incluye varias funciones y mejoras, por ejemplo:
    • Establezca recordatorios para que los paquetes de trabajo generen notificaciones de alerta de fecha.
    • Cree nuevas carpetas directamente desde el selector de ubicación para el almacenamiento de archivos.
    • Especifique un desfase necesario entre los paquetes de trabajo sucesores y predecesores.
    • Active la ordenación y agrupación de los paquetes de trabajo en función de los valores de los campos personalizados de tipo jerarquía.
    • Exporte las entradas de tiempo como entradas de tiempo en PDF.
    • Añada un elemento emergente que muestra información del usuario al pasar el ratón por encima.
    + La versión incluye varias funciones y mejoras para usted, por ejemplo:
    • Programe reuniones periódicas para optimizar sus citas semanales, quincenales o personalizadas.
    • Cree paquetes de trabajo secundarios directamente desde la pestaña Relaciones.
    • Incluya las sumas totales en las exportaciones en PDF de las hojas de horas para obtener una mejor información.
    • Incluya paquetes de trabajo secundarios en los informes de costes para un seguimiento más preciso.
    • Vea las fechas de relaciones previamente ocultas y restringidas por permisos para tomar decisiones informadas sobre la programación.
    ical_sharing_modal: title: "Suscribirse al calendario" inital_setup_error_message: "Se ha producido un error al obtener los datos." @@ -625,11 +625,11 @@ es: date_alerts: milestone_date: "Fecha de hito" overdue: "Vencido" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "desde %{difference_in_days}." + property_today: "es hoy." + property_is: "está en %{difference_in_days}." + property_was: "fue hace %{difference_in_days}." + property_is_deleted: "se ha eliminado." upsale: title: "Alertas de fecha" description: "Con las alertas de fecha, recibirá notificaciones de próximas fechas de inicio o finalización para que nunca olvide una fecha límite importante." diff --git a/config/locales/crowdin/js-et.yml b/config/locales/crowdin/js-et.yml index d4703e6b3c5b..6bdf10b0a2ba 100644 --- a/config/locales/crowdin/js-et.yml +++ b/config/locales/crowdin/js-et.yml @@ -357,10 +357,10 @@ et: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-eu.yml b/config/locales/crowdin/js-eu.yml index 4e4acfcd7636..aeac69626f57 100644 --- a/config/locales/crowdin/js-eu.yml +++ b/config/locales/crowdin/js-eu.yml @@ -357,10 +357,10 @@ eu: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-fa.yml b/config/locales/crowdin/js-fa.yml index ee2163c8c081..963739291503 100644 --- a/config/locales/crowdin/js-fa.yml +++ b/config/locales/crowdin/js-fa.yml @@ -357,10 +357,10 @@ fa: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-fi.yml b/config/locales/crowdin/js-fi.yml index 0add734c1a33..3742f98d8538 100644 --- a/config/locales/crowdin/js-fi.yml +++ b/config/locales/crowdin/js-fi.yml @@ -357,10 +357,10 @@ fi: learn_about: "Lisätietoja uusista ominaisuuksista" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-fil.yml b/config/locales/crowdin/js-fil.yml index 641cd5422fec..2f27a3975417 100644 --- a/config/locales/crowdin/js-fil.yml +++ b/config/locales/crowdin/js-fil.yml @@ -357,10 +357,10 @@ fil: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-fr.yml b/config/locales/crowdin/js-fr.yml index f3424cd65d4a..bbb25a477ce9 100644 --- a/config/locales/crowdin/js-fr.yml +++ b/config/locales/crowdin/js-fr.yml @@ -357,10 +357,10 @@ fr: learn_about: "En savoir plus sur les nouvelles fonctionnalités" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Cette version apporte diverses fonctionnalités et améliorations, par exemple :
    • Définissez des rappels pour les lots de travaux afin de générer des notifications d'alerte de date.
    • Créez de nouveaux dossiers directement à partir du sélecteur d'emplacement pour le stockage des fichiers.
    • Spécifiez un délai requis entre les successeurs et les prédécesseurs des lots de travaux.
    • Activez l'ordre et le regroupement des lots de travaux en fonction des valeurs des champs personnalisés de type hiérarchique.
    • Exportez les entrées de temps sous forme de feuilles de temps PDF.
    • Ajoutez une fenêtre contextuelle affichant des informations sur l'utilisateur lors du survol à l'écran.
    + Cette version apporte diverses fonctionnalités et améliorations, p. ex.,
    • Planifiez des réunions récurrentes pour rationaliser vos rendez-vous hebdomadaires, bihebdomadaires ou personnalisés.
    • Créez des lots de travaux enfants directement à partir de l'onglet Relations.
    • Incluez les sommes totales dans les exportations PDF des feuilles de temps pour assurer une meilleure compréhension.
    • Incluez les lots de travaux enfants dans les rapports de coûts pour assurer un suivi plus précis.
    • Affichez les dates des relations précédemment cachées et limitées par des autorisations, afin de prendre des décisions éclairées en matière de planification.
    ical_sharing_modal: title: "S'abonner au calendrier" inital_setup_error_message: "Une erreur est survenue lors de la récupération des données." @@ -625,11 +625,11 @@ fr: date_alerts: milestone_date: "Date jalon" overdue: "En retard" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "depuis %{difference_in_days}." + property_today: "a lieu aujourd'hui." + property_is: "a lieu dans %{difference_in_days}." + property_was: "avait lieu il y a %{difference_in_days}." + property_is_deleted: "a été supprimée." upsale: title: "Alarmes" description: "Avec les alarmes, vous serez informé(e) à l'approche des dates de début ou de fin vous concernant afin de ne jamais manquer ou oublier une échéance importante." diff --git a/config/locales/crowdin/js-he.yml b/config/locales/crowdin/js-he.yml index cc6330d9b144..90905f0241f3 100644 --- a/config/locales/crowdin/js-he.yml +++ b/config/locales/crowdin/js-he.yml @@ -357,10 +357,10 @@ he: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-hi.yml b/config/locales/crowdin/js-hi.yml index 632304c35190..d847b29d051f 100644 --- a/config/locales/crowdin/js-hi.yml +++ b/config/locales/crowdin/js-hi.yml @@ -357,10 +357,10 @@ hi: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-hr.yml b/config/locales/crowdin/js-hr.yml index 703c88070929..8af80aa559e1 100644 --- a/config/locales/crowdin/js-hr.yml +++ b/config/locales/crowdin/js-hr.yml @@ -357,10 +357,10 @@ hr: learn_about: "Saznaj više o novim značajkama" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-hu.yml b/config/locales/crowdin/js-hu.yml index b433a9d22759..4f53c19d284a 100644 --- a/config/locales/crowdin/js-hu.yml +++ b/config/locales/crowdin/js-hu.yml @@ -357,10 +357,10 @@ hu: learn_about: "Tudjon meg többet az új funkciókról" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-id.yml b/config/locales/crowdin/js-id.yml index dd2de98c5ab2..de8e5d490621 100644 --- a/config/locales/crowdin/js-id.yml +++ b/config/locales/crowdin/js-id.yml @@ -357,10 +357,10 @@ id: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-it.yml b/config/locales/crowdin/js-it.yml index a01645abe354..615cc75179e6 100644 --- a/config/locales/crowdin/js-it.yml +++ b/config/locales/crowdin/js-it.yml @@ -357,10 +357,10 @@ it: learn_about: "Scopri di più sulle nuove funzionalità" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Questa versione offre diverse funzionalità e miglioramenti, ad esempio
    • Impostare dei promemoria per le macro-attività per generare notifiche di avviso di data.
    • Creare nuove cartelle direttamente dal selettore di posizione per l'archiviazione dei file.
    • Specificare un ritardo necessario tra i successori e i predecessori delle macro-attività.
    • Abilitare l'ordinamento e il raggruppamento per le macro-attività in base ai valori della gerarchia di tipo dei campi personalizzati.
    • Esportare le voci temporali come fogli presenze in PDF.
    • Aggiungere un pop-up che mostra le informazioni dell'utente quando ci si passa su il mouse.
    + Questa versione offre diverse funzionalità e miglioramenti, ad esempio
    • Pianificazione di riunioni ricorrenti per semplificare gli appuntamenti settimanali, quindicinali o personalizzati.
    • Creazione di macro-attività figlie direttamente dalla scheda Relazioni.
    • Inclusione di somme totali nelle esportazioni PDF delle schede attività per informazioni più approfondite.
    • Inclusione delle macro-attività figlie nei report sui costi per un monitoraggio più accurato.
    • Visualizzazione delle date delle relazioni precedentemente nascoste e con autorizzazioni limitate per prendere decisioni di pianificazione informate.
    ical_sharing_modal: title: "Iscriviti al calendario" inital_setup_error_message: "Si è verificato un errore recuperando i dati." @@ -625,11 +625,11 @@ it: date_alerts: milestone_date: "Data inizio" overdue: "In ritardo" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "da %{difference_in_days}." + property_today: "è oggi." + property_is: "tra %{difference_in_days}." + property_was: "era %{difference_in_days} fa." + property_is_deleted: "eliminato." upsale: title: "Avvisi data" description: "Con gli avvisi sulle date, sarai avvisato delle prossime date di inizio o di fine in modo da non perdere mai o dimenticare una scadenza importante." diff --git a/config/locales/crowdin/js-ja.yml b/config/locales/crowdin/js-ja.yml index f56b38412f11..9cca7ef70aeb 100644 --- a/config/locales/crowdin/js-ja.yml +++ b/config/locales/crowdin/js-ja.yml @@ -358,10 +358,10 @@ ja: learn_about: "新機能の詳細はこちら" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - このリリースでは、様々な機能や改善が提供されます。例：
    • 作業パッケージのリマインダーを設定し、日付アラート通知を生成。
    • ファイル保存のために、ロケーションピッカーから直接新しいフォルダを作成。
    • ワークパッケージの後継者と前任者間の必要なタイムラグを指定。
    • カスタムフィールドタイプの階層の値でワークパッケージの順序付けとグループ化を有効にする。
    • 時間エントリをPDFタイムシートとしてエクスポート。
    • ホバー時にユーザー情報を表示するポップオーバーを追加。
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-ka.yml b/config/locales/crowdin/js-ka.yml index 11c96938b328..c7a53feb270a 100644 --- a/config/locales/crowdin/js-ka.yml +++ b/config/locales/crowdin/js-ka.yml @@ -357,10 +357,10 @@ ka: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-kk.yml b/config/locales/crowdin/js-kk.yml index b158537d6d63..b7a371d8524f 100644 --- a/config/locales/crowdin/js-kk.yml +++ b/config/locales/crowdin/js-kk.yml @@ -357,10 +357,10 @@ kk: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-ko.yml b/config/locales/crowdin/js-ko.yml index e8df9eba3094..32e4afcc2780 100644 --- a/config/locales/crowdin/js-ko.yml +++ b/config/locales/crowdin/js-ko.yml @@ -357,10 +357,10 @@ ko: learn_about: "새로운 기능에 대해 자세히 알아보기" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - 이 릴리스에는 사용자를 위한 다양한 기능과 개선 사항이 포함되어 있습니다. 예:
    • 작업 패키지에 대한 미리 알림을 설정하여 날짜 경보 알림을 생성합니다.
    • 파일 저장소의 위치 선택기에서 새 폴더를 바로 만듭니다.
    • 작업 패키지 후행 단계 및 선행 단계 간에 필요한 지연 시간을 지정합니다.
    • 사용자 지정 필드 유형 계층 값에 대한 작업 패키지의 순서 지정 및 그룹화를 활성화합니다.
    • 시간 항목을 PDF 타임시트로 내보냅니다.
    • 마우스를 올리면 사용자 정보가 표시되는 팝오버를 추가합니다.
    + 이 릴리스에는 다음과 같이 다양한 기능과 개선 사항이 포함되어 있습니다.
    • 반복 미팅을 스케줄링하여 주간, 격주 또는 사용자 지정 약속을 효율화합니다.
    • 관계 탭에서 바로 자식 작업 패키지를 만듭니다.
    • 보다 우수한 인사이트를 위해 타임시트 PDF 내보내기에 총계를 포함합니다.
    • 보다 정확한 추적을 위해 비용 보고서에 자식 작업 패키지를 포함합니다.
    • 이전에 숨겨지거나, 권한이 제한된 관계의 날짜를 확인하여 정보에 입각한 스케줄린 결정을 내립니다.
    ical_sharing_modal: title: "캘린더 구독" inital_setup_error_message: "데이터를 가져오는 중에 오류가 발생했습니다." @@ -625,11 +625,11 @@ ko: date_alerts: milestone_date: "마일스톤 날짜" overdue: "기한 지남" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "- %{difference_in_days} 이후." + property_today: "- 오늘입니다." + property_is: "- %{difference_in_days} 이내입니다." + property_was: "- %{difference_in_days} 전이었습니다." + property_is_deleted: "- 삭제되었습니다." upsale: title: "날짜 경보" description: "날짜 경보를 사용하면, 중요 마감일을 놓치거나 잊지 않도록 향후 시작 날짜 또는 종료 날짜에 대한 알림을 받게 됩니다." diff --git a/config/locales/crowdin/js-lt.yml b/config/locales/crowdin/js-lt.yml index ecb7e88f556c..4d7bdbe19c7e 100644 --- a/config/locales/crowdin/js-lt.yml +++ b/config/locales/crowdin/js-lt.yml @@ -357,10 +357,10 @@ lt: learn_about: "Sužinokite daugiau apie naujas galimybes" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Prenumeruoti kalendorių" inital_setup_error_message: "Gaunant duomenis įvyko klaida." diff --git a/config/locales/crowdin/js-lv.yml b/config/locales/crowdin/js-lv.yml index 17d6a855d285..54bb2b7d8257 100644 --- a/config/locales/crowdin/js-lv.yml +++ b/config/locales/crowdin/js-lv.yml @@ -357,10 +357,10 @@ lv: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-mn.yml b/config/locales/crowdin/js-mn.yml index ec14c0877f58..8a69c4632e50 100644 --- a/config/locales/crowdin/js-mn.yml +++ b/config/locales/crowdin/js-mn.yml @@ -357,10 +357,10 @@ mn: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-ms.yml b/config/locales/crowdin/js-ms.yml index 93c7b015cc5e..5775806a1636 100644 --- a/config/locales/crowdin/js-ms.yml +++ b/config/locales/crowdin/js-ms.yml @@ -357,10 +357,10 @@ ms: learn_about: "Ketahui lebih lanjut mengenai fitur-fitur baharu." #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Langgan kalendar" inital_setup_error_message: "Ralat berlaku ketika sedang mengambil data." diff --git a/config/locales/crowdin/js-ne.yml b/config/locales/crowdin/js-ne.yml index e03b823e95ed..3103d893f7af 100644 --- a/config/locales/crowdin/js-ne.yml +++ b/config/locales/crowdin/js-ne.yml @@ -357,10 +357,10 @@ ne: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-nl.yml b/config/locales/crowdin/js-nl.yml index 26ff767795cd..abeab3508682 100644 --- a/config/locales/crowdin/js-nl.yml +++ b/config/locales/crowdin/js-nl.yml @@ -357,10 +357,10 @@ nl: learn_about: "Meer informatie over de nieuwe functies" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Abonneren op agenda" inital_setup_error_message: "Er is een fout opgetreden tijdens het ophalen van gegevens." diff --git a/config/locales/crowdin/js-no.yml b/config/locales/crowdin/js-no.yml index 93a5bd3100fd..68a7b93bf443 100644 --- a/config/locales/crowdin/js-no.yml +++ b/config/locales/crowdin/js-no.yml @@ -357,10 +357,10 @@ learn_about: "Lær mer om de nye funksjonene" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Abonner på kalender" inital_setup_error_message: "En feil oppstod under henting av data." diff --git a/config/locales/crowdin/js-pl.yml b/config/locales/crowdin/js-pl.yml index 05e6b6e28380..106216d4a6fd 100644 --- a/config/locales/crowdin/js-pl.yml +++ b/config/locales/crowdin/js-pl.yml @@ -357,10 +357,10 @@ pl: learn_about: "Dowiedz się więcej o nowych funkcjach" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Wersja wprowadza różne funkcje i ulepszenia, takie jak
    • Ustawianie przypomnień dla pakietów roboczych w celu generowania powiadomień o datach.
    • Tworzenie nowych folderów bezpośrednio z selektora lokalizacji w celu przechowywania plików.
    • Określanie wymaganego odstępu między następcami i poprzednikami pakietów roboczych.
    • Włączanie porządkowania i grupowania pakietów roboczych na podstawie wartości hierarchii typów pól niestandardowych.
    • Eksportowanie wpisów czasu jako kart czasu pracy w formacie PDF.
    • Dodawanie okienka wyskakującego wyświetlającego informacje o użytkowniku po najechaniu nań myszą.
    + W tej wersji wprowadzono różne funkcje i ulepszenia, np.
    • Planowanie spotkań cyklicznych w celu usprawnienia cotygodniowych, codwutygodniowych lub niestandardowych spotkań.
    • Tworzenie podrzędnych pakietów roboczych bezpośrednio z karty Relacje.
    • Uwzględnianie sum w eksportach PDF arkuszy czasu pracy w celu uzyskania lepszych danych analitycznych.
    • Uwzględnianie podrzędnych pakietów roboczych w raportach dotyczących kosztów w celu zwiększenia dokładności śledzenia.
    • Wyświetlanie dat wcześniej ukrytych relacji z ograniczonymi uprawnieniami w celu podejmowania świadomych decyzji dotyczących planowania.
    ical_sharing_modal: title: "Subskrybuj kalendarz" inital_setup_error_message: "Podczas pobierania danych wystąpił błąd." @@ -625,11 +625,11 @@ pl: date_alerts: milestone_date: "Data kamienia milowego" overdue: "Przekroczony termin" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "od %{difference_in_days}." + property_today: "jest dzisiaj." + property_is: "jest za %{difference_in_days}." + property_was: "była %{difference_in_days} temu." + property_is_deleted: "została usunięta." upsale: title: "Alerty dotyczące dat" description: "Dzięki alertom dotyczącym dat będziesz otrzymywać powiadomienia o zbliżających się terminach rozpoczęcia lub zakończenia pracy, dzięki czemu nigdy nie przegapisz ani nie zapomnisz ważnego terminu." diff --git a/config/locales/crowdin/js-pt-BR.yml b/config/locales/crowdin/js-pt-BR.yml index 2642ebebf92c..85ecc37619d7 100644 --- a/config/locales/crowdin/js-pt-BR.yml +++ b/config/locales/crowdin/js-pt-BR.yml @@ -356,10 +356,10 @@ pt-BR: learn_about: "Saiba mais sobre os novos recursos" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - A versão traz vários recursos e melhorias para você, como:
    • Definir lembretes para pacotes de trabalho para gerar notificações de alerta com base em datas.
    • Criar novas pastas diretamente no seletor de local para armazenamento de arquivos.
    • Especificar um intervalo necessário entre sucessores e predecessores de pacotes de trabalho.
    • Habilitar a ordenação e o agrupamento de pacotes de trabalho com base nos valores de campos personalizados do tipo hierarquia.
    • Exportar entradas de tempo como planilhas de horas em PDF.
    • Adicionar um popover exibindo informações do usuário ao passar o mouse.
    + A atualização traz diversas melhorias e novas funcionalidades para você, como:
    • Agendar reuniões recorrentes para facilitar seus compromissos semanais, quinzenais ou personalizados.
    • Criar pacotes de trabalho filhos diretamente na aba Relações.
    • Incluir totais nas exportações em PDF das planilhas de horas para obter mais insights.
    • Incluir pacotes de trabalho filhos nos relatórios de custos para um acompanhamento mais preciso.
    • Visualizar datas de relações anteriormente ocultas, com restrição de permissão, para tomar decisões de agendamento mais informadas.
    ical_sharing_modal: title: "Assinar calendário" inital_setup_error_message: "Ocorreu um erro ao buscar dados." @@ -624,11 +624,11 @@ pt-BR: date_alerts: milestone_date: "Data de marco" overdue: "Atrasado" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "desde %{difference_in_days}." + property_today: "é hoje." + property_is: "está em %{difference_in_days}." + property_was: "há %{difference_in_days}." + property_is_deleted: "foi excluído." upsale: title: "Alertas de data" description: "Com os alertas de data, você receberá uma notificação das futuras datas de início e conclusão, assim você nunca perderá ou esquecerá prazos importante. " diff --git a/config/locales/crowdin/js-pt-PT.yml b/config/locales/crowdin/js-pt-PT.yml index 662b0cbbc045..aed07ab8fd8b 100644 --- a/config/locales/crowdin/js-pt-PT.yml +++ b/config/locales/crowdin/js-pt-PT.yml @@ -357,10 +357,10 @@ pt-PT: learn_about: "Saiba mais sobre os novos recursos" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - A versão traz várias funcionalidades e melhorias para si, por exemplo,
    • Defina lembretes para pacotes de trabalho para gerar notificações de alerta de data.
    • Crie novas pastas diretamente a partir do seletor de localização para armazenamento de ficheiros.
    • Especifique um desfasamento necessário entre os sucessores e os antecessores dos pacotes de trabalho.
    • Ative a ordenação e o agrupamento de pacotes de trabalho com base nos valores da hierarquia de tipos de campos personalizados.
    • Exporte registos de tempo como registos horários em PDF.
    • Adicione uma janela popover que apresenta informações do utilizador ao passar o cursor do rato.
    + A versão traz várias funcionalidades e melhorias para si, por exemplo,
    • Agende reuniões recorrentes para simplificar os seus compromissos semanais, quinzenais ou personalizados.
    • Crie pacotes de trabalho secundários diretamente a partir do separador Relações.
    • Inclua somas totais nas exportações de folhas de horas em PDF para obter melhores informações.
    • Inclua pacotes de trabalho secundários em relatórios de custos para um controlo mais preciso.
    • Veja as datas de relações anteriormente ocultas e com restrições de permissão para tomar decisões de agendamento informadas.
    ical_sharing_modal: title: "Subscrever o calendário" inital_setup_error_message: "Ocorreu um erro ao recuperar os dados." @@ -625,11 +625,11 @@ pt-PT: date_alerts: milestone_date: "Data do marco" overdue: "Em atraso" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "desde %{difference_in_days}." + property_today: "é hoje." + property_is: "é em %{difference_in_days}." + property_was: "foi há %{difference_in_days}." + property_is_deleted: "foi eliminado." upsale: title: "Alertas de data" description: "Com os alertas de data, receberá uma notificação sobre as próximas datas de início e conclusão, para que não nunca perca ou esqueça prazos importantes. " diff --git a/config/locales/crowdin/js-ro.yml b/config/locales/crowdin/js-ro.yml index 74a501e5b0ef..e5cf1ecc3778 100644 --- a/config/locales/crowdin/js-ro.yml +++ b/config/locales/crowdin/js-ro.yml @@ -356,10 +356,10 @@ ro: learn_about: "Aflați mai multe despre noile caracteristici" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-ru.yml b/config/locales/crowdin/js-ru.yml index 816248766a14..9607941012de 100644 --- a/config/locales/crowdin/js-ru.yml +++ b/config/locales/crowdin/js-ru.yml @@ -279,9 +279,9 @@ ru: Хотите продолжить? work_packages_settings: warning_progress_calculation_mode_change_from_status_to_field_html: >- - При изменении расчета прогресса с режима "На основе статуса" на режим "На основе трудозатрат" поле % Завершения станет редактируемым. Если Вы дополнительно введете значения для Работы или Оставшейся работы, они также будут связаны с % Завершения. Изменение значения Оставшейся работы может привести к обновлению % Завершения. + При изменении расчета прогресса с режима "На основе статуса" на режим "На основе трудозатрат" поле % завершения станет редактируемым. Если Вы дополнительно введете значения для Предполагаемого времени или Оставшихся часов, они также будут связаны с % завершения. Изменение значения Оставшихся часов может привести к обновлению % завершения. warning_progress_calculation_mode_change_from_field_to_status_html: >- - При изменении расчета прогресса с режима на основе трудозатрат на режим на основе статуса все существующие значения % Завершения будут потеряны и заменены значениями, связанными с каждым статусом. Существующие значения параметра Оставшаяся работа также могут быть пересчитаны с учетом этого изменения. Это действие необратимо. + При изменении расчета прогресса с режима На основе трудозатрат на режим На основе статуса все существующие значения % завершения будут потеряны и заменены значениями, связанными с каждым статусом. Существующие значения параметра Оставшиеся часы также могут быть пересчитаны с учетом этого изменения. Это действие необратимо. custom_actions: date: specific: "вкл" @@ -356,10 +356,10 @@ ru: learn_about: "Подробнее о новых функциях" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Этот выпуск содержит различные функции и улучшения, например,
    • Установка напоминания для пакетов работ для создания оповещений о дате.
    • Создание новых папок непосредственно из выбора местоположения для хранения файлов.
    • Выбор необходимого интервала между преемниками и предшественниками пакетов работ.
    • Сортировка и группировка пакетов работ по значениям иерархии пользовательских полей.
    • Экспорт записей о времени в виде временных таблиц в формате PDF.
    • Добавлено всплывающее окно, отображающее информацию о пользователе при наведении курсора.
    + Этот выпуск предлагает Вам различные возможности и улучшения, например,
    .
    • Планируйте повторяющиеся совещания, чтобы упростить еженедельные или пользовательские совещания.
    • Создавайте дочерние пакеты работ непосредственно на вкладке Отношения.
    • Включайте итоговые суммы в PDF-экспорт временных таблиц для лучшего понимания.
    • Включайте дочерние пакеты работ в отчеты о затратах для более точного отслеживания.
    • Просматривайте даты ранее скрытых, ограниченных в правах отношений, чтобы принимать обоснованные решения о планировании.
    ical_sharing_modal: title: "Подписаться на календарь" inital_setup_error_message: "Произошла ошибка при получении данных." @@ -415,7 +415,7 @@ ru: label_collapse_all: "Свернуть все" label_comment: "Комментарий" label_committed_at: "%{committed_revision_link} в %{date}" - label_committed_link: "завершенная версия %{revision_identifier}" + label_committed_link: "зафиксированная ревизия %{revision_identifier}" label_contains: "содержит" label_created_on: "создано" label_edit_comment: "Редактировать этот комментарий" @@ -1291,7 +1291,7 @@ ru: modal: title: "Статус исключён из иерархии итогов" content: >- - Статус '%{status_name}' был настроен на исключение из иерархии итогов Работы, Оставшейся работы и % завершения. Итоговые показатели не учитывают это значение. + Статус '%{status_name}' был настроен на исключение из иерархии Предполагаемого времени, Оставшихся часов и % завершения. Итоговые показатели не учитывают это значение. favorite_projects: no_results: "У вас нет избранных проектов" no_results_subtext: "Добавьте один или несколько проектов в избранное через их обзор или в списке проектов." diff --git a/config/locales/crowdin/js-rw.yml b/config/locales/crowdin/js-rw.yml index d17107eb5aab..45ddeeadf690 100644 --- a/config/locales/crowdin/js-rw.yml +++ b/config/locales/crowdin/js-rw.yml @@ -357,10 +357,10 @@ rw: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-si.yml b/config/locales/crowdin/js-si.yml index 2838d8827617..fad34594423e 100644 --- a/config/locales/crowdin/js-si.yml +++ b/config/locales/crowdin/js-si.yml @@ -357,10 +357,10 @@ si: learn_about: "නව විශේෂාංග ගැන වැඩි විස්තර දැනගන්න" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-sk.yml b/config/locales/crowdin/js-sk.yml index 829e714681c2..183a2c0e8778 100644 --- a/config/locales/crowdin/js-sk.yml +++ b/config/locales/crowdin/js-sk.yml @@ -357,10 +357,10 @@ sk: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-sl.yml b/config/locales/crowdin/js-sl.yml index 3333c6e88173..76f938df6d17 100644 --- a/config/locales/crowdin/js-sl.yml +++ b/config/locales/crowdin/js-sl.yml @@ -356,10 +356,10 @@ sl: learn_about: "Preberite več o novostih" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-sr.yml b/config/locales/crowdin/js-sr.yml index cd96824457b8..9c46901074d8 100644 --- a/config/locales/crowdin/js-sr.yml +++ b/config/locales/crowdin/js-sr.yml @@ -357,10 +357,10 @@ sr: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-sv.yml b/config/locales/crowdin/js-sv.yml index 78080ded519b..b72685afbbb5 100644 --- a/config/locales/crowdin/js-sv.yml +++ b/config/locales/crowdin/js-sv.yml @@ -356,10 +356,10 @@ sv: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-th.yml b/config/locales/crowdin/js-th.yml index 97cea053a091..6a4d8889bb1f 100644 --- a/config/locales/crowdin/js-th.yml +++ b/config/locales/crowdin/js-th.yml @@ -357,10 +357,10 @@ th: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-tr.yml b/config/locales/crowdin/js-tr.yml index 3be1991ba0d7..3cde47d6d599 100644 --- a/config/locales/crowdin/js-tr.yml +++ b/config/locales/crowdin/js-tr.yml @@ -60,11 +60,11 @@ tr: close_popup_title: "Açılır pencereyi kapat" close_filter_title: "Filtreyi kapat" close_form_title: "Formu kapat" - button_add_watcher: "Takipçi ekle" + button_add_watcher: "Takip eden ekle" button_add: "Ekle" button_back: "Geri" button_back_to_list_view: "Liste görünümüne geri dön" - button_cancel: "İptal etmek" + button_cancel: "İptal et" button_close: "Kapat" button_change_project: "Başka projeye taşı" button_check_all: "Hepsini kontrol et" @@ -77,7 +77,7 @@ tr: button_copy_to_other_project: "Başka projeye çoğalt" button_custom-fields: "Özel Alanlar" button_delete: "Sil" - button_delete_watcher: "Takipçi sil" + button_delete_watcher: "Takip eden sil" button_details_view: "Ayrıntılar görünümü" button_duplicate: "Çoğalt" button_edit: "Düzenle" @@ -356,13 +356,13 @@ tr: learn_about: "Yeni özellikler hakkında daha fazla bilgi edinin" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Sürüm sizin için çeşitli özellikler ve iyileştirmeler getiriyor, örneğin
    • Tarih uyarısı bildirimleri oluşturmak için iş paketleri için hatırlatıcılar ayarlayın.
    • Dosya depolama için doğrudan konum seçiciden yeni klasörler oluşturun.
    • İş paketleri ardılları ve öncülleri arasında gerekli bir gecikme belirtin.
    • Özel alan türü hiyerarşisinin değerlerine göre iş paketleri için sıralama ve gruplamayı etkinleştirin.
    • Zaman girişlerini PDF zaman çizelgeleri olarak dışa aktarın.
    • Üzerine gelindiğinde kullanıcı bilgilerini görüntüleyen bir açılır pencere ekleyin.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Takvime abone ol" - inital_setup_error_message: "An error occured while fetching data." + inital_setup_error_message: "Veri alınırken bir hata oluştu." description: "You can use the URL (iCalendar) to subscribe to this calendar in an external client and view up-to-date work package information from there." warning: "Please don't share this URL with other users. Anyone with this link will be able to view work package details without an account or password." token_name_label: "Bunu nerede kullanacaksınız?" @@ -456,7 +456,7 @@ tr: label_mail_notification: "E-posta bildirimleri" label_manage_columns: "Sütunları yeniden sırala ve yönet" label_me: "ben" - label_meeting_agenda: "Ajanda" + label_meeting_agenda: "Gündem" label_meeting_minutes: "Dakika" label_menu_collapse: "çöküş" label_menu_expand: "genişlet" @@ -495,7 +495,7 @@ tr: label_save_as: "Farklı Kaydet" label_search_columns: "Bir sütunda arama yap" label_select_project: "Bir proje seçin" - label_select_watcher: "Takipçi seç..." + label_select_watcher: "Takip eden seç..." label_selected_filter_list: "Seçilen filtreler" label_show_attributes: "Tüm öznitelikleri göster" label_show_in_menu: "Görünümü menüde göster" @@ -528,14 +528,14 @@ tr: label_work_package: "İş paketi" label_work_package_parent: "İş paketini oluştur" label_work_package_plural: "İş paketleri" - label_watch: "İzle" - label_watch_work_package: "İş paketini izle" - label_watcher_added_successfully: "Takipçi başarıyla eklendi!" - label_watcher_deleted_successfully: "Takipçi başarıyla silindi!" + label_watch: "Takip et" + label_watch_work_package: "İş paketini takip et" + label_watcher_added_successfully: "Takip eden başarıyla eklendi!" + label_watcher_deleted_successfully: "Takip eden başarıyla silindi!" label_work_package_details_you_are_here: "You are on the %{tab} tab for %{type} %{subject}." label_work_package_context_menu: "İş paketi bağlam menüsü" - label_unwatch: "İzleme" - label_unwatch_work_package: "İş pakaketini izlemeyi bırak" + label_unwatch: "Takip etme" + label_unwatch_work_package: "İş paketini takip etmeyi bırak" label_uploaded_by: "Yükleyen" label_default_queries: "Varsayılan" label_starred_queries: "Sık Kullanılan" @@ -549,7 +549,7 @@ tr: label_add_attachments: "Dosyaları ekle" label_formattable_attachment_hint: "Dosyaları bu alana sürükleyerek ekleyebilir veya panodan yapıştırabilirsiniz." label_remove_file: "%{fileName} Sil" - label_remove_watcher: "%{name} isimli takipçi sil" + label_remove_watcher: "%{name} isimli takip edeni sil" label_remove_all_files: Tüm dosyaları temizle label_add_description: "%{file} için açıklama ekle" label_upload_notification: "Dosyalar yükleniyor..." @@ -600,15 +600,15 @@ tr: team_planner: overview: "Takım planlayıcı, takım üyelerine görsel olarak görevler atamanıza ve kimin ne üzerinde çalıştığına dair bir genel bakış elde etmenize olanak tanır." calendar: "Haftalık veya iki haftalık planlama panosu, ekip üyelerinize atanan tüm iş paketlerini görüntüler." - add_assignee: "Başlamak için ekip planlayıcıya atanan kişileri ekleyin." - add_existing: "Mevcut iş paketlerini arayın ve anında bir ekip üyesine atamak ve başlangıç ve bitiş tarihlerini tanımlamak için bunları ekip planlayıcıya sürükleyin." + add_assignee: "Başlamak için takım planlayıcıya atanan kişileri ekleyin." + add_existing: "Mevcut iş paketlerini arayın ve anında bir ekip üyesine atamak ve başlangıç ve bitiş tarihlerini tanımlamak için bunları takım planlayıcıya sürükleyin." card: "İş paketlerini zamanda geriye veya ileriye taşımak için yatay olarak sürükleyin, başlangıç ve bitiş tarihlerini değiştirmek için kenarları sürükleyin ve hatta başka bir üyeye atamak için farklı bir satıra dikey olarak sürükleyin." notifications: title: "Bildirimler" no_unread: "Okunmamış bildirim yok" reasons: mentioned: "Bahsedilen" - watched: "Takipçi" + watched: "Takip edilen" assigned: "Atanan" #The enum value is named 'responsible' in the database and that is what is transported through the API #up to the frontend. @@ -648,13 +648,13 @@ tr: no_notification: "Görünüşe göre yapacağınız bir şey kalmadı." no_notification_with_current_project_filter: "Görünüşe göre seçili proje için yapacağınız bir şey kalmadı." no_notification_with_current_filter: "Görünüşe göre %{filter} filtresi için yapacağınız bir şey kalmadı." - no_notification_for_filter: "Looks like you are all caught up for this filter." + no_notification_for_filter: "Görünüşe göre bu filtre için her şey tamam." no_selection: "Tüm etkinlik ayrıntılarını görüntülemek için bir bildirime tıklayın." new_notifications: message: "Yeni bildirimler var" link_text: "Yüklemek için buraya tıklayın." reminders: - note: "Note: “%{note}”" + note: "Not: \"%{note}\"" settings: change_notification_settings: 'Önemli bir güncellemeyi asla kaçırmamak için bildirim ayarlarınızı değiştirebilirsiniz.' title: "Bildirim ayarları" @@ -678,7 +678,7 @@ tr: assignee: "Atanan" responsible: "Sorumlu" shared: "Shared" - watched: "İzleyici" + watched: "Takip eden" work_package_commented: "Tüm yeni yorumlar" work_package_created: "Yeni iş paketleri" work_package_processed: "Tüm durum değişiklikleri" @@ -720,7 +720,7 @@ tr: required_outside_context: > Lütfen tüm özellikleri görmek için çalışma paketini oluşturacak bir proje seçin. Yalnızca yukarıdaki türden etkin olan projeleri seçebilirsiniz. context: "Proje içeriği" - click_to_switch_to_project: "Project: %{projectname}" + click_to_switch_to_project: "Proje: %{projectname}" confirm_template_load: "Şablonu değiştirmek sayfayı yeniden yükleyecek ve bu forma yaptığınız tüm girişleri kaybedeceksiniz. Devam et?" use_template: "Şablon kullan" no_template_selected: "(Yok)" @@ -731,7 +731,7 @@ tr: reminders: settings: daily: - add_time: "Süre ekle" + add_time: "Zaman ekle" enable: "Günlük e-posta hatırlatıcılarını etkinleştir" explanation: "Bu hatırlatıcıları yalnızca okunmamış bildirimler için ve yalnızca sizin belirlediğiniz saatlerde alacaksınız. %{no_time_zone}" no_time_zone: "Hesabınız için bir saat dilimi yapılandırana kadar, saatler UTC olarak yorumlanacaktır." @@ -788,12 +788,12 @@ tr: two_factor_authentication: label_two_factor_authentication: "İki faktörlü kimlik doğrulama" watchers: - label_loading: takipçiler yükleniyor... - label_error_loading: Takipçileri yüklerken bir hata oluştu - label_search_watchers: Takipçi arama - label_add: Takipçi ekle + label_loading: takip edenler yükleniyor... + label_error_loading: Takip edenleri yüklerken bir hata oluştu + label_search_watchers: Takip eden arama + label_add: Takip eden ekle label_discard: Seçimi gözardı et - typeahead_placeholder: Olası takipçiler için arayın + typeahead_placeholder: Olası takip edenler için arayın relation_labels: parent: "Üst" children: "Çocuk" @@ -832,7 +832,7 @@ tr: update_description: "Bu ilişkinin açıklamasını güncelle" toggle_description: "İlişki açıklamasını göster" update_relation: "İlişki türünü değiştirmek için tıklayın" - add_follower: "Takipçi ekle" + add_follower: "Takip eden ekle" show_relations: "İlişkileri göster" add_predecessor: "Öncül ekle" remove: "İlişkiyi kaldır" @@ -974,7 +974,7 @@ tr: createdAt: "Oluşturma tarihi" description: "Açıklama" date: "Tarih" - percentComplete: "% Tamamlandı" + percentComplete: "Tamamlanma yüzdesi" percentCompleteAlternative: "İlerleme" dueDate: "Bitiş tarihi" duration: "Süre" @@ -1087,7 +1087,7 @@ tr: sorting_mode: description: "İş paketlerinizi sıralamak için modu seçin:" automatic: "Otomatik" - manually: "el ile" + manually: "Elle" warning: "Otomatik sıralama modunu etkinleştirirken önceki sıralamanızı kaybedeceksiniz." columns_help_text: "Tablo görünümünüze sütun eklemek için yukarıdaki giriş alanını kullanın. Sütunları yeniden sıralamak için sürükleyip bırakabilirsiniz." upsale: @@ -1132,7 +1132,7 @@ tr: button_apply: "Uygula" button_save: "Kaydet" button_submit: "Gönder" - button_cancel: "İptal etmek" + button_cancel: "İptal et" button_delete: "Sil" form_submit: title: "Devam etmek için onaylayın" @@ -1161,7 +1161,7 @@ tr: button_save: "%{attribute}: Kaydet" button_cancel: "%{attribute}: İptal" button_save_all: "Kaydet" - button_cancel_all: "İptal etmek" + button_cancel_all: "İptal et" link_formatting_help: "Metin biçimlendirme yardım" btn_preview_enable: "Ön İzleme" btn_preview_disable: "Öngörüntülemeyi devre dışı bırak" @@ -1311,7 +1311,7 @@ tr: show_changes_since: "Şu zamandan sonraki değişiklikleri göster" baseline_comparison: "Baseline comparison" help_description: "Reference time zone for the baseline." - time_description: "In your local time: %{datetime}" + time_description: "Yerel saatinizle: %{datetime}" time: "Saat" from: "Başlangıç" to: "Bitiş" @@ -1324,16 +1324,16 @@ tr: a_specific_date: "belirli bir tarih" between_two_specific_dates: "iki belirli tarih arasında" legends: - changes_since: "Changes since" - changes_between: "Changes between" - now_meets_filter_criteria: "Şimdi filtre kriterlerini karşılıyor" + changes_since: "Şu zamandan beri değişiklikler" + changes_between: "Arasındaki değişiklikler" + now_meets_filter_criteria: "Artık filtre kriterlerini karşılıyor" no_longer_meets_filter_criteria: "Artık filtre kriterlerini karşılamıyor" - maintained_with_changes: "Maintained with changes" - in_your_timezone: "In your local timezone:" + maintained_with_changes: "Değişikliklerle sürdürüldü" + in_your_timezone: "Yerel saat diliminizde:" icon_tooltip: added: "Added to view within the comparison time period" removed: "Removed from view within the comparison time period" - changed: "Maintained with modifications" + changed: "Değişiklikler ile sürdürüldü" forms: submit_success_message: "Form başarıyla gönderildi" load_error_message: "Form yüklenirken bir hata oluştu" @@ -1344,7 +1344,7 @@ tr: remove: "Kaldır" drop_modal: focus_grab: "Bu, modallar için bir odak noktasıdır. Modal tetikleme öğesine geri dönmek için shift+tab tuşlarına basın." - close: "Close modal" + close: "Ekranı kapat" open_project_storage_modal: waiting_title: timeout: "Zaman Aşımı" diff --git a/config/locales/crowdin/js-uk.yml b/config/locales/crowdin/js-uk.yml index 1cbdcfaca0c6..2a7d13527c07 100644 --- a/config/locales/crowdin/js-uk.yml +++ b/config/locales/crowdin/js-uk.yml @@ -357,10 +357,10 @@ uk: learn_about: "Дізнатися більше про нові функції" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - Цей випуск включає багато нових функцій і покращень.
    • Установлюйте нагадування для пакетів робіт, щоб отримувати завчасні сповіщення.
    • Створюйте нові папки безпосередньо під час вибору місця зберігання файлу в сховищі.
    • Указуйте обов’язковий проміжок часу між нащадками й попередниками пакетів робіт.
    • Дозвольте впорядковувати й групувати пакети робіт за значеннями ієрархії користувацьких полів.
    • Експортуйте записи часу у вигляді таблиць обліку часу в PDF.
    • Налаштуйте появу спливних вікон з інформацією про користувача в разі наведення вказівника миші.
    + Цей випуск включає багато нових функцій і покращень.
    • Плануйте повторювані наради, щоб оптимізувати зустрічі, що повторюються щотижня, раз на два тижні або з власним інтервалом.
    • Створюйте дочірні пакети робіт безпосередньо на вкладці «Зв’язки».
    • Включайте підсумки в експортовані PDF-файли табелів робочого часу, щоб отримувати корисніші дані.
    • Включайте дочірні пакети робіт у звіти про витрати для точнішого відстеження руху коштів.
    • Переглядайте дати раніше прихованих зв’язків або тих, доступ до яких обмежено дозволами, щоб ухвалювати зваженіші рішення щодо планування.
    ical_sharing_modal: title: "Підписатися на календар" inital_setup_error_message: "Під час отримання даних сталася помилка." @@ -625,11 +625,11 @@ uk: date_alerts: milestone_date: "Дата віхи" overdue: "Прострочено" - overdue_since: "since %{difference_in_days}." - property_today: "is today." - property_is: "is in %{difference_in_days}." - property_was: "was %{difference_in_days} ago." - property_is_deleted: "is deleted." + overdue_since: "%{difference_in_days}." + property_today: "сьогодні." + property_is: "через %{difference_in_days}." + property_was: "%{difference_in_days} тому." + property_is_deleted: "видалено." upsale: title: "Оповіщення про дати" description: "Завдяки оповіщенням про дати ви завжди знатимете про заплановані дати початку або завершення, тож ніколи не пропускатимете важливі терміни та не забуватимете про них." diff --git a/config/locales/crowdin/js-uz.yml b/config/locales/crowdin/js-uz.yml index 914d3bf171d7..02c2bfffd0cf 100644 --- a/config/locales/crowdin/js-uz.yml +++ b/config/locales/crowdin/js-uz.yml @@ -357,10 +357,10 @@ uz: learn_about: "Learn more about the new features" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Subscribe to calendar" inital_setup_error_message: "An error occured while fetching data." diff --git a/config/locales/crowdin/js-vi.yml b/config/locales/crowdin/js-vi.yml index 602b96823ca2..c05bce167db4 100644 --- a/config/locales/crowdin/js-vi.yml +++ b/config/locales/crowdin/js-vi.yml @@ -357,10 +357,10 @@ vi: learn_about: "Tìm hiểu thêm về các tính năng mới" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - The release brings various features and improvements for you, e.g.
    • Set reminders for work packages to generate date alert notifications.
    • Create new folders directly from the location picker for file storage.
    • Specify a required lag between work packages successors and predecessors.
    • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
    • Export time entries as PDF timesheets.
    • Add a popover displaying user information when hovering.
    + The release brings various features and improvements for you, e.g.
    • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
    • Create child work packages directly from the Relations tab.
    • Include total sums in timesheet PDF exports for better insights.
    • Include child work packages in cost reports for more accurate tracking.
    • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
    ical_sharing_modal: title: "Đăng ký lịch" inital_setup_error_message: "Đã xảy ra lỗi khi lấy dữ liệu." diff --git a/config/locales/crowdin/js-zh-CN.yml b/config/locales/crowdin/js-zh-CN.yml index de5dfeef4b38..a3cd8450917a 100644 --- a/config/locales/crowdin/js-zh-CN.yml +++ b/config/locales/crowdin/js-zh-CN.yml @@ -356,10 +356,10 @@ zh-CN: learn_about: "详细了解新功能" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - 该版本为您带来了各种功能和改进，例如
    • 为工作包设置提醒，生成日期提醒通知。
    • 直接从文件存储位置选择器创建新文件夹。
    • 在前置工作包和后置工作包之间指定所需的间隔。
    • 根据自定义字段类型层次结构的值对工作包进行排序和分组。
    • 将时间条目导出为 PDF时间表。
    • 添加弹出窗，在鼠标悬停时显示用户信息。
    + 该版本为您带来了各种功能和改进，例如：
    • 安排定期会议，以简化您的每周、每两周或自定义预约。
    • 直接从“关系”选项卡创建子工作包。
    • 在时间表 PDF 导出中包含总和，以获得更好的洞察。
    • 在成本报告中包括子工作包，以实现更准确的跟踪。
    • 查看以前隐藏的权限限制关系的日期，以便做出明智的日程安排决策。
    ical_sharing_modal: title: "订阅日历" inital_setup_error_message: "获取数据时发生错误。" diff --git a/config/locales/crowdin/js-zh-TW.yml b/config/locales/crowdin/js-zh-TW.yml index fdc1573996aa..aec693f012ba 100644 --- a/config/locales/crowdin/js-zh-TW.yml +++ b/config/locales/crowdin/js-zh-TW.yml @@ -355,10 +355,10 @@ zh-TW: learn_about: "瞭解更多新功能的資訊" #Include the version to invalidate outdated translations in other locales. #Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > - 該版本為您帶來了各種功能和改進，例如
    • 為工作項目設定提醒，產生日期提示通知。
    • 直接從選擇位置建立新資料夾，以儲存檔案。
    • 指定工作項目與前後項之間所需的間隔時間。
    • 根據自訂欄位類型層級的值，啟用工作項目的排序和群組。
    • 匯出時間項目為 PDF 工時表。
    • 新增在滑鼠懸停時會顯示使用者資訊的彈出視窗。
    + 該版本為您帶來了各種功能和改進，例如
    • 排定定期會議，簡化您每週、每兩週或自訂的會議。
    • 直接從「關係」標籤建立子工作項目。
    • 在時間表 PDF 匯出中包含總和，以獲得更好的洞察力。
    • 在成本報告中包含子工作項目，以進行更精確的追蹤。
    • 查看先前隱藏的、受權限的關係的日期，以做出明智的排程決策。
    ical_sharing_modal: title: "訂閱日曆" inital_setup_error_message: "更新資料時發生錯誤" diff --git a/config/locales/crowdin/ka.yml b/config/locales/crowdin/ka.yml index b69d6e3eb926..b2f6285bcb38 100644 --- a/config/locales/crowdin/ka.yml +++ b/config/locales/crowdin/ka.yml @@ -229,6 +229,10 @@ ka: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ ka: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ ka: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ ka: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ ka: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ ka: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ ka: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ ka: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: მოსაწვევი account: delete: "ანგარიშის წაშლა" @@ -790,6 +804,7 @@ ka: is_required: "აუცილებელია" max_length: "მაქსიმალური სიგრძე" min_length: "მინიმალური სიგრძე" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ ka: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "ჰოსტი" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ ka: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "სვეტები" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ ka: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "სამუშაო პაკეტი" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ ka: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ ka: button_copy_and_follow: "Copy and follow" button_create: "შექმნა" button_create_and_continue: "Create and continue" - button_delete: "წაშლა" button_decline: "უარყოფა" + button_delete: "წაშლა" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "გადმოწერა" button_duplicate: "დუბლირება" @@ -1765,6 +1790,9 @@ ka: hour: one: "საათი" other: "საათი" + day: + one: "day" + other: "days" description_active: "აქტიურია?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ ka: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ ka: label_add_subtask: "ქვეამოცანის დამატება" label_added: "დამატებულია" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ ka: label_project_new: "ახალი პროექტი" label_project_plural: "პროექტები" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ ka: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "ახალი ურთიერთობა" label_release_notes: "გამოშვების შენიშვნები" label_remaining_work: "დარჩენილი სამუშაო" @@ -3024,6 +3059,7 @@ ka: notice_bad_request: "არასწორი მოთხოვნა." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ ka: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "შენიშვნების დამატება" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "შეტყობინებების დაწერა" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ ka: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "შენიშვნების ჩასწორება" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "შეტყობინებების ჩასწორება" - permission_edit_own_work_package_notes: "საკუთარი შენიშვნების ჩასწორება" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "პროექტის ჩასწორება" @@ -3198,9 +3235,9 @@ ka: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "დაარქივებულია" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "აქტივობა" project_module_forums: "ფორუმები" project_module_work_package_tracking: "სამუშაო პაკეტები" @@ -3334,6 +3371,7 @@ ka: activated: "გააქტიურებულია" deactivated: "დეაქტივირებული" search_input_placeholder: "ძებნა..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "CORS-ის ჩართვა" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ ka: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ ka: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ ka: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ ka: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/kk.yml b/config/locales/crowdin/kk.yml index c49f53b9e5cf..902be8b1efe8 100644 --- a/config/locales/crowdin/kk.yml +++ b/config/locales/crowdin/kk.yml @@ -229,6 +229,10 @@ kk: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ kk: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ kk: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ kk: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ kk: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ kk: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ kk: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ kk: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ kk: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ kk: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ kk: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ kk: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ kk: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ kk: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ kk: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ kk: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ kk: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ kk: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ kk: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ kk: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ kk: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ kk: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ kk: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ kk: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ kk: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ kk: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ kk: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ kk: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/ko.yml b/config/locales/crowdin/ko.yml index ccf949e3260a..479278ba3b50 100644 --- a/config/locales/crowdin/ko.yml +++ b/config/locales/crowdin/ko.yml @@ -229,6 +229,10 @@ ko: item: title: 이 항목에는 아래 계층 수준이 없습니다 description: 이 목록에 항목을 추가하여 다른 목록 내에서 하위 항목을 만듭니다 + delete_dialog: + title: "사용자 지정 필드 항목 삭제" + heading: "사용자 지정 필드 항목을 삭제하시겠습니까?" + description: "이 작업을 수행하면 해당 항목과 모든 하위 항목이 제거되며 되돌릴 수 없습니다. 할당된 모든 값이 영구적으로 삭제됩니다. 이 필드가 필수인 경우 항목을 제거하면 기존 작업 패키지가 무효하게 될 수 있습니다." placeholder: label: "항목 레이블" short: "짧은 이름" @@ -249,6 +253,7 @@ ko: confirm_destroy_option: "옵션을 삭제하면 모든 해당 항목(예: 작업 패키지 내 모든 항목)이 삭제됩니다. 그래도 삭제하시겠습니까?" reorder_alphabetical: "알파벳순으로 값 재정렬" reorder_confirmation: "경고: 사용 가능한 값의 현재 순서가 손실됩니다. 계속하시겠습니까?" + placeholder_version_select: "먼저 작업 패키지 또는 프로젝트를 선택해야 합니다" instructions: is_required: "사용자 지정 필드를 필수로 표시합니다. 이렇게 하면 새 리소스를 생성하거나 기존 리소스를 업데이트할 때 이 필드를 반드시 입력해야 합니다." is_required_for_project: "이 특성을 활성화하려면 선택하고 모든 프로젝트에서 필수로 지정하세요. 개별 프로젝트에 대해 비활성화할 수는 없습니다." @@ -287,6 +292,7 @@ ko: label: "레이블" short: "짧은 이름" parent: "부모" + blueprint: "패턴 청사진" global_search: placeholder: "%{app_title}에서 검색" overwritten_tabs: @@ -462,6 +468,7 @@ ko: my: access_token: create_dialog: + title: 토큰 생성됨 header: '%{type} 토큰이 생성되었습니다.' warning: 이번에만 이 토큰이 표시됩니다. 지금 이 토큰을 복사해야 합니다. errors: @@ -636,6 +643,7 @@ ko: title: "작업 패키지 공유에 대한 워크플로 누락" message: "'작업 패키지 편집자' 역할에 대해 구성된 워크플로가 없습니다. 워크플로가 없으면 사용자와 공유된 워크플로는 작업 패키지의 상태를 변경할 수 없습니다. 워크플로를 복사할 수는 있습니다. 소스 유형(예: '작업')과 소스 역할(예: '멤버')을 선택하세요. 그런 다음 대상 유형을 선택하세요. 시작하기 위해 모든 유형을 대상으로 선택할 수 있습니다. 마지막으로 '작업 패키지 편집자' 역할을 대상으로 선택하고 '복사'를 누르세요. 기본값을 생성한 후 다른 모든 역할에 대해 수행하는 것처럼 워크플로를 미세 조정하세요." link_message: "관리에서 워크플로를 구성하세요." + templated_subject_hint: '%{type} 유형을 통해 자동으로 생성됨' summary: reports: category: @@ -658,14 +666,15 @@ ko: no_results_title_text: 현재 사용 가능한 관계가 없습니다. blankslate_heading: "관계 없음" blankslate_description: "이 작업 패키지에는 아직 관계가 없습니다." + label_add_child_button: "자식" label_add_x: "%{x} 추가" label_edit_x: "%{x} 편집" label_add_description: "설명 추가" lag: subject: "지연" - title: "지연(일)" caption: "두 작업 패키지 간에 유지할 최소 근무일 수입니다." relations: + label_new_child_created: "새로운 작업 패키지를 만들고 자식으로 추가함" label_relates_singular: "관련 항목" label_relates_plural: "관련 항목" label_relates_to_singular: "관련 항목" @@ -680,6 +689,9 @@ ko: follows_description: "이 패키지를 시작하려면 관련 작업 패키지가 반드시 먼저 완료되어야 합니다" label_child_singular: "자식" label_child_plural: "자식" + new_child: "새로운 자식" + new_child_text: "관련 작업 패키지를 현재(부모) 작업 패키지의 하위 항목으로 만듭니다" + existing_child: "기존 자식" child_description: "관련 작업 패키지를 현재(부모) 작업 패키지의 하위 항목으로 만듭니다" label_blocks_singular: "블록" label_blocks_plural: "블록" @@ -716,6 +728,8 @@ ko: required_description: "이 작업 패키지를 관련 패키지에 대한 요구 사항으로 표시합니다" label_parent_singular: "부모" label_parent_plural: "부모" + ghost_relation_title: "관련 작업 패키지" + ghost_relation_description: "권한 문제로 인해 이 항목이 표시되지 않습니다." label_invitation: 초대 account: delete: "계정 삭제" @@ -780,6 +794,7 @@ ko: is_required: "필수" max_length: "최대 길이" min_length: "최소 길이" + content_right_to_left: "오른쪽에서 왼쪽 콘텐츠" multi_value: "다중 선택 허용" possible_values: "가능한 값" regexp: "정규 표현식" @@ -815,6 +830,8 @@ ko: attr_lastname: "성 특성" attr_login: "사용자 이름 특성" attr_mail: "이메일 특성" + filter_string: "필터 문자열" + admin: "관리자" base_dn: "기본 DN" host: "호스트" onthefly: "자동 사용자 생성" @@ -858,6 +875,9 @@ ko: project_custom_field: is_required: "모든 프로젝트에 필수" custom_field_section: 섹션 + project/life_cycle_step_definition: + name: "이름" + color: "색상" query: column_names: "컬럼" relations_to_type_column: "%{type}에 대한 관계" @@ -867,7 +887,7 @@ ko: timeline_labels: "타임라인 레이블" relation: lag: "지연" - from: "작업 패키지" + from: "관련 작업 패키지" to: "관련 패키지" reminder: remind_at_date: "날짜" @@ -1191,12 +1211,16 @@ ko: typed_dag: circular_dependency: "이 관계는 관계의 원을 만듭니다." attributes: - to: - error_not_found: "'끝' 위치의 작업 패키지가 없거나 표시되지 않음" - error_readonly: "기존 관계의 '끝' 링크는 변경이 불가능합니다." - from: - error_not_found: "'시작' 위치의 작업 패키지가 없거나 표시되지 않음" - error_readonly: "기존 관계의 '시작' 링크는 변경이 불가능합니다." + to_id: + error_not_found: "- 찾을 수 없거나 표시되지 않습니다." + error_readonly: "- 기존 관계에 대해서는 변경할 수 없습니다." + from_id: + error_not_found: "- 찾을 수 없거나 표시되지 않습니다." + error_readonly: "- 기존 관계에 대해서는 변경할 수 없습니다." + lag: + greater_than_or_equal_to: + zero: "- 음수일 수 없습니다." + less_than_or_equal_to: "- 너무 높습니다." repository: not_available: "SCM 업체가 가용하지 않습니다." not_whitelisted: "은(는) 설절에 허용되지 않습니다." @@ -1541,8 +1565,9 @@ ko: button_copy_and_follow: "복사하고 따라가기" button_create: "만들기" button_create_and_continue: "만들고 계속하기" - button_delete: "삭제" button_decline: "거부" + button_delete: "삭제" + button_delete_permanently: "영구 삭제" button_delete_watcher: "주시자 %{name} 삭제" button_download: "다운로드" button_duplicate: "복제" @@ -1727,6 +1752,8 @@ ko: units: hour: other: "시간" + day: + other: "일" description_active: "활성?" description_attachment_toggle: "첨부 파일 표시/숨기기" description_autocomplete: > @@ -1762,6 +1789,10 @@ ko: upsale: title: "Enterprise 추가 기능" link_title: "추가 정보" + automatic_subject_generation: + description: "참조된 특성과 텍스트를 사용하여 자동으로 생성되는 제목을 만듭니다." + customize_life_cycle: + description: "PM2 프로젝트 사이클 계획에서 제공하는 것과는 다른 프로젝트 단계와 게이트를 만들고 구성합니다." form_configuration: description: "다음과 같은 기타 추가 기능으로 양식 구성을 사용자 지정하세요." add_groups: "새로운 특성 그룹 추가" @@ -2124,6 +2155,7 @@ ko: label_add_subtask: "하위 작업 추가" label_added: "추가됨" label_added_by: "%{author} 님이 추가함" + label_added_by_on: "추가함: %{author}, %{date}" label_added_time_by: "%{author}이(가) %{age} 전에 추가함" label_additional_workflow_transitions_for_assignee: "사용자가 담당자일 때 허용되는 추가 전환" label_additional_workflow_transitions_for_author: "사용자가 작성자일 때 허용되는 추가 전환" @@ -2544,6 +2576,7 @@ ko: label_project_new: "새 프로젝트" label_project_plural: "프로젝트" label_project_list_plural: "프로젝트 목록" + label_project_lifecycle: "프로젝트 수명 주기" label_project_attributes_plural: "프로젝트 특성" label_project_custom_field_plural: "프로젝트 특성" label_project_settings: "프로젝트 설정" @@ -2570,6 +2603,7 @@ ko: label_relation: "관계" label_relation_actions: "관계 작업" label_relation_delete: "관계 삭제" + label_relation_edit: "관계 편집" label_relation_new: "새 관계" label_release_notes: "릴리스 노트" label_remaining_work: "남은 작업" @@ -2985,6 +3019,7 @@ ko: notice_bad_request: "잘못된 요청입니다." notice_not_authorized: "이 페이지에 액세스할 권한이 없습니다." notice_not_authorized_archived_project: "액세스하려는 프로젝트는 이미 보관되어 있습니다." + notice_requires_enterprise_token: "Enterprise 토큰이 누락되었거나 이 페이지에 대한 액세스를 허용하지 않습니다." notice_password_confirmation_failed: "암호가 올바르지 않습니다. 계속할 수 없습니다." notice_principals_found_multiple: "%{number} 개의 결과가 발견되었습니다.\n첫번째 결과를 보려면 탭 해주세요." notice_principals_found_single: "한 개의 결과가 있습니다.\n보려면 탭 해주세요." @@ -3031,7 +3066,7 @@ ko: text_getting_started_description: "OpenProject로 프로젝트 관리 및 팀 공동 작업에 대한 간략한 개요를 가져올 수 있습니다. 도움말 메뉴에서 이 동영상을 다시 시작할 수 있습니다." welcome: "%{app_title}입니다." select_language: "언어를 선택하세요." - permission_add_work_package_notes: "메모 추가" + permission_add_work_package_notes: "코멘트 추가" permission_add_work_packages: "작업 패키지 추가" permission_add_messages: "메시지 게시" permission_add_project: "프로젝트 만들기" @@ -3061,10 +3096,11 @@ ko: permission_delete_timelines: "타임라인 삭제" permission_delete_wiki_pages: "위키 페이지 삭제" permission_delete_wiki_pages_attachments: "첨부 파일 삭제" - permission_edit_work_package_notes: "메모 편집" + permission_edit_work_package_notes: "코멘트 조정" + permission_edit_work_package_notes_explanation: "주의: 이 권한이 있는 사용자는 다른 사용자의 코멘트를 편집할 수 있습니다." permission_edit_work_packages: "작업 패키지 편집" permission_edit_messages: "메시지 편집" - permission_edit_own_work_package_notes: "내 메모 편집" + permission_edit_own_work_package_notes: "내 코멘트 편집" permission_edit_own_messages: "내 메시지 편집" permission_edit_own_time_entries: "내 시간 로그 편집" permission_edit_project: "프로젝트 편집" @@ -3291,6 +3327,7 @@ ko: activated: "활성화됨" deactivated: "비활성화됨" search_input_placeholder: "검색..." + setting_apiv3_cors_title: "CORS(크로스 원본 리소스 공유)" setting_apiv3_cors_enabled: "CORS 사용" setting_apiv3_cors_origins: "API V3 CORS(크로스-원본 리소스 공유) 허용 원본" setting_apiv3_cors_origins_text_html: > @@ -3516,6 +3553,27 @@ ko: new: heading: "새 특성" description: "이 프로젝트 특성에 대한 변경 사항은 이 특성이 활성화된 모든 프로젝트에 반영됩니다. 필수 특성은 프로젝트별로 비활성화할 수 없습니다." + project_life_cycle_step_definitions: + heading: "프로젝트 수명 주기" + heading_description: "프로젝트 수명 주기는 프로젝트를 구조화하는 단계 및 게이트로 구성됩니다. 이는 프로젝트의 개요 페이지에 나타나고 프로젝트 목록에서 사용할 수 있습니다. 개별 단계 및 게이트를 선택하여 프로젝트를 사용자 지정할 수 있지만 프로젝트 레벨에서 재정렬할 수는 없습니다." + label_add: "추가" + label_add_description: "수명 주기 정의 추가" + label_add_stage: "단계" + label_add_gate: "게이트" + filter: + label: "프로젝트 단계 또는 게이트 검색" + section_header: "단계 및 게이트" + non_defined: "단계나 게이트가 현재 정의되어 있지 않습니다." + new: + description: "이 프로젝트 단계의 변경 사항은 이 단계가 활성화된 모든 프로젝트에 반영됩니다." + new_stage: + heading: "새 단계" + new_gate: + heading: "새 게이트" + edit_stage: + heading: "단계 편집" + edit_gate: + heading: "게이트 편집" projects: missing_dependencies: "%{dependencies}에 의존하는 프로젝트 모듈 %{module}이(가) 확인되었습니다. 이러한 종속성도 확인해야 합니다." section_new_projects: "새 프로젝트의 설정" @@ -3549,6 +3607,7 @@ ko: text_are_you_sure_continue: "계속하시겠습니까?" text_are_you_sure_with_children: "작업 패키지 및 모든 자식 작업 패키지를 삭제하시겠습니까?" text_are_you_sure_with_project_custom_fields: "이 특성을 삭제하면 모든 프로젝트에서 해당 값도 삭제됩니다. 계속하시겠습니까?" + text_are_you_sure_with_project_life_cycle_step: "이 단계를 삭제하면 모든 프로젝트에서 해당 사용도 삭제됩니다. 계속하시겠습니까?" text_assign_to_project: "프로젝트에 할당" text_form_configuration: > 작업 패키지 양식으로 표시할 필드를 사용자 지정할 수 있습니다. 해당 도메인의 요구 사항을 반영하도록 필드를 자유롭게 그룹화할 수 있습니다. @@ -3628,6 +3687,7 @@ ko: text_notice_security_badge_displayed_html: > 참고: 활성화하는 경우, %{information_panel_label} 관리 패널 및 홈페이지에서 설치 상태가 나오는 배지가 표시됩니다. 배지는 관리자에게만 표시됩니다.
    배지는 공식 OpenProject 릴리스 데이터베이스와 비교하여 현재 OpenProject 버전을 확인하고 업데이트 또는 알려진 취약성에 대해 알려줍니다. 이 검사에서 제공하는 사항, 사용 가능한 업데이트를 제공하기 위해 필요한 데이터 및 이 검사를 비활성화하는 방법에 대한 자세한 내용은 구성 문서를 참조하십시오. text_own_membership_delete_confirmation: "권한의 일부 또는 전부를 삭제하려고 합니다. 이렇게 한 후에는 이 프로젝트를 더 이상 편집하지 못할 수 있습니다.\n계속하시겠습니까?" + text_permanent_delete_confirmation_checkbox_label: "이 삭제는 되돌릴 수 없음을 이해합니다." text_plugin_assets_writable: "플러그인 자산 디렉터리 쓰기 가능" text_powered_by: "%{link} 제공" text_project_identifier_info: "소문자(a-z), 숫자, 대시(-) 및 밑줄(_)만 허용됩니다. 소문자로 시작해야 합니다." @@ -3995,6 +4055,8 @@ ko: builtin: 기본 제공 인스턴스 애플리케이션 confidential: 기밀 singular: "OAuth 애플리케이션" + scopes: "범위" + client_credentials: "클라이언트 자격 증명" plural: "OAuth 애플리케이션" named: "OAuth 애플리케이션 '%{name}'" new: "새로운 OAuth 애플리케이션" diff --git a/config/locales/crowdin/lt.yml b/config/locales/crowdin/lt.yml index dc72b1b5408f..54408d710378 100644 --- a/config/locales/crowdin/lt.yml +++ b/config/locales/crowdin/lt.yml @@ -226,6 +226,10 @@ lt: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -246,6 +250,7 @@ lt: confirm_destroy_option: "Ištrinant savybę, visi jos panaudojimai (pvz., darbų paketuose) taip pat bus ištrinti. Ar Jūs tikrai norite ištrinti?" reorder_alphabetical: "Perrikiuoti reikšmes alfabeto tvarka" reorder_confirmation: "Dėmesio: Dabartinė galimų reikšmių tvarka bus prarasta. Tęsti?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Pažymėti savo lauką kaip privalomą. Taip bus privaloma jį užpildyti kuriant ar atnaujinant esamus resursus." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -284,6 +289,7 @@ lt: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Ieškoti %{app_title}" overwritten_tabs: @@ -480,6 +486,7 @@ lt: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -661,6 +668,7 @@ lt: title: "Darbo paketo dalinimuisi trūksta darbo proceso" message: "Vaidmeniui „Darbo paketo redaktorius“ nesukonfigūruotas procesas. Be proceso naudotojas negali pakeisti darbo paketo būsenos. Procesą galima nukopijuoti. Parinkite šaltinio tipą („pvz. „Užduotis“) ir šaltinio vaidmenį (pvz. „Narys“). Tada parinkite paskirties tipus. Pradžiai galėtumėte kaip paskirtį parinkti visus tipus. Galų gale parinkite vaidmenį „Darbo paketų redaktorius“ kaip paskirtį ir spauskite „Kopijuoti“. Taip sukūrę numatytąjį variantą, patikslinkite procesus kaip tai darote su kitais vaidmenimis." link_message: "Konfigūruokite procesus administravime." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -683,14 +691,15 @@ lt: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -705,6 +714,9 @@ lt: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -741,6 +753,8 @@ lt: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Pakvietimas account: delete: "Pašaslinti paskyrą" @@ -805,6 +819,7 @@ lt: is_required: "Būtinas" max_length: "Maksimalus ilgis" min_length: "Minimalus ilgis" + content_right_to_left: "Right-to-Left content" multi_value: "Leisti daugybinio žymėjimo galimybę" possible_values: "Galimos reikšmės" regexp: "Reguliari išraiška" @@ -840,6 +855,8 @@ lt: attr_lastname: "Pavardės atributas" attr_login: "Naudotojo atributas" attr_mail: "El. paštos atributas" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Bazinis DN" host: "Serveris" onthefly: "Automatinis naudotojų kūrimas" @@ -883,6 +900,9 @@ lt: project_custom_field: is_required: "Required for all projects" custom_field_section: Skiltis + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Stulpeliai" relations_to_type_column: "Ryšiai su %{type}" @@ -892,7 +912,7 @@ lt: timeline_labels: "Laiko juostos etiketės" relation: lag: "Vėlavimas" - from: "Darbų paketas" + from: "Related work package" to: "Susijusių darbų paketas" reminder: remind_at_date: "Date" @@ -1216,12 +1236,16 @@ lt: typed_dag: circular_dependency: "Ryšys sukuria ryšių ciklą." attributes: - to: - error_not_found: "„iki“ pozicijos darbų paketas nerastas arba nematomas" - error_readonly: "esamo ryšio sąsaja „iki“ yra nekintama" - from: - error_not_found: "„nuo“ pozicijos darbų paketas nerastas arba nematomas" - error_readonly: "esamo ryšio sąsaja „iš“ yra nekintama" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM tiekėjas neprieinamas" not_whitelisted: "neleidžiama pagal konfigūraciją." @@ -1596,8 +1620,9 @@ lt: button_copy_and_follow: "Kopijuoti ir sekti" button_create: "Sukurti" button_create_and_continue: "Sukurti ir tęsti" - button_delete: "Ištrinti" button_decline: "Atmesti" + button_delete: "Ištrinti" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Pašalinti stebėtoją vardu %{name}" button_download: "Atsiųsti" button_duplicate: "Dublikuoti" @@ -1836,6 +1861,11 @@ lt: few: "valandos (-a, -ų)" many: "valandos (-a, -ų)" other: "valandos (-a, -ų)" + day: + one: "day" + few: "days" + many: "days" + other: "days" description_active: "Aktyvus?" description_attachment_toggle: "Rodyti/slėpti priedus" description_autocomplete: > @@ -1871,6 +1901,10 @@ lt: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Pritaikyti sau formos konfigūraciją su šiais naujais priedais:" add_groups: "Pridėti naujas atributų grupes" @@ -2233,6 +2267,7 @@ lt: label_add_subtask: "Pridėti antrinę užduotį" label_added: "pridėtas" label_added_by: "Pridėjo %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "%{author} pridėjo prieš %{age}" label_additional_workflow_transitions_for_assignee: "Papildomi darbų eigos variantai leistini, kai darbas paskirtas vartotojui" label_additional_workflow_transitions_for_author: "Papildomi darbų eigos variantai leistini, kai vartotojas yra autorius" @@ -2653,6 +2688,7 @@ lt: label_project_new: "Naujas projektas" label_project_plural: "Projektai" label_project_list_plural: "Projektų sąrašai" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Projekto atributai" label_project_custom_field_plural: "Projekto atributai" label_project_settings: "Projekto nustatymai" @@ -2679,6 +2715,7 @@ lt: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Pašalinti ryšį" + label_relation_edit: "Edit relation" label_relation_new: "Naujas ryšys" label_release_notes: "Išleidimo informacija" label_remaining_work: "Liko darbo" @@ -3097,6 +3134,7 @@ lt: notice_bad_request: "Netinkama užklausa." notice_not_authorized: "Jūs neturite prieigos teisių prie šio puslapio." notice_not_authorized_archived_project: "Projektas, kurį bandote atidaryti, buvo suarchyvuotas." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Jūsų slaptažodis yra neteisingas. Negalima tęsti." notice_principals_found_multiple: "Rasta %{number} rezultatai (-as, -ų).\nPaspauskite 'Tab', kad susikoncentruotumėte į pirmą rezultatą." notice_principals_found_single: "Yra vienas rezultatas.\nPaspauskite 'Tab', kad susikoncentruotumėte į jį." @@ -3146,7 +3184,7 @@ lt: text_getting_started_description: "Gaukite greitą apžvalgą apie projektų valdymą ir komandos bendradarbiavimą naudojant OpenProject. Šį video galite paleisti iš naujo per pagalbos meniu." welcome: "Jus sveikina %{app_title}" select_language: "Pasirinkite kalbą" - permission_add_work_package_notes: "Pridėti pastabų" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Pridėti darbų paketų" permission_add_messages: "Skelbti pranešimus" permission_add_project: "Kurti projektus" @@ -3176,10 +3214,11 @@ lt: permission_delete_timelines: "Šalinti laiko juostas" permission_delete_wiki_pages: "Pašalinti wiki puslapius" permission_delete_wiki_pages_attachments: "Pašalinti priedus" - permission_edit_work_package_notes: "Redaguoti pastabas" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Redaguoti darbų paketus" permission_edit_messages: "Redaguoti pranešimus" - permission_edit_own_work_package_notes: "Redaguoti savo pastabas" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Redaguoti savo pranešimus" permission_edit_own_time_entries: "Redaguoti savo laiko įrašus" permission_edit_project: "Redaguoti projektą" @@ -3272,9 +3311,9 @@ lt: are_you_sure: "Ar Jūs tikrai norite suarchyvuoti projektą '%{name}'?" archived: "Suarchyvuotas" count: - zero: "0 projektų" - one: "1 projektas" - other: "%{count} projektai" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Veikla" project_module_forums: "Forumai" project_module_work_package_tracking: "Darbų paketai" @@ -3406,6 +3445,7 @@ lt: activated: "aktyvus" deactivated: "neaktyvus" search_input_placeholder: "Paieška..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Įgalinti CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) leidžiami kilmės domenai" setting_apiv3_cors_origins_text_html: > @@ -3631,6 +3671,27 @@ lt: new: heading: "Naujas atributas" description: "Šio projekto atributo pakeitimas matysis visuose projektuose, kur jis įjungtas. Privalomų atributų negalima išjungti konkrečiame projekte." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Parinktas projekto modulis %{module}, kuris priklauso nuo %{dependencies}. Jums reikia pažymėti ir šias priklausomybes." section_new_projects: "Naujų projektų nustatymai" @@ -3664,6 +3725,7 @@ lt: text_are_you_sure_continue: "Ar tikrai norite tęsti?" text_are_you_sure_with_children: "Ištrinti darbų paketą ir visus jo vaikų paketus?" text_are_you_sure_with_project_custom_fields: "Ištrynus šį atributą taipogi bus ištrintos ir jo reikšmės visuose projektuose. Ar tikrai norite tai padaryti?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Priskirti projektui" text_form_configuration: > Jūs galite nustatyti, kurie laukeliai bus rodomi darbų paketų formoje. Jūs galite laisvai grupuoti laukelius pagal savo poreikius. @@ -3743,6 +3805,7 @@ lt: text_notice_security_badge_displayed_html: > Pastaba: įjungus bus rodomas ženkliukas su jūsų diegimo būsena %{information_panel_label} administravimo skydelyje. Rodoma tik administratoriams.
    Ženkliukas palygins jūsų OpenProject versiją su oficialia OpenProject laidų duomenų baze ir praneš, jei yra atnaujinimų dėl žinomų saugumo problemų. Daugiau informacijos, ką daro šis tikrinimas, kokią reikia pateikti informaciją ir kaip šį tikrinimą išjungti, rasite konfigūravimo dokumentacijoje. text_own_membership_delete_confirmation: "Jūs ketinate pašalinti keletą ar visus leidimus ir gali būti, kad nebegalėsite redaguoti šio projekto po to.\nAr jūs tikrai norite tęsti?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Į papildinių katalogą galima rašyti" text_powered_by: "Parengta pagal %{link}" text_project_identifier_info: "Leidžiamos tik mažosios raidės (a-z), skaitmenys, paprasti (-) ir žemi brūkšneliai (_). Taip pat privalo prasidėti mažąja raide." @@ -4112,6 +4175,8 @@ lt: builtin: Built-in instance application confidential: Confidential singular: "OAuth aplikacija" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth aplikacijos" named: "OAuth aplikacija „%{name}“" new: "Nauja OAuth aplikacija" diff --git a/config/locales/crowdin/lv.yml b/config/locales/crowdin/lv.yml index 75f0e99d7025..008e52f71cd5 100644 --- a/config/locales/crowdin/lv.yml +++ b/config/locales/crowdin/lv.yml @@ -229,6 +229,10 @@ lv: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ lv: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ lv: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -476,6 +482,7 @@ lv: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -655,6 +662,7 @@ lv: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -677,14 +685,15 @@ lv: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -699,6 +708,9 @@ lv: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -735,6 +747,8 @@ lv: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Ielūgums account: delete: "Dzēst kontu" @@ -799,6 +813,7 @@ lv: is_required: "Obligāts" max_length: "Maksimālais garums" min_length: "Minimālais garums" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Iespējamās vērtības" regexp: "Regulāra izteiksme" @@ -834,6 +849,8 @@ lv: attr_lastname: "Atribūts LastName" attr_login: "Username attribute" attr_mail: "E-pasta atribūts" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Pamata DN" host: "Serveris" onthefly: "Automatic user creation" @@ -877,6 +894,9 @@ lv: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolonnas" relations_to_type_column: "Relations to %{type}" @@ -886,7 +906,7 @@ lv: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Darba pieteikums" + from: "Related work package" to: "Saistītie pieteikuma tipi" reminder: remind_at_date: "Date" @@ -1210,12 +1230,16 @@ lv: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM pārdevējs nav pieejams" not_whitelisted: "konfigurācija nepieļauj." @@ -1580,8 +1604,9 @@ lv: button_copy_and_follow: "Copy and follow" button_create: "Izveidot" button_create_and_continue: "Create and continue" - button_delete: "Dzēst" button_decline: "Decline" + button_delete: "Dzēst" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Dzēst sekotāju %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1802,6 +1827,10 @@ lv: zero: "stundas" one: "stunda" other: "stundas" + day: + zero: "days" + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1837,6 +1866,10 @@ lv: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2199,6 +2232,7 @@ lv: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Pievienoja %{author} pirms %{age}" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2619,6 +2653,7 @@ lv: label_project_new: "Jauns projekts" label_project_plural: "Projekti" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2645,6 +2680,7 @@ lv: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Informācija par laidienu" label_remaining_work: "Atlikušie darbi" @@ -3062,6 +3098,7 @@ lv: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3111,7 +3148,7 @@ lv: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3141,10 +3178,11 @@ lv: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3237,9 +3275,9 @@ lv: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktivitāte" project_module_forums: "Forums" project_module_work_package_tracking: "Pieteikumi" @@ -3373,6 +3411,7 @@ lv: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3598,6 +3637,27 @@ lv: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3631,6 +3691,7 @@ lv: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3710,6 +3771,7 @@ lv: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Darbojas uz %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4079,6 +4141,8 @@ lv: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/mn.yml b/config/locales/crowdin/mn.yml index 6d3961c42f92..c1e47b0e03e4 100644 --- a/config/locales/crowdin/mn.yml +++ b/config/locales/crowdin/mn.yml @@ -229,6 +229,10 @@ mn: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ mn: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ mn: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ mn: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ mn: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ mn: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ mn: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ mn: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ mn: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ mn: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ mn: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ mn: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ mn: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ mn: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ mn: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ mn: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ mn: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ mn: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ mn: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ mn: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ mn: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Төсөл үүсгэх" @@ -3102,10 +3138,11 @@ mn: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ mn: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ mn: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ mn: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ mn: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ mn: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ mn: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/ms.yml b/config/locales/crowdin/ms.yml index 989775965d8b..392344749cc6 100644 --- a/config/locales/crowdin/ms.yml +++ b/config/locales/crowdin/ms.yml @@ -228,6 +228,10 @@ ms: item: title: Item ini tidak mempunyai sebarang tahap hierarki di bawah description: Tambahkan item pada senarai ini untuk membuat sub-item di dalam satu lagi + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Label item" short: "Nama pendek" @@ -248,6 +252,7 @@ ms: confirm_destroy_option: "Padamkan satu pilihan akan memadamkan semua kejadian yang berkaitan dengannya (cth. dalam pakej kerja). Adakah anda pasti anda ingin memadamkannya?" reorder_alphabetical: "Susun semula nilai mengikut abjad" reorder_confirmation: "Amaran: Susunan semasa nilai yang sedia ada akan hilang. Teruskan?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Tandakan ruang yang tersuai seperti yang diperlukan. Ini akan buatkan ia wajib untuk isikan ruang tersebut apabila membuat sumber yang baharu atau kemas kini sumber sedia ada." is_required_for_project: "Semak untuk mendayakan atribut ini dan jadikan ia diperlukan dalam semua projek. Ia tidak boleh dinyahaktifkan untuk projek individu." @@ -286,6 +291,7 @@ ms: label: "Label" short: "Nama pendek" parent: "Ibu bapa" + blueprint: "Pattern blueprint" global_search: placeholder: "Cari dalam %{app_title}" overwritten_tabs: @@ -461,6 +467,7 @@ ms: my: access_token: create_dialog: + title: Token generated header: Token %{type} telah dihasilkan warning: Ambil perhatian bahawa ini adalah satu-satunya masa anda akan melihat token ini, pastikan anda menyalinnya sekarang. errors: @@ -635,6 +642,7 @@ ms: title: "Aliran kerja hilang untuk perkongsian pakej kerja" message: "Tiada aliran kerja yang dikonfigurasikan untuk peranan 'Pengedit Pakej Kerja'. Tanpa aliran kerja, yang dikongsikan dengan pengguna tidak boleh mengubah status pakej kerja. Aliran kerja boleh disalin. Pilih jenis sumber (cth. 'Tugasan') dan peranan sumber (cth. 'Ahli'). Kemudian pilih jenis sasaran. Untuk bermula, anda boleh memilih semua jenis sebagai sasaran. Akhirnya, pilih peranan 'Pengedit Pakej Kerja' sebagai sasaran dan tekan 'Salin'. Setelah mencipta default, selaraskan aliran kerja sebagaimana anda lakukan untuk peranan lain." link_message: "Konfigurasikan aliran kerja dalam pentadbiran." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -657,14 +665,15 @@ ms: no_results_title_text: Pada masa ini tiada hubungan tersedia. blankslate_heading: "Tiada hubungan" blankslate_description: "Pakej kerja ini belum mempunyai apa-apa hubungan lagi." + label_add_child_button: "Child" label_add_x: "Tambah %{x}" label_edit_x: "Sunting %{x}" label_add_description: "Tambah penerangan" lag: subject: "Lag" - title: "Lag (dalam hari)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "berkaitan dengan" label_relates_plural: "berkaitan dengan" label_relates_to_singular: "berkaitan dengan" @@ -679,6 +688,9 @@ ms: follows_description: "Pakej kerja yang berkaitan semestinya perlu diselesaikan sebelum yang ini boleh dimulakan" label_child_singular: "anak" label_child_plural: "kanak-kanak" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Menjadikan pakej kerja berkaitan sub-item pakej kerja semasa (ibu bapa)." label_blocks_singular: "blok" label_blocks_plural: "blok" @@ -715,6 +727,8 @@ ms: required_description: "Tandakan pakej kerja ini sebagai keperluan kepada yang berkaitan" label_parent_singular: "ibu bapa" label_parent_plural: "ibu bapa" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Jemputan account: delete: "Padam akaun" @@ -779,6 +793,7 @@ ms: is_required: "Diperlukan" max_length: "Panjang maksima" min_length: "Panjang minimum" + content_right_to_left: "Kandungan Kanan ke Kiri" multi_value: "Benarkan pemilihan berganda" possible_values: "Nilai yang mungkin" regexp: "Ungkapan biasa" @@ -814,6 +829,8 @@ ms: attr_lastname: "Atribut nama akhir" attr_login: "Atribut nama pengguna" attr_mail: "Atribut e-mel" + filter_string: "Rentetan penapis" + admin: "Pentadbir" base_dn: "Pangkalan DN" host: "Hos" onthefly: "Penciptaan pengguna automatik" @@ -857,6 +874,9 @@ ms: project_custom_field: is_required: "Diperlukan untuk semua projek" custom_field_section: Bahagian + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolum" relations_to_type_column: "Berhubung dengan %{type}" @@ -866,7 +886,7 @@ ms: timeline_labels: "Label garis masa" relation: lag: "Lag" - from: "Pakej kerja" + from: "Related work package" to: "Pakej kerja yang berkaitan" reminder: remind_at_date: "Tarikh" @@ -1190,12 +1210,16 @@ ms: typed_dag: circular_dependency: "Hubungan ini mencipta sebuah lingkaran hubungan." attributes: - to: - error_not_found: "pakej kerja dalam posisi `ke` tidak dapat ditemui atau tidak kelihatan." - error_readonly: "pautan `ke` yang sedia ada tidak berubah" - from: - error_not_found: "pakej kerja dalam posisi `dari` tidak dapat ditemui atau tidak kelihatan" - error_readonly: "pautan `dari` yang sedia ada tidak berubah" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Vendor SCM tidak tersedia" not_whitelisted: "tidak dibenarkan oleh konfigurasi." @@ -1540,8 +1564,9 @@ ms: button_copy_and_follow: "Salin dan ikut" button_create: "Cipta" button_create_and_continue: "Simpan dan teruskan" - button_delete: "Padam" button_decline: "Tolak" + button_delete: "Padam" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Buang pemerhati %{name}" button_download: "Muat turun" button_duplicate: "Salinan" @@ -1726,6 +1751,8 @@ ms: units: hour: other: "jam" + day: + other: "days" description_active: "Aktif?" description_attachment_toggle: "Paparkan/Sembunyikan lampiran" description_autocomplete: > @@ -1761,6 +1788,10 @@ ms: upsale: title: "Alat tambah perusahaan" link_title: "Maklumat lanjut" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Menyuaikan borang konfigurasi dengan segala jenis tambahan ini:" add_groups: "Tambah kumpulan atribut baharu" @@ -2123,6 +2154,7 @@ ms: label_add_subtask: "Tambah subtugas" label_added: "ditambah" label_added_by: "Ditambah oleh %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Ditambah oleh %{author} %{age} yang lalu" label_additional_workflow_transitions_for_assignee: "Peralihan tambahan dibenarkan jika pengguna ialah penerima tugasan" label_additional_workflow_transitions_for_author: "Peralihan tambahan dibenarkan apabila pengguna ialah pengarang" @@ -2543,6 +2575,7 @@ ms: label_project_new: "Projek baharu" label_project_plural: "Projek" label_project_list_plural: "Senarai projek" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Atribut projek" label_project_custom_field_plural: "Atribut projek" label_project_settings: "Tetapan projek" @@ -2569,6 +2602,7 @@ ms: label_relation: "Tindakan" label_relation_actions: "Tindakan perhubungan" label_relation_delete: "Hubungan terpadam" + label_relation_edit: "Edit relation" label_relation_new: "Hubungan baharu" label_release_notes: "Nota keluaran" label_remaining_work: "Kerja berbaki" @@ -2984,6 +3018,7 @@ ms: notice_bad_request: "Ralat Permintaan." notice_not_authorized: "Anda tidak diberi kebenaran untuk mengakses halaman ini." notice_not_authorized_archived_project: "Projek yang anda cuba mengakses telah diarkibkan." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Kata laluan tidak betul. Tidak boleh teruskan." notice_principals_found_multiple: "Terdapat %{number} hasil ditemui. \n Tab untuk memfokuskan hasil pertama." notice_principals_found_single: "Terdapat satu hasil. \n Tab untuk fokuskan." @@ -3030,7 +3065,7 @@ ms: text_getting_started_description: "Dapatkan gambaran ringkas pengurusan projek dan kolaborasi kumpulan dengan OpenProject. Anda boleh mula semula video ini di menu bantuan." welcome: "Selamat datang ke %{app_title}" select_language: "Sila pilih bahasa anda" - permission_add_work_package_notes: "Tambah nota" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Tambah pakej kerja" permission_add_messages: "Pos mesej" permission_add_project: "Cipta projek" @@ -3060,10 +3095,11 @@ ms: permission_delete_timelines: "Padam garis masa" permission_delete_wiki_pages: "Padam halaman wiki" permission_delete_wiki_pages_attachments: "Padam lampiran" - permission_edit_work_package_notes: "Edit nota" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit pakej kerja" permission_edit_messages: "Edit mesej" - permission_edit_own_work_package_notes: "Edit nota sendiri" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit mesej sendiri" permission_edit_own_time_entries: "Edit log masa sendiri" permission_edit_project: "Edit projek" @@ -3156,9 +3192,9 @@ ms: are_you_sure: "Adakah anda pasti anda ingin mengarkib projek '%{name}'?" archived: "Telah diarkibkan" count: - zero: "0 Projek" - one: "1 Projek" - other: "%{count} Projek" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktiviti" project_module_forums: "Forum-forum" project_module_work_package_tracking: "Pakej kerja" @@ -3292,6 +3328,7 @@ ms: activated: "diaktifkan" deactivated: "dinyahaktifkan" search_input_placeholder: "Cari ..." + setting_apiv3_cors_title: "Perkongsian Sumber Silang Asal (CORS)" setting_apiv3_cors_enabled: "Aktifkan CORS" setting_apiv3_cors_origins: "Asal yang dibenarkan Perkongsian Sumber Rentas Asal (CORS) API V3 " setting_apiv3_cors_origins_text_html: > @@ -3517,6 +3554,27 @@ ms: new: heading: "Atribut baharu" description: "Perubahan pada atribut projek ini akan dipantulkan ke dalam semua projek di mana ia telah diaktifkan. Atribut yang diperlukan tidak boleh dinyahdayakan berdasarkan setiap projek." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Modul projek %{module} telah disemak yang bergantung pada %{dependencies}. Anda perlu menyemak kebergantungan ini juga." section_new_projects: "Tetapan untuk projek baharu" @@ -3550,6 +3608,7 @@ ms: text_are_you_sure_continue: "Adakah anda pasti anda ingin teruskan?" text_are_you_sure_with_children: "Padam pakej kerja dan semua pakej kerja anak?" text_are_you_sure_with_project_custom_fields: "Memadam atribut ini akan memadam nilainya dalam semua projek. Adakah anda pasti anda ingin lakukan ini?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Tugaskan ke projek" text_form_configuration: > Anda boleh mengubah suai ruangan yang akan dipaparkan dalam borang pakej kerja. Anda boleh mengumpulkan ruangan tersebut dengan bebas untuk memantulkan keperluan domain anda. @@ -3629,6 +3688,7 @@ ms: text_notice_security_badge_displayed_html: > Perhatian: jika dibenarkan, ini akan paparkan lambang bersertaan status pemasangan di %{information_panel_label} panel pentadbiran, dan di halaman utama. Ia hanya akan dipaparkan ke para pentadbir sahaja.
    Lambang tersebut akan menyemak versi OpenProject terkini anda terhadap pangkalan data keluaran rasmi OpenProject untuk memaklumkan anda tentang sebarang kemas kini atau kelemahan yang diketahui. Untuk maklumat lanjut bagi penyediaan semakan, data apa yang diperlukan untuk menyediakan kemas kini tersedia, dan bagaimana untuk menyahaktifkan semakan ini, sila kunjungi dokumentasi konfigurasi. text_own_membership_delete_confirmation: "Anda akan mengeluarkan beberapa atau semua kebenaran anda dan mungkin tidak lagi dapat mengedit projek ini selepas itu.\nAdakah anda pasti anda ingin teruskan?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Aset plugin direktori yang boleh ditulis" text_powered_by: "Dikuasakan oleh %{link}" text_project_identifier_info: "Hanya huruf kecil (a-z), nombor, sengkang dan tanda garis bawah adalah dibenarkan, mesti mula dengan huruf kecil." @@ -3996,6 +4056,8 @@ ms: builtin: Aplikasi contoh terbina dalam confidential: Sulit singular: "Aplikasi OAuth" + scopes: "Skop" + client_credentials: "Bukti kelayakan pelanggan" plural: "Aplikasi OAuth" named: "'%{name}' aplikasi OAuth" new: "Aplikasi OAuth baharu" diff --git a/config/locales/crowdin/ne.yml b/config/locales/crowdin/ne.yml index 94564be7df90..b89d2314aeed 100644 --- a/config/locales/crowdin/ne.yml +++ b/config/locales/crowdin/ne.yml @@ -229,6 +229,10 @@ ne: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ ne: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ ne: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ ne: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ ne: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ ne: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ ne: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ ne: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "खाता मेटाउनुहोस्" @@ -790,6 +804,7 @@ ne: is_required: "आवश्यक" max_length: "अधिकतम लम्बाई" min_length: "न्यूनतम लम्बाई" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "सम्भाव्य मानहरू" regexp: "Regular expression" @@ -825,6 +840,8 @@ ne: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ ne: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ ne: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ ne: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ ne: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ ne: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ ne: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ ne: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ ne: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ ne: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ ne: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ ne: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ ne: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ ne: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ ne: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ ne: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ ne: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ ne: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ ne: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/nl.yml b/config/locales/crowdin/nl.yml index c065bc255ba9..15f3335b7945 100644 --- a/config/locales/crowdin/nl.yml +++ b/config/locales/crowdin/nl.yml @@ -226,6 +226,10 @@ nl: item: title: Dit item heeft geen onderstaand hiërarchie niveau description: Voeg items aan deze lijst toe om sub-items binnen een andere lijst te maken + delete_dialog: + title: "Aangepast veld verwijderen" + heading: "Delete custom field item?" + description: "Deze actie zal het item en al zijn sub-items onherroepelijk verwijderen. Alle toegekende waarden worden permanent verwijderd. Als dit veld vereist is, kan het verwijderen van items ertoe leiden dat bestaande werkpakketten ongeldig worden." placeholder: label: "Item label" short: "Verkorte Naam" @@ -246,6 +250,7 @@ nl: confirm_destroy_option: "Het verwijderen van een optie zal alle voorkomingen verwijderen. Weet u zeker dat u deze optie wilt verwijderen?" reorder_alphabetical: "Rangschik waarden alfabetisch" reorder_confirmation: "Waarschuwing: De huidige volgorde van beschikbare waarden zal verloren gaan. Doorgaan?" + placeholder_version_select: "Werkpakket- of projectselectie is eerst vereist" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Vink aan om dit attribuut te activeren en het in alle projecten vereist te maken. Het kan niet worden gedeactiveerd voor individuele projecten." @@ -284,6 +289,7 @@ nl: label: "Label" short: "Verkorte Naam" parent: "Ouder" + blueprint: "Patroonblauwdruk" global_search: placeholder: "Zoeken in %{app_title}" overwritten_tabs: @@ -365,7 +371,7 @@ nl: label: "Zoek projectfase of poort" project_custom_fields: header: - title: "Project attributen" + title: "Projectkenmerken" description_html: 'Deze projectattributen worden weergegeven in uw projectoverzichtspagina onder hun respectievelijke secties. U kunt individuele attributen in- of uitschakelen. Projectattributen en secties worden gedefinieerd in de administratie-instellingen door de beheerder van de instantie. ' filter: label: "Zoek project attribuut" @@ -466,6 +472,7 @@ nl: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -642,6 +649,7 @@ nl: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configureer de workflows in de administratie." + templated_subject_hint: Automatisch gegenereerd via type %{type} summary: reports: category: @@ -664,14 +672,15 @@ nl: no_results_title_text: Er zijn momenteel geen relaties beschikbaar. blankslate_heading: "Geen relaties" blankslate_description: "Dit werkpakket heeft nog geen relaties." + label_add_child_button: "Kind" label_add_x: "Toevoegen %{x}" label_edit_x: "Bewerk %{x}" label_add_description: "Beschrijving toevoegen" lag: subject: "Vertraging" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "Nieuw werkpakket aangemaakt en toegevoegd als kind" label_relates_singular: "gerelateerd aan" label_relates_plural: "gerelateerd aan" label_relates_to_singular: "gerelateerd aan" @@ -686,6 +695,9 @@ nl: follows_description: "Het gerelateerde werkpakket moet noodzakelijkerwijs voltooid zijn voordat dit werkpakket kan beginnen" label_child_singular: "kind" label_child_plural: "kinderen" + new_child: "Nieuw kind" + new_child_text: "Creëert een gerelateerd werkpakket als subitem van het huidige (bovenliggende) werkpakket" + existing_child: "Bestaand kind" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blokkeert" label_blocks_plural: "blokkeren" @@ -722,6 +734,8 @@ nl: required_description: "Markeert dit werkpakket als een vereiste voor het gerelateerde werkpakket" label_parent_singular: "bovenliggend" label_parent_plural: "bovenliggende" + ghost_relation_title: "Verwante werkpakket" + ghost_relation_description: "Dit is niet zichtbaar voor u vanwege rechten." label_invitation: Uitnodiging account: delete: "Account Verwijderen" @@ -782,23 +796,24 @@ nl: editable: "Bewerkbaar" field_format: "Formaat" is_filter: "Als een filter gebruikt" - is_for_all: "For all projects" + is_for_all: "Voor alle projecten" is_required: "Vereist" max_length: "Maximale lengte" min_length: "Minimale lengte" + content_right_to_left: "Inhoud van rechts naar links" multi_value: "Meerdere selecties toegestaan" possible_values: "Mogelijke waarden" regexp: "Regular expression" searchable: "Zoekbaar" - admin_only: "Admin-only" + admin_only: "Alleen beheerders" custom_value: value: "Waarde" doorkeeper/application: uid: "Client-ID" secret: "Client secret" owner: "Eigenaar" - builtin: "Builtin" - enabled: "Active" + builtin: "Ingebouwd" + enabled: "Actief" redirect_uri: "URI omleiden" client_credentials_user_id: "Client referenties gebruiker ID" scopes: "Reikwijdte" @@ -817,10 +832,12 @@ nl: notes: "Notities" ldap_auth_source: account: "Account" - attr_firstname: "Voornaam" - attr_lastname: "Achternaam attribuut" - attr_login: "Gebruikersnaam attribuut" - attr_mail: "E-mail attribuut" + attr_firstname: "Voornaam kenmerk" + attr_lastname: "Achternaam kenmerk" + attr_login: "Gebruikersnaam kenmerk" + attr_mail: "E-mail kenmerk" + filter_string: "Tekenreeksen filteren" + admin: "Admininstrator" base_dn: "Base DN" host: "Host" onthefly: "Automatische gebruiker aanmaken" @@ -862,8 +879,11 @@ nl: versions: "Versies" work_packages: "Werkpakketten" project_custom_field: - is_required: "Required for all projects" + is_required: "Vereist voor alle projecten" custom_field_section: Sectie + project/life_cycle_step_definition: + name: "Naam" + color: "Kleur" query: column_names: "Kolommen" relations_to_type_column: "Betrekkingen %{type}" @@ -873,11 +893,11 @@ nl: timeline_labels: "Tijdlijn etiketten" relation: lag: "Vertraging" - from: "Werkpakket" + from: "Related work package" to: "Verwante werkpakket" reminder: - remind_at_date: "Date" - remind_at_time: "Time" + remind_at_date: "Datum" + remind_at_time: "Tijd" repository: url: "URL" role: @@ -885,7 +905,7 @@ nl: status: is_closed: "Werkpakket gesloten" is_readonly: "Werkpakket is alleen-lezen" - excluded_from_totals: "Exclude from calculation of totals in hierarchy" + excluded_from_totals: "Uitsluiten van berekening van totalen in hiërarchie" default_done_ratio: "% Voltooid" time_entry: activity: "Activiteit" @@ -919,7 +939,7 @@ nl: auto_hide_popups: "Automatisch verbergen geslaagd-meldingen" warn_on_leaving_unsaved: "Mij waarschuwen bij het verlaten van een werkpakket met niet-opgeslagen wijzigingen" theme: "Modus" - mode_guideline: "Some modes will overwrite custom theme colours for accessibility and legibility. For the full custom theme, please select Light mode." + mode_guideline: "Sommige modi overschrijven aangepaste themakleuren voor toegankelijkheid en leesbaarheid. Voor het volledige aangepaste thema selecteert u de Light-modus." version: effective_date: "Einddatum" sharing: "Delen" @@ -953,7 +973,7 @@ nl: readonly: "Alleen lezen" remaining_hours: "Resterend werk" remaining_time: "Resterend werk" - shared_with_users: "Shared with" + shared_with_users: "Gedeeld met" schedule_manually: "Handmatige planning" spent_hours: "Bestede tijd" spent_time: "Bestede tijd" @@ -1034,7 +1054,7 @@ nl: ldap_auth_source: attributes: tls_certificate_string: - invalid_certificate: "The provided SSL certificate is invalid: %{additional_message}" + invalid_certificate: "Het verstrekte SSL-certificaat is ongeldig: %{additional_message}" format: "%{message}" attachment: attributes: @@ -1053,7 +1073,7 @@ nl: custom_fields_project: attributes: project_ids: - blank: "Please select a project." + blank: "Selecteer een project." custom_actions: only_one_allowed: "(%{name}) slechts één waarde is toegestaan." empty: "(%{name}) waarde kan niet leeg zijn." @@ -1126,20 +1146,20 @@ nl: project/life_cycle_step_definition: attributes: type: - must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition" - type_and_class_name_mismatch: "must match the instantiated class name" + must_be_a_stage_or_gate: "moet Project::StageDefinition of Project::GateDefinition zijn" + type_and_class_name_mismatch: "moet overeenkomen met de geïnstantieerde klassenaam" project/gate_definition: attributes: type: - type_and_class_name_mismatch: "must be a Project::GateDefinition" + type_and_class_name_mismatch: "moet een Project::GateDefinition zijn" project/stage_definition: attributes: type: - type_and_class_name_mismatch: "must be a Project::StageDefinition" + type_and_class_name_mismatch: "moet een Project::StageDefinition zijn" project/life_cycle_step: attributes: type: - must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate" + must_be_a_stage_or_gate: "moet Project::Stage of Project::Gate zijn" must_be_a_stage: "moet een Project::Gate zijn" must_be_a_gate: "moet een Project::Gate zijn" type_and_class_name_mismatch: "moet overeenkomen met de geconcretiseerd klassenaam" @@ -1180,7 +1200,7 @@ nl: format: "%{message}" selects: name_not_included: "De kolom \"Naam\" moet worden opgenomen" - nonexistent: "The column '%{column}' does not exist." + nonexistent: "De kolom '%{column}' bestaat niet." format: "%{message}" group_by_hierarchies_exclusive: "is uitsluiten door samenvoeging, '%{group_by}'. U kunt beide niet activeren." can_only_be_modified_by_owner: "The query can only be modified by its owner." @@ -1197,12 +1217,16 @@ nl: typed_dag: circular_dependency: "De relatie wordt gemaakt van een kring van relaties." attributes: - to: - error_not_found: "werkpakket in positie `naar` niet gevonden of niet zichtbaar" - error_readonly: "een bestaande `te`-relatie is onveranderlijk" - from: - error_not_found: "werkpakket in `van`-positie niet gevonden of niet zichtbaar" - error_readonly: "een bestaande `van`-relatielink is onveranderlijk" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM-leverancier is niet beschikbaar" not_whitelisted: "is niet toegestaan door de configuratie." @@ -1219,7 +1243,7 @@ nl: working_days_are_missing: "Ten minste één dag van de week moet worden gedefinieerd als een werkdag." previous_working_day_changes_unprocessed: "De vorige wijzigingen in de configuratie van de werkdagen zijn nog niet toegepast." hours_per_day_are_missing: "Het aantal uren per dag moet worden gedefinieerd." - durations_are_not_positive_numbers: "The durations must be positive numbers." + durations_are_not_positive_numbers: "De duur moet een positief getal zijn." hours_per_day_is_out_of_bounds: "Uren per dag kunnen niet meer dan 24 zijn" status: attributes: @@ -1240,7 +1264,7 @@ nl: only_one_global_setting: "Er mag slechts één globale meldingsinstelling zijn." email_alerts_global: "De instellingen voor e-mailmeldingen kunnen alleen globaal worden ingesteld." format: "%{message}" - wrong_date: "Wrong value for Start date, Due date, or Overdue." + wrong_date: "Verkeerde waarde voor Begindatum, Vervaldatum of Achterstallig." watcher: attributes: user_id: @@ -1257,10 +1281,10 @@ nl: assigned_to: format: "%{message}" done_ratio: - does_not_match_work_and_remaining_work: "does not match Work and Remaining work" - cannot_be_set_when_work_is_zero: "cannot be set when Work is 0h" - must_be_set_when_remaining_work_is_set: "required when Remaining work is set." - must_be_set_when_work_and_remaining_work_are_set: "required when Work and Remaining work are set." + does_not_match_work_and_remaining_work: "komt niet overeen met Werk en Resterend werk" + cannot_be_set_when_work_is_zero: "kan niet worden ingesteld als Werk 0h is" + must_be_set_when_remaining_work_is_set: "vereist wanneer Resterend werk is ingesteld." + must_be_set_when_work_and_remaining_work_are_set: "vereist wanneer Werk en Resterend werk zijn ingesteld." inclusion: "moet tussen 0 en 100 liggen." due_date: not_start_date: "is niet op begindatum, hoewel dit voor mijlpalen vereist is." @@ -1290,17 +1314,17 @@ nl: does_not_exist: "De gekozen categorie bestaat niet." estimated_hours: not_a_number: "is geen geldige duur." - cant_be_inferior_to_remaining_work: "cannot be lower than Remaining work." - must_be_set_when_remaining_work_and_percent_complete_are_set: "required when Remaining work and % Complete are set." + cant_be_inferior_to_remaining_work: "kan niet lager zijn dan Resterend werk." + must_be_set_when_remaining_work_and_percent_complete_are_set: "vereist wanneer Resterend werk en % Voltooid zijn ingesteld." remaining_hours: not_a_number: "is geen geldige duur." - cant_exceed_work: "cannot be higher than Work." - must_be_set_when_work_is_set: "required when Work is set." - must_be_set_when_work_and_percent_complete_are_set: "required when Work and % Complete are set." + cant_exceed_work: "kan niet hoger zijn dan Werk." + must_be_set_when_work_is_set: "vereist wanneer Werk is ingesteld." + must_be_set_when_work_and_percent_complete_are_set: "vereist wanneer Werk en % Voltooid zijn ingesteld." must_be_set_to_zero_hours_when_work_is_set_and_percent_complete_is_100p: >- - must be 0h when Work is set and % Complete is 100%. + moet 0h zijn als Werk is ingesteld en % Voltooid 100% is. must_be_empty_when_work_is_empty_and_percent_complete_is_100p: >- - must be empty when Work is empty and % Complete is 100%. + moet leeg zijn als Werk leeg is en % Voltooid 100% is. readonly_status: "Het werkpakket heeft een alleen-lezen status dus kunne attributen niet worden gewijzigd." type: attributes: @@ -1314,12 +1338,12 @@ nl: attributes: base: user_limit_reached: "Gebruikerslimiet bereikt. Er kunnen geen accounts meer worden gemaakt voor het huidige abonnement." - one_must_be_active: "Admin User cannot be locked/removed. At least one admin must be active." + one_must_be_active: "Admin-gebruiker kan niet vergrendeld/verwijderd worden. Er moet minstens één admin actief zijn." password_confirmation: confirmation: "Wachtwoordbevestiging komt niet overeen met wachtwoord." format: "%{message}" password: - weak: "Must contain characters of the following classes (at least %{min_count} of %{all_count}): %{rules}" + weak: "Moet karakters bevatten van de volgende klasses (ten minste %{min_count} van %{all_count}):%{rules}" lowercase: "kleine letters (bijvoorbeeld 'a')" uppercase: "hoofdletters (bijvoorbeeld ' A')" numeric: "numerieke (bijvoorbeeld ' 1')" @@ -1342,7 +1366,7 @@ nl: attributes: roles: ungrantable: "heeft een niet-toewijsbare rol." - more_than_one: "has more than one role." + more_than_one: "heeft meer dan één rol." principal: unassignable: "kan niet worden toegewezen aan een project." version: @@ -1434,7 +1458,7 @@ nl: changeset: "Wijzigingensets" message: "Fora" news: "Nieuws" - project_attribute: "Project attributes" + project_attribute: "Projectkenmerken" subproject: "Inclusief subprojecten" time_entry: "Bestede tijd" wiki_edit: "Wiki" @@ -1480,7 +1504,7 @@ nl: login: "Gebruikersnaam" mail: "E-mail" name: "Naam" - note: "Note" + note: "Opmerking" password: "Wachtwoord" priority: "Prioriteit" project: "Project" @@ -1557,8 +1581,9 @@ nl: button_copy_and_follow: "Kopiëren en volg" button_create: "Maken" button_create_and_continue: "Aanmaken en doorgaan" - button_delete: "Verwijderen" button_decline: "Weigeren" + button_delete: "Verwijderen" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Verwijderen van watcher %{name}" button_download: "Downloaden" button_duplicate: "Dupliceren" @@ -1761,6 +1786,9 @@ nl: hour: one: "uur" other: "uren" + day: + one: "day" + other: "days" description_active: "Actief?" description_attachment_toggle: "Bijlagen weergeven/verbergen" description_autocomplete: > @@ -1796,6 +1824,10 @@ nl: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Maak automatisch gegenereerde onderwerpen met behulp van kenmerken en tekst waarnaar verwezen wordt." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Toevoegen van nieuwe attribuutgroepen" @@ -1863,7 +1895,7 @@ nl: changeset: "Wijzigingsset bewerkt" message: Bericht bewerkt news: Nieuws - project_attributes: "Project attributes edited" + project_attributes: "Projectkenmerken bewerkt" project: "Project bewerkt" projects: "Project bewerkt" reply: Beantwoord @@ -1890,8 +1922,8 @@ nl: label: "XLS" columns: input_label_report: "Add columns to attribute table" - input_caption_report: "By default all attributes added as columns in the work package list are selected. Long text fields are not available in the attribute table, but can be displayed below it." - input_caption_table: "By default all attributes added as columns in the work package list are selected. Long text fields are not available in table based exports." + input_caption_report: "Standaard zijn alle kenmerken geselecteerd die als kolommen in de werkpakketlijst zijn toegevoegd. Lange tekstvelden zijn niet beschikbaar in de kenmerktabel, maar kunnen eronder worden weergegeven." + input_caption_table: "Standaard zijn alle kenmerken toegevoegd als kolommen in de werkpakketlijst zijn geselecteerd. Lange tekstvelden zijn niet beschikbaar in de tabel exports." pdf: export_type: label: "PDF export type" @@ -2025,7 +2057,7 @@ nl: changes_retracted: "De wijzigingen werden teruggedraaid." caused_changes: dates_changed: "Data gewijzigd" - default_attribute_written: "Read-only attributes written" + default_attribute_written: "Alleen-lezen kenmerken geschreven" progress_mode_changed_to_status_based: "Voortgangsberekening bijgewerkt" status_changed: "Status '%{status_name}'" system_update: "OpenProject systeemupdate:" @@ -2158,6 +2190,7 @@ nl: label_add_subtask: "Subtaak toevoegen" label_added: "toegevoegd" label_added_by: "Toegevoegd door %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Toegevoegd door %{author} %{age} geleden" label_additional_workflow_transitions_for_assignee: "Extra overgangen zijn toegestaan als de gebruiker de eigenaar is" label_additional_workflow_transitions_for_author: "Extra overgangen zijn toegestaan als de gebruiker de auteur is" @@ -2567,7 +2600,7 @@ nl: label_progress_tracking: "Progress tracking" label_project: "Project" label_project_activity: "Projectactiviteit" - label_project_attribute_plural: "Project attributes" + label_project_attribute_plural: "Projectkenmerken" label_project_attribute_manage_link: "Projectattributen beheren" label_project_count: "Totale aantal projecten" label_project_copy_notifications: "Verzenden van e-mailmeldingen tijdens het project kopiëren" @@ -2578,10 +2611,11 @@ nl: label_project_new: "Nieuw project" label_project_plural: "Projecten" label_project_list_plural: "Projectlijsten" - label_project_attributes_plural: "Project attributes" - label_project_custom_field_plural: "Project attributes" + label_project_lifecycle: "Project lifecycle" + label_project_attributes_plural: "Projectkenmerken" + label_project_custom_field_plural: "Projectkenmerken" label_project_settings: "Project Instellingen" - label_project_attributes_settings: "Project attributes settings" + label_project_attributes_settings: "Project kenmerken instellingen" label_project_storage_plural: "Bestandsopslag" label_project_storage_project_folder: "Bestandsopslag: Projectmappen" label_projects_disk_usage_information: "%{count} projecten die %{used_disk_space} schijfruimte gebruiken" @@ -2604,6 +2638,7 @@ nl: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Relatie verwijderen" + label_relation_edit: "Edit relation" label_relation_new: "Nieuwe relatie" label_release_notes: "Release notes" label_remaining_work: "Resterend werk" @@ -3019,6 +3054,7 @@ nl: notice_bad_request: "Foute ingave." notice_not_authorized: "U bent niet gemachtigd om deze pagina te openen." notice_not_authorized_archived_project: "Het project dat u probeert te bezoeken is gearchiveerd." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Uw wachtwoord is niet correct. Kan niet doorgaan." notice_principals_found_multiple: "Er zijn %{number} resultaten gevonden. Tab om het eerste resultaat te tonen." notice_principals_found_single: "Er is één resultaat. Tab om te tonen." @@ -3067,7 +3103,7 @@ nl: text_getting_started_description: "Krijg een snel overzicht van projectbeheer en teamsamenwerking met OpenProject. U kunt deze video opnieuw starten vanuit het helpmenu." welcome: "Welkom bij %{app_title}" select_language: "Gelieve uw taal te kiezen" - permission_add_work_package_notes: "Notities toevoegen" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Werkpakketten toevoegen" permission_add_messages: "Berichten posten" permission_add_project: "Projecten aanmaken" @@ -3097,14 +3133,15 @@ nl: permission_delete_timelines: "Tijdlijnen verwijderen" permission_delete_wiki_pages: "Wiki pagina's verwijderen" permission_delete_wiki_pages_attachments: "Bijlagen verwijderen" - permission_edit_work_package_notes: "Notities bewerken" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Werkpakketten bewerken" permission_edit_messages: "Berichten bewerken" - permission_edit_own_work_package_notes: "Eigen notities bewerken" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Eigen berichten bewerken" permission_edit_own_time_entries: "Bewerk de logboeken van de eigen tijd" permission_edit_project: "Project bewerken" - permission_edit_project_attributes: "Edit project attributes" + permission_edit_project_attributes: "Bewerk project kenmerken" permission_edit_project_stages_and_gates: "Edit project stages and gates" permission_edit_reportings: "Rapporteringen bewerken" permission_edit_time_entries: "Bewerk tijdregistraties voor andere gebruikers" @@ -3134,7 +3171,7 @@ nl: permission_save_queries: "Weergaves opslaan" permission_search_project: "Search project" permission_select_custom_fields: "Aangepaste velden selecteren" - permission_select_project_custom_fields: "Select project attributes" + permission_select_project_custom_fields: "Selecteer project kenmerk" permission_select_project_life_cycle: "Select project stages and gates" permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list." permission_select_project_modules: "Selecteer project modules" @@ -3160,7 +3197,7 @@ nl: permission_work_package_assigned: "Toewijzer/verantwoordelijk worden" permission_work_package_assigned_explanation: "Werkpakketten kunnen worden toegewezen aan gebruikers en groepen met deze rol in het respectieve project" permission_view_project_activity: "Projectactiviteit bekijken" - permission_view_project_attributes: "View project attributes" + permission_view_project_attributes: "Toon project kenmerken" permission_view_project_stages_and_gates: "View project stages and gates" permission_save_bcf_queries: "Save BCF queries" permission_manage_public_bcf_queries: "Manage public BCF queries" @@ -3193,9 +3230,9 @@ nl: are_you_sure: "Weet u zeker dat u dit project '%{name}' wilt archiveren?" archived: "Gearchiveerd" count: - zero: "0 Projecten" - one: "1 Project" - other: "%{count} Projecten" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activiteit" project_module_forums: "Fora" project_module_work_package_tracking: "Werkpakketten" @@ -3329,13 +3366,14 @@ nl: activated: "geactiveerd" deactivated: "gedeactiveerd" search_input_placeholder: "Zoeken ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Inschakelen CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) toegestane oorsprong" setting_apiv3_cors_origins_text_html: > Als CORS is ingeschakeld, zijn dit de oorsprong die toegang heeft tot OpenProject API.
    Bekijk de Documentatie op de Oorsprongshoofd over hoe u de verwachte waarden kunt opgeven. setting_apiv3_write_readonly_attributes: "Schrijftoegang tot alleen-lezen attributen" setting_apiv3_write_readonly_attributes_instructions_html: > - If enabled, the API will allow administrators to write static read-only attributes during creation, such as createdAt and author.
    Warning: This setting has a use-case for e.g., importing data, but allows administrators to impersonate the creation of items as other users. All creation requests are being logged however with the true author.
    For more information on attributes and supported resources, please see the %{api_documentation_link}. + Als deze optie is ingeschakeld, staat de API beheerders toe om statische alleen-lezen attributen te schrijven tijdens het aanmaken, zoals createdAt en author.
    Waarschuwing: Deze instelling heeft een use-case voor bijvoorbeeld het importeren van gegevens, maar staat beheerders toe om zich bij het aanmaken van items voor te doen als andere gebruikers. Alle aanmaakverzoeken worden echter gelogd met de echte auteur.
    Voor meer informatie over attributen en ondersteunde bronnen, zie de %{api_documentation_link}. setting_apiv3_max_page_size: "Maximale API pagina grootte" setting_apiv3_max_page_instructions_html: > Stel de maximale pagina grootte in waarmee de API zal reageren. Het is niet mogelijk om API-verzoeken uit te voeren die meer waarden op een enkele pagina weergeven.
    Waarschuwing: Wijzig deze waarde alleen als u zeker weet waarom u het nodig heeft. Het instellen op een hoge waarde zal aanzienlijke prestatieeffecten hebben, terwijl een waarde lager is dan de per pagina opties fouten veroorzaakt in gepagineerde weergaven. @@ -3552,8 +3590,29 @@ nl: edit: description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." new: - heading: "Nieuw attribuut" + heading: "Nieuw kenmerk" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Instellingen voor nieuwe projecten" @@ -3587,6 +3646,7 @@ nl: text_are_you_sure_continue: "Weet u zeker dat u wilt doorgaan?" text_are_you_sure_with_children: "Verwijder werk pakket en alle kinderen daarvan?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Wijs aan project toe" text_form_configuration: > U kunt aanpassen welke velden worden weergegeven in pakket werkformulieren. U kunt deze velden vrij groeperen om de weergave aan uw eigen behoeften aan te passen. @@ -3666,6 +3726,7 @@ nl: text_notice_security_badge_displayed_html: > Opmerking: indien ingeschakeld zal dit een badge weergeven met uw installatiestatus in de %{information_panel_label} administratie paneel, en op de homepage. Deze wordt alleen getoond aan beheerders.
    De badge zal uw huidige OpenProject versie controleren tegen de officiële OpenProject-database om u te waarschuwen voor updates of bekende kwetsbaarheden. Voor meer informatie over wat de controle biedt, welke gegevens nodig zijn om beschikbare updates te verstrekken en hoe deze controle kan worden uitgeschakeld, bezoek de configuratiedocumentatie. text_own_membership_delete_confirmation: "U staat op het punt om enkele of alle van uw machtigingen te verwijderen en kan dit project daarna mogelijk niet meer bewerken.\nWeet u zeker dat u wilt doorgaan?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin directory schrijfbaar" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Alleen kleine letters (a-z), cijfers, streepjes en underscores (_) zijn toegestaan, moet beginnen met een kleine letter." @@ -4033,6 +4094,8 @@ nl: builtin: Built-in instance application confidential: Confidential singular: "OAuth-authenticatie" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth toepassingen" named: "OAuth applicatie '%{name}'" new: "Nieuwe OAuth applicatie" diff --git a/config/locales/crowdin/no.yml b/config/locales/crowdin/no.yml index 4be4b4de7b1a..88356a8e9be0 100644 --- a/config/locales/crowdin/no.yml +++ b/config/locales/crowdin/no.yml @@ -229,6 +229,10 @@ item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ confirm_destroy_option: "Sletting av et alternativ vil slette alle forekomster (f.eks i arbeidspakker). Er du sikker på at du vil slette den?" reorder_alphabetical: "Omorganiser verdier alfabetisk" reorder_confirmation: "Advarsel: Gjeldende rekkefølge for tilgjengelige verdier vil gå tapt. Vil du fortsette?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Marker det egendefinerte feltet som påkrevd. Dette vil gjøre det obligatorisk å fylle ut feltet når du oppretter nye eller oppdaterer eksisterende ressurser." is_required_for_project: "Marker for å aktivere denne attributten og gjøre den påkrevd i alle prosjekter. Det kan ikke deaktiveres for enkeltprosjekter." @@ -287,6 +292,7 @@ label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Søk i %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -645,6 +652,7 @@ title: "Arbeidsflyt mangler for deling av arbeidspakker" message: "Ingen arbeidsflyt er konfigurert for rollen 'Arbeidspakke redaktør'. Uten en arbeidsflyt kan ikke brukeren endre status på arbeidspakken. Arbeidsflyt kan kopieres. Velg en kildetype (f.eks. 'oppgave') og en kilderolle (f.eks. 'medlem'). Velg så måltyper. Til å begynne med, kan du velge alle typene som mål. Til slutt velger du \"Redigeringsprogrammet for arbeidspakke\" som mål og klikk \"Kopier\". Etter å ha opprettet standardinnstillingene, kan du finjustere arbeidsflytene som du gjør for enhver annen rolle." link_message: "Konfigurer arbeidsmetodene i administrasjonen." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -667,14 +675,15 @@ no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -689,6 +698,9 @@ follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -725,6 +737,8 @@ required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitasjon account: delete: "Slett konto" @@ -789,6 +803,7 @@ is_required: "Obligatorisk" max_length: "Maksimal lengde" min_length: "Minimumslengde" + content_right_to_left: "Right-to-Left content" multi_value: "Tillat multivalg" possible_values: "Mulige verdier" regexp: "Regulære uttrykk" @@ -824,6 +839,8 @@ attr_lastname: "Etternavn-attributt" attr_login: "Brukernavn egenskap" attr_mail: "E-postattributt" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Vert" onthefly: "Automatisk brukeropprettelse" @@ -867,6 +884,9 @@ project_custom_field: is_required: "Påkrevd for alle prosjekter" custom_field_section: Seksjon + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolonner" relations_to_type_column: "Forbindelser til %{type}" @@ -876,7 +896,7 @@ timeline_labels: "Tidslinje etiketter" relation: lag: "Forsinkelse" - from: "Arbeidspakke" + from: "Related work package" to: "Relatert arbeidspakke" reminder: remind_at_date: "Date" @@ -1200,12 +1220,16 @@ typed_dag: circular_dependency: "Forholdet skaper en sirkel av forhold." attributes: - to: - error_not_found: "Arbeidspakke i \"til\"-posisjonen er ikke funnet eller ikke synlig" - error_readonly: "en eksisterende relasjons 'til'-lenke er uforanderlig" - from: - error_not_found: "arbeidspakke i \"fra\"-posisjonen er ikke funnet eller ikke synlig" - error_readonly: "en eksisterende relasjon `fra`-lenke er uforanderlig" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM leverandør er ikke tilgjengelig" not_whitelisted: "er ikke tillatt av konfigurasjonen." @@ -1560,8 +1584,9 @@ button_copy_and_follow: "Kopier og følg" button_create: "Opprett" button_create_and_continue: "Opprett og fortsett" - button_delete: "Slett" button_decline: "Avslå" + button_delete: "Slett" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Slett overvåker %{name}" button_download: "Last ned" button_duplicate: "Kopier" @@ -1764,6 +1789,9 @@ hour: one: "time" other: " timer" + day: + one: "day" + other: "days" description_active: "Aktiv?" description_attachment_toggle: "Vis/Skjul vedlegg" description_autocomplete: > @@ -1799,6 +1827,10 @@ upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Tilpass skjemakonfigurasjonen med disse ekstra utvidelsene:" add_groups: "Legg til nye attributtgrupper" @@ -2161,6 +2193,7 @@ label_add_subtask: "Legg til underoppgave" label_added: "lagt til" label_added_by: "Lagt til av %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Lagt inn av %{author} for %{age} siden" label_additional_workflow_transitions_for_assignee: "Ytterligere overganger tillatt når brukeren er deltaker" label_additional_workflow_transitions_for_author: "Flere overganger er tillatt når brukeren er forfatter" @@ -2581,6 +2614,7 @@ label_project_new: "Nytt prosjekt" label_project_plural: "Prosjekter" label_project_list_plural: "Prosjektlister" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Prosjektegenskaper" label_project_custom_field_plural: "Prosjektegenskaper" label_project_settings: "Prosjektinnstillinger" @@ -2607,6 +2641,7 @@ label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Slett relasjon" + label_relation_edit: "Edit relation" label_relation_new: "Ny relasjon" label_release_notes: "Utgivelsesnotater" label_remaining_work: "Gjenstående arbeid" @@ -3023,6 +3058,7 @@ notice_bad_request: "Ugyldig forespørsel." notice_not_authorized: "Du har ikke tilgang til å åpne denne siden." notice_not_authorized_archived_project: "Prosjektet du forsøker å åpne er arkivert." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Passordet er ikke riktig. Kan ikke fortsette." notice_principals_found_multiple: "Det finnes %{number} resultater. \n bruk tab for å fokusere det første resultatet." notice_principals_found_single: "Det er ett resultat. \n Bruk tab for å fokusere det." @@ -3071,7 +3107,7 @@ text_getting_started_description: "Få en rask oversikt over prosjektledelse og teamsamarbeid med OpenProject. Du kan starte denne videoen på nytt fra hjelp-menyen." welcome: "Velkommen til %{app_title}" select_language: "Vennligst velg språk" - permission_add_work_package_notes: "Legg til notater" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Legg til arbeidspakker" permission_add_messages: "Skriv meldinger" permission_add_project: "Opprett prosjekt" @@ -3101,10 +3137,11 @@ permission_delete_timelines: "Slett tidslinjer" permission_delete_wiki_pages: "Slett wiki-sider" permission_delete_wiki_pages_attachments: "Slett vedlegg" - permission_edit_work_package_notes: "Rediger notater" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Rediger arbeidspakker" permission_edit_messages: "Rediger meldinger" - permission_edit_own_work_package_notes: "Rediger egne notater" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Rediger egne meldinger" permission_edit_own_time_entries: "Rediger egne tidsrapporter" permission_edit_project: "Rediger prosjekt" @@ -3197,9 +3234,9 @@ are_you_sure: "Er du sikker på at du vil arkivere prosjektet%{name}'?" archived: "Arkivert" count: - zero: "0 prosjekter" - one: "1 prosjekt" - other: "%{count} prosjekter" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktivitet" project_module_forums: "Forum" project_module_work_package_tracking: "Arbeidspakker" @@ -3333,6 +3370,7 @@ activated: "aktivert" deactivated: "deaktivert" search_input_placeholder: "Søk..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Aktiver CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) tillatte opprinnelser" setting_apiv3_cors_origins_text_html: > @@ -3558,6 +3596,27 @@ new: heading: "Ny egenskap" description: "Endringer i denne prosjektegenskapen gjenspeiles i alle prosjekter der det er aktivert. Påkrevde egenskaper kan ikke deaktiveres per prosjekt." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Prosjektmodul %{module} ble valgt, og denne avhenger av %{dependencies}. Du må også sjekke disse avhengighetene." section_new_projects: "Innstillinger for nye prosjekter" @@ -3591,6 +3650,7 @@ text_are_you_sure_continue: "Er du sikker på at du vil fortsette?" text_are_you_sure_with_children: "Slette arbeidspakken og alle underordnede arbeidspakker?" text_are_you_sure_with_project_custom_fields: "Hvis du sletter dette attributtet, slettes også dets verdier i alle prosjekter. Er du sikker på at du vil gjøre dette?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Tildel til prosjektet" text_form_configuration: > Du kan tilpasse hvilke felt som vises i skjemaer for arbeidspakker. Du kan fritt gruppere feltene for å reflektere behovene for ditt domene. @@ -3670,6 +3730,7 @@ text_notice_security_badge_displayed_html: > Merk: Hvis aktivert, vil dette vise et merke med din installasjonsstatus i %{information_panel_label} administrasjonspanel, og på hjemmesiden. Det er kun vist til administratorer.
    Merket sjekker din nåværende OpenProject versjon mot den offisielle OpenProject utgivelsesdatabasen for å varsle deg om oppdateringer og kjente sårbarheter. For mer informasjon om hva som finnes av kontrollen, hvilke data som er nødvendig for å framskaffe tilgjengelige oppdateringer, og hvordan denne sjekken kan deaktiveres, besøk konfigurasjonsdokumentasjonen. text_own_membership_delete_confirmation: "Du er i ferd med å fjerne noen eller alle dine egne rettigheter og du vil kanskje ikke kunne redigere dette prosjektet etterpå.\nEr du sikker på at du vil fortsette?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Mappen for programtillegg er skrivbar" text_powered_by: "Driftes med %{link}" text_project_identifier_info: "Kun små bokstaver (a-z), tall, bindestrek og understrek er tillatt. Første tegn må være liten bokstav." @@ -4038,6 +4099,8 @@ builtin: Innebygd installasjonsprogram confidential: Konfidensiell singular: "OAuth program" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth programmer" named: "OAuth program '%{name}'" new: "Ny OAuth-app" diff --git a/config/locales/crowdin/pl.yml b/config/locales/crowdin/pl.yml index 47e4c4f4ed2d..076594f72ec3 100644 --- a/config/locales/crowdin/pl.yml +++ b/config/locales/crowdin/pl.yml @@ -226,6 +226,10 @@ pl: item: title: Ten element nie ma żadnego poziomu hierarchii poniżej description: Dodaj elementy do tej listy, aby utworzyć elementy podrzędne wewnątrz innego + delete_dialog: + title: "Usuń element pola niestandardowego" + heading: "Usunąć element pola niestandardowego?" + description: "To działanie spowoduje nieodwracalne usunięcie elementu i wszystkich jego elementów podrzędnych. Wszelkie przypisane wartości zostaną trwale usunięte. Jeśli to pole jest wymagane, usunięcie elementów może skutkować nieprawidłowością istniejących pakietów roboczych." placeholder: label: "Etykieta elementu" short: "Nazwa skrócona" @@ -246,6 +250,7 @@ pl: confirm_destroy_option: "Usunięcie tej opcji spowoduje usunięcie wszystkich powiązanych wystąpień (np. w Work Package). Czy na pewno chcesz to usunąć?" reorder_alphabetical: "Ustaw kolejność wartości alfabetycznie" reorder_confirmation: "Ostrzeżenie: Bieżąca kolejność dostępnych wartości zostanie utracona. Kontynuować?" + placeholder_version_select: "W pierwszej kolejności wymagany jest wybór pakietu roboczego lub projektu" instructions: is_required: "Oznacz pole niestandardowe jako wymagane. To spowoduje obowiązkowe wypełnianie pola podczas tworzenia nowych lub aktualizacji istniejących zasobów." is_required_for_project: "Zaznacz, aby włączyć ten atrybut i uczynić go wymaganym we wszystkich projektach. Nie można go wyłączyć dla poszczególnych projektów." @@ -284,6 +289,7 @@ pl: label: "Etykieta" short: "Nazwa skrócona" parent: "Element nadrzędny" + blueprint: "Plan wzorca" global_search: placeholder: "Wyszukaj w %{app_title}" overwritten_tabs: @@ -480,6 +486,7 @@ pl: my: access_token: create_dialog: + title: Wygenerowano token header: Token %{type} został wygenerowany warning: 'Uwaga: jest to jedyny raz, gdy zobaczysz ten token, koniecznie skopiuj go teraz.' errors: @@ -661,6 +668,7 @@ pl: title: "Brak przepływu pracy udostępniania pakietu roboczego" message: "Dla roli „Edytor pakietów roboczych” nie skonfigurowano przepływu pracy. Bez przepływu pracy użytkownik, któremu ją udostępniono nie może zmienić statusu pakietu roboczego. Przepływy pracy można kopiować. Wybierz typ źródłowy (np. „Zadanie”) i rolę źródłową (np. „Członek”). Następnie wybierz typy docelowe. Na początek możesz wybrać wszystkie typy jako docelowe. Na koniec wybierz rolę „Edytor pakietów roboczych” jako cel i naciśnij przycisk „Kopiuj”. Po utworzeniu ustawień domyślnych dostosuj przepływy pracy tak, jak w przypadku każdej innej roli." link_message: "Skonfiguruj przepływy pracy w administracji." + templated_subject_hint: Automatycznie wygenerowany przez typ %{type} summary: reports: category: @@ -683,14 +691,15 @@ pl: no_results_title_text: Obecnie nie są dostępne żadne relacje. blankslate_heading: "Brak relacji" blankslate_description: "Ten pakiet roboczy nie ma jeszcze żadnych relacji." + label_add_child_button: "Element podrzędny" label_add_x: "Dodaj %{x}" label_edit_x: "Edytuj %{x}" label_add_description: "Dodaj opis" lag: subject: "Opóźnienie" - title: "Opóźnienie (w dniach)" caption: "Minimalna liczba dni roboczych wymagana między dwoma pakietami roboczymi." relations: + label_new_child_created: "Nowy pakiet roboczy utworzono i dodano jako element podrzędny" label_relates_singular: "ma relację z" label_relates_plural: "ma relację z" label_relates_to_singular: "ma relację z" @@ -705,6 +714,9 @@ pl: follows_description: "Powiązany pakiet roboczy musi koniecznie zostać ukończony przed rozpoczęciem tego pakietu" label_child_singular: "element podrzędny" label_child_plural: "elementy podrzędne" + new_child: "Nowy element podrzędny" + new_child_text: "Tworzy powiązany pakiet roboczy jako element podrzędny bieżącego (nadrzędnego) pakietu roboczego" + existing_child: "Istniejący element podrzędny" child_description: "Ustawia powiązany pakiet roboczy jako element podrzędny bieżącego (nadrzędnego) pakietu roboczego" label_blocks_singular: "blok" label_blocks_plural: "bloki" @@ -741,6 +753,8 @@ pl: required_description: "Oznacza ten pakiet roboczy jako wymaganie powiązanego pakietu roboczego" label_parent_singular: "nadrzędny" label_parent_plural: "nadrzędne" + ghost_relation_title: "Powiązany pakiet roboczy" + ghost_relation_description: "To nie jest widoczne dla Ciebie ze względu na uprawnienia." label_invitation: Zaproszenie account: delete: "Usuń konto" @@ -805,6 +819,7 @@ pl: is_required: "Wymagane" max_length: "Maksymalna długość" min_length: "Minimalna długość" + content_right_to_left: "Treść od prawej do lewej" multi_value: "Zezwól na wybór wielokrotny" possible_values: "Możliwe wartości" regexp: "Wyrażenie regularne" @@ -840,6 +855,8 @@ pl: attr_lastname: "Atrybut nazwiska" attr_login: "Atrybut nazwy użytkownika" attr_mail: "Atrybut adresu e-mail" + filter_string: "Ciąg filtru" + admin: "Administrator" base_dn: "Bazowa nazwa wyróżniająca" host: "Host" onthefly: "Automatyczne tworzenie użytkowników" @@ -883,6 +900,9 @@ pl: project_custom_field: is_required: "Wymagane dla wszystkich projektów" custom_field_section: Sekcja + project/life_cycle_step_definition: + name: "Nazwa" + color: "Kolor" query: column_names: "Kolumny" relations_to_type_column: "Relacje %{type}" @@ -892,7 +912,7 @@ pl: timeline_labels: "Etykiety osi czasu" relation: lag: "Opóźnienie" - from: "Zadanie" + from: "Powiązany pakiet roboczy" to: "Powiązanie zadania" reminder: remind_at_date: "Data" @@ -1216,12 +1236,16 @@ pl: typed_dag: circular_dependency: "Relacja tworzy krąg relacji." attributes: - to: - error_not_found: "nie można znaleźć lub wizualizować zadania w pozycji \"do\"" - error_readonly: "nie można zmienić odnośnika bieżącego powiązania \"do\"" - from: - error_not_found: "nie można znaleźć lub wizualizować zadania w pozycji \"od\"" - error_readonly: "nie można zmienić odnośnika bieżącego powiązania \"of\"" + to_id: + error_not_found: "nie znaleziono lub niewidoczny." + error_readonly: "nie można zmienić dla istniejących relacji." + from_id: + error_not_found: "nie znaleziono lub niewidoczny." + error_readonly: "nie można zmienić dla istniejących relacji." + lag: + greater_than_or_equal_to: + zero: "— wartość nie może być ujemna." + less_than_or_equal_to: "— wartość jest zbyt wysoka." repository: not_available: "Producent SCM nie jest dostępny" not_whitelisted: "nie jest dozwolone w tej konfiguracji." @@ -1596,8 +1620,9 @@ pl: button_copy_and_follow: "Skopiuj i wykonaj" button_create: "Utwórz" button_create_and_continue: "Utwórz i kontynuuj" - button_delete: "Usuń" button_decline: "Odrzuć" + button_delete: "Usuń" + button_delete_permanently: "Usuń trwale" button_delete_watcher: "Usunąć obserwatora %{name}" button_download: "Pobierz" button_duplicate: "Duplikat" @@ -1836,6 +1861,11 @@ pl: few: "godzin" many: "godzin" other: "godzin" + day: + one: "dzień" + few: "dni" + many: "dni" + other: "dnia" description_active: "Aktywne?" description_attachment_toggle: "Pokaż/Ukryj załączniki" description_autocomplete: > @@ -1871,6 +1901,10 @@ pl: upsale: title: "Dodatek wersji Enterprise" link_title: "Więcej informacji" + automatic_subject_generation: + description: "Utwórz automatycznie generowane tematy za pomocą wywoływanych atrybutów i tekstu." + customize_life_cycle: + description: "Twórz i organizuj etapy i bramki projektu inne niż zapewniane przez planowanie cyklu projektu PM2." form_configuration: description: "Dostosuj konfigurację formularza za pomocą tych dodatków:" add_groups: "Dodaj nowe grupy atrybutów" @@ -2233,6 +2267,7 @@ pl: label_add_subtask: "Dodać zadanie podrzędne" label_added: "dodane" label_added_by: "Dodał %{author}" + label_added_by_on: "Dodał użytkownik %{author} w dniu %{date}" label_added_time_by: "Dodane przez %{author} %{age} temu" label_additional_workflow_transitions_for_assignee: "Dodatkowe przejścia dozwolone, gdy użytkownik jest cesjonariuszem" label_additional_workflow_transitions_for_author: "Dodatkowe przejścia dozwolone, gdy użytkownik jest autorem" @@ -2653,6 +2688,7 @@ pl: label_project_new: "Nowy projekt" label_project_plural: "Projekty" label_project_list_plural: "Listy projektów" + label_project_lifecycle: "Cykl życia projektu" label_project_attributes_plural: "Atrybuty projektu" label_project_custom_field_plural: "Atrybuty projektu" label_project_settings: "Ustawienia projektu" @@ -2679,6 +2715,7 @@ pl: label_relation: "Relacja" label_relation_actions: "Działania relacji" label_relation_delete: "Usuń powiązanie" + label_relation_edit: "Edytuj relację" label_relation_new: "Nowe powiązanie" label_release_notes: "Dziennik zamian" label_remaining_work: "Pozostała praca" @@ -3096,6 +3133,7 @@ pl: notice_bad_request: "Nieprawidłowe żądanie." notice_not_authorized: "Brak uprawnień dostępu do tej strony." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Brak tokenu wersji Enterprise lub nie zezwala ona na dostęp do tej strony." notice_password_confirmation_failed: "Nieprawidłowe hasło. Nie można kontynuować." notice_principals_found_multiple: "Znaleziono %{number} wyników.\nNaciśnij Tab, aby wybrać pierwszy rezultat." notice_principals_found_single: "Znaleziono 1 wynik.\nNaciśnij Tab, aby go wybrać." @@ -3146,7 +3184,7 @@ pl: text_getting_started_description: "Uzyskaj szybki przegląd zarządzania projektem i współpracy zespołu w OpenProject. Możesz zrestartować ten film z menu pomocy." welcome: "Witamy w %{app_title}" select_language: "Wybierz język" - permission_add_work_package_notes: "Dodawanie notatek" + permission_add_work_package_notes: "Dodaj komentarze" permission_add_work_packages: "Dodawanie pakietów roboczych" permission_add_messages: "Wysyłanie wiadomości" permission_add_project: "Utwórz projekty" @@ -3176,10 +3214,11 @@ pl: permission_delete_timelines: "Usuwanie osi czasu" permission_delete_wiki_pages: "Usuwanie stron wiki" permission_delete_wiki_pages_attachments: "Usuwanie załączników" - permission_edit_work_package_notes: "Edycja notatek" + permission_edit_work_package_notes: "Moderuj komentarze" + permission_edit_work_package_notes_explanation: "Przestroga: użytkownicy z tym uprawnieniem mogą edytować komentarze wszystkich innych osób." permission_edit_work_packages: "Edycja pakietów roboczych" permission_edit_messages: "Edycja wiadomości" - permission_edit_own_work_package_notes: "Edycja własnych notatek" + permission_edit_own_work_package_notes: "Edytuj własne komentarze" permission_edit_own_messages: "Edycja własnych wiadomości" permission_edit_own_time_entries: "Edycja własnych wpisów dziennika" permission_edit_project: "Edycja projektu" @@ -3406,6 +3445,7 @@ pl: activated: "aktywowano" deactivated: "dezaktywowano" search_input_placeholder: "Wyszukaj ..." + setting_apiv3_cors_title: "Współdzielenie zasobów między źródłami (CORS)" setting_apiv3_cors_enabled: "Włącz CORS" setting_apiv3_cors_origins: "Dozwolone źródła mechanizmu Cross-Origin Resource Sharing (CORS) interfejsu API V3" setting_apiv3_cors_origins_text_html: > @@ -3631,6 +3671,27 @@ pl: new: heading: "Nowy atrybut" description: "Zmiany tego atrybutu projektu zostaną odzwierciedlone we wszystkich projektach, w których jest on włączony. Wymaganych atrybutów nie można wyłączyć dla poszczególnych projektów." + project_life_cycle_step_definitions: + heading: "Cykl życia projektu" + heading_description: "Cykl życia projektu składa się z etapów i bramek, które kształtują Twoje projekty. Będą one wyświetlane na stronie przeglądu projektu i będą dostępne na liście projektów. Poszczególne etapy i bramki można wybrać w celu dostosowania projektu, ale nie można zmienić kolejności na poziomie projektu." + label_add: "Dodaj" + label_add_description: "Dodaj definicję cyklu życia" + label_add_stage: "Etap" + label_add_gate: "Bramka" + filter: + label: "Wyszukaj etap lub brankę projektu" + section_header: "Etapy i bramki" + non_defined: "Ani etapy, ani bramki nie są obecnie zdefiniowane." + new: + description: "Zmiany w tym kroku projektu zostaną odzwierciedlone we wszystkich projektach, w których jest on włączony." + new_stage: + heading: "Nowy etap" + new_gate: + heading: "Nowa bramka" + edit_stage: + heading: "Edytuj etap" + edit_gate: + heading: "Edytuj bramkę" projects: missing_dependencies: "Sprawdzono moduł projektu %{module}, który zależy od %{dependencies}. Musisz sprawdzić również te zależności." section_new_projects: "Ustawienia nowych projektów" @@ -3664,6 +3725,7 @@ pl: text_are_you_sure_continue: "Czy na pewno chcesz kontynuować?" text_are_you_sure_with_children: "Usunąć pakiet roboczy i wszystkie podrzędne pakiety?" text_are_you_sure_with_project_custom_fields: "Usunięcie tego atrybutu spowoduje również usunięcie jego wartości we wszystkich projektach. Czy na pewno chcesz to zrobić?" + text_are_you_sure_with_project_life_cycle_step: "Usunięcie tego kroku spowoduje również usunięcie jego użycia we wszystkich projektach. Czy na pewno chcesz to zrobić?" text_assign_to_project: "Przypisz do projektu" text_form_configuration: > Możesz określić, które pola będą wyświetlane w formularzach Work Package. Możesz dowolnie grupować pola aby dostosować do swoich potrzeb. @@ -3743,6 +3805,7 @@ pl: text_notice_security_badge_displayed_html: > Uwaga: jeśli opcja jest włączona, w panelu administracyjnym %{information_panel_label} oraz na stronie głównej wyświetlona zostanie plakietka ze statusem instalacji. Jest ona wyświetlana tylko administratorom.
    Plakietka uruchomi kontrolę bieżącej wersji OpenProject w porównaniu do oficjalnej bazy danych wersji OpenProject, aby ostrzec o wszelkich aktualizacjach lub znanych lukach. Więcej informacji na temat tego, co zapewnia kontrola, jakie dane są potrzebne do podania dostępnych aktualizacji i jak wyłączyć tę kontrolę zawiera dokumentacja konfiguracji. text_own_membership_delete_confirmation: "Chcesz usunąć niektóre lub wszystkie swoje uprawnienia, przez które możesz nie być w stanie edytować tego projektu.\nCzy na pewno chcesz kontynuować?" + text_permanent_delete_confirmation_checkbox_label: "Rozumiem, że tego usunięcia nie można cofnąć" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Napędzany przez %{link}" text_project_identifier_info: "Tylko małe litery (a-z), cyfry, myślniki i podkreślenia są dozwolone, oraz musi zaczynać się małą literą." @@ -4113,6 +4176,8 @@ pl: builtin: Wbudowana aplikacja confidential: Poufne singular: "Aplikacje OAuth" + scopes: "Zakresy" + client_credentials: "Poświadczenia klienta" plural: "Aplikacje OAuth" named: "Aplikacja OAuth „%{name}”" new: "Nowa aplikacja OAuth" diff --git a/config/locales/crowdin/pt-BR.yml b/config/locales/crowdin/pt-BR.yml index c5cac92400c9..720ecb0d9aa9 100644 --- a/config/locales/crowdin/pt-BR.yml +++ b/config/locales/crowdin/pt-BR.yml @@ -228,6 +228,10 @@ pt-BR: item: title: Este item não possui nenhum nível de hierarquia abaixo description: Adicione itens a esta lista para criar subitens dentro de outro item + delete_dialog: + title: "Excluir item de campo personalizado" + heading: "Excluir item de campo personalizado?" + description: "Esta ação removerá o item e todos os seus subitens de forma permanente. Todos os valores atribuídos serão excluídos. Se este campo for obrigatório, a remoção pode invalidar pacotes de trabalho existentes." placeholder: label: "Rótulo do item" short: "Nome abreviado" @@ -248,6 +252,7 @@ pt-BR: confirm_destroy_option: "Removendo uma opção removerá todas as suas ocorrências (ex. em pacotes de trabalho). Tem certeza que você quer removê-la?" reorder_alphabetical: "Reorganizar valores em ordem alfabética" reorder_confirmation: "Aviso: A ordem atual dos valores disponíveis será perdida. Continuar?" + placeholder_version_select: "Primeiro é necessária a seleção do pacote de trabalho ou projeto" instructions: is_required: "Marcar o campo personalizado como obrigatório. Isto tornará obrigatório o preenchimento do campo ao criar novos recursos ou ao atualizar recursos existentes." is_required_for_project: "Marque esta opção para ativar este atributo e torná-lo obrigatório em todos os projetos. Este atributo não pode ser desativado em projetos individuais." @@ -286,6 +291,7 @@ pt-BR: label: "Rótulo" short: "Nome abreviado" parent: "Pai" + blueprint: "Esquema de padrão" global_search: placeholder: "Buscar em %{app_title}" overwritten_tabs: @@ -468,6 +474,7 @@ pt-BR: my: access_token: create_dialog: + title: Token criado header: O token %{type} foi gerado warning: Esta é a única vez que você verá este token. Certifique-se de copiá-lo agora. errors: @@ -643,6 +650,7 @@ pt-BR: title: "Fluxo de trabalho ausente para compartilhamento de pacotes de trabalho" message: "Nenhum fluxo de trabalho está configurado para a função \"Editor de pacote de trabalho\". Sem um fluxo de trabalho, o usuário compartilhado não pode alterar o status do pacote de trabalho. Os fluxos de trabalho podem ser copiados. Selecione um tipo de origem (ex.: \"Tarefa\") e uma função de origem (ex.: \"Membro\"). Em seguida, selecione os tipos de destino. Para começar, você pode selecionar todos os tipos como alvos. Por fim, selecione a função \"Editor de pacote de trabalho\" como o destino e pressione \"Copiar\". Depois de criar os padrões, ajuste os fluxos de trabalho da mesma forma que faz para todas as outras funções." link_message: "Configure os fluxos de trabalho na administração." + templated_subject_hint: Gerado automaticamente através do tipo %{type} summary: reports: category: @@ -665,14 +673,15 @@ pt-BR: no_results_title_text: No momento, não há relações disponíveis. blankslate_heading: "Sem vínculos" blankslate_description: "Este pacote de trabalho ainda não está relacionado a nenhum outro." + label_add_child_button: "Filho" label_add_x: "Adicionar %{x}" label_edit_x: "Editar %{x}" label_add_description: "Adicionar descrição" lag: subject: "Atraso" - title: "Atraso (em dias)" caption: "O número mínimo de dias úteis a ser mantido entre os dois pacotes de trabalho." relations: + label_new_child_created: "Novo pacote de trabalho criado e adicionado como subpacote" label_relates_singular: "relacionado a" label_relates_plural: "relacionado a" label_relates_to_singular: "relacionado a" @@ -687,6 +696,9 @@ pt-BR: follows_description: "O pacote de trabalho relacionado deve ser finalizado antes que este possa ser iniciado" label_child_singular: "filho" label_child_plural: "filhos" + new_child: "Novo filho" + new_child_text: "Cria um pacote de trabalho relacionado como um subpacote do pacote de trabalho atual (pai)" + existing_child: "Filho existente" child_description: "Torna o pacote de trabalho relacionado uma subtarefa do pacote de trabalho atual (pai)" label_blocks_singular: "blocos" label_blocks_plural: "blocos" @@ -723,6 +735,8 @@ pt-BR: required_description: "Marca este pacote de trabalho como um requisito para o pacote de trabalho relacionado" label_parent_singular: "pais" label_parent_plural: "pais" + ghost_relation_title: "Pacote de trabalho relacionado" + ghost_relation_description: "Você não possui permissão para visualizar isso." label_invitation: Convite account: delete: "Excluir conta" @@ -787,6 +801,7 @@ pt-BR: is_required: "Obrigatório" max_length: "Tamanho máximo" min_length: "Tamanho mínimo" + content_right_to_left: "Conteúdo da direita para a esquerda" multi_value: "Permitir seleção múltipla" possible_values: "Valores possíveis" regexp: "Expressão regular" @@ -822,6 +837,8 @@ pt-BR: attr_lastname: "Atributo de sobrenome" attr_login: "Atributo de nome de usuário" attr_mail: "Atributo de e-mail" + filter_string: "String de Filtro" + admin: "Administrador" base_dn: "DN base" host: "Host" onthefly: "Criação automática de usuário" @@ -865,6 +882,9 @@ pt-BR: project_custom_field: is_required: "Obrigatório para todos os projetos" custom_field_section: Seção + project/life_cycle_step_definition: + name: "Nome" + color: "Cor" query: column_names: "Colunas" relations_to_type_column: "Relações com %{type}" @@ -874,7 +894,7 @@ pt-BR: timeline_labels: "Rótulos de linha do tempo" relation: lag: "Atraso" - from: "Pacote de trabalho" + from: "Pacote de trabalho relacionado" to: "Pacote de trabalho relacionado" reminder: remind_at_date: "Data" @@ -1198,12 +1218,16 @@ pt-BR: typed_dag: circular_dependency: "O relacionamento cria um círculo de relacionamentos." attributes: - to: - error_not_found: "pacote de trabalho na posição 'para' não foi encontrado ou não está visível" - error_readonly: "uma relação existente de link `para` é imutável" - from: - error_not_found: "pacote de trabalho na posição 'de' não foi encontrado ou não está visível" - error_readonly: "uma relação existente de link `de` é imutável" + to_id: + error_not_found: "não encontrado ou não visível." + error_readonly: "não pode ser alterado para relações existentes." + from_id: + error_not_found: "não encontrado ou não visível." + error_readonly: "não pode ser alterado para relações existentes." + lag: + greater_than_or_equal_to: + zero: "não pode ser negativo." + less_than_or_equal_to: "é muito alto." repository: not_available: "Fornecedor SCM não está disponível" not_whitelisted: "não é permitido pela configuração." @@ -1558,8 +1582,9 @@ pt-BR: button_copy_and_follow: "Copiar e seguir" button_create: "Criar" button_create_and_continue: "Criar e continuar" - button_delete: "Excluir" button_decline: "Recusar" + button_delete: "Excluir" + button_delete_permanently: "Excluir de forma permanente" button_delete_watcher: "Excluir observador %{name}" button_download: "Baixar" button_duplicate: "Duplicar" @@ -1762,6 +1787,9 @@ pt-BR: hour: one: "hora" other: "hora" + day: + one: "dia" + other: "dias" description_active: "Ativo?" description_attachment_toggle: "Mostrar/Ocultar anexos" description_autocomplete: > @@ -1797,6 +1825,10 @@ pt-BR: upsale: title: "Complemento empresarial" link_title: "Mais informações" + automatic_subject_generation: + description: "Crie assuntos gerados automaticamente com base em atributos e textos referenciados." + customize_life_cycle: + description: "Crie e organize estágios e marcos do projeto diferentes dos definidos no planejamento do ciclo de vida do projeto PM2." form_configuration: description: "Personalize a configuração do formulário com estes complementos adicionais:" add_groups: "Adicionar novos grupos de atributos" @@ -2159,6 +2191,7 @@ pt-BR: label_add_subtask: "Adicionar subtarefa" label_added: "adicionado" label_added_by: "Adicionado por %{author}" + label_added_by_on: "Adicionado por %{author} em %{date}" label_added_time_by: "Adicionado por %{author} %{age} atrás" label_additional_workflow_transitions_for_assignee: "Transições adicionais permitidas quando o usuário é o responsável" label_additional_workflow_transitions_for_author: "Transições adicionais permitidas quando o usuário é o autor" @@ -2579,6 +2612,7 @@ pt-BR: label_project_new: "Novo projeto" label_project_plural: "Projetos" label_project_list_plural: "Listas de projeto" + label_project_lifecycle: "Ciclo de vida do projeto" label_project_attributes_plural: "Atributos do projeto" label_project_custom_field_plural: "Atributos do projeto" label_project_settings: "Configurações do projeto" @@ -2605,6 +2639,7 @@ pt-BR: label_relation: "Relação" label_relation_actions: "Ações da relação" label_relation_delete: "Excluir relação" + label_relation_edit: "Editar relação" label_relation_new: "Nova relação" label_release_notes: "Notas da versão" label_remaining_work: "Trabalho restante" @@ -3020,6 +3055,7 @@ pt-BR: notice_bad_request: "Requisição Inválida." notice_not_authorized: "Você não está autorizado a acessar esta página." notice_not_authorized_archived_project: "O projeto que você está tentando acessar foi arquivado." + notice_requires_enterprise_token: "O token corporativo está ausente ou não permite acesso a esta página." notice_password_confirmation_failed: "Sua senha não está correta. Não é possível continuar." notice_principals_found_multiple: "Existe(m) %{number} resultado(s) encontrado(s).\nTecle tab para ir ao primeiro resultado." notice_principals_found_single: "Existe um resultado. Tecle tab para ir para ele." @@ -3068,7 +3104,7 @@ pt-BR: text_getting_started_description: "Obtenha uma visão geral da gestão de projetos e colaboração entre equipes com o OpenProject. Você pode assistir este vídeo novamente no menu de ajuda." welcome: "Bem-vindo ao %{app_title}" select_language: "Por favor, selecione seu idioma" - permission_add_work_package_notes: "Adicionar anotações" + permission_add_work_package_notes: "Adicionar comentários" permission_add_work_packages: "Adicionar pacotes de trabalho" permission_add_messages: "Postar mensagens" permission_add_project: "Criar projetos" @@ -3098,10 +3134,11 @@ pt-BR: permission_delete_timelines: "Excluir cronogramas" permission_delete_wiki_pages: "Excluir páginas wiki" permission_delete_wiki_pages_attachments: "Excluir anexos" - permission_edit_work_package_notes: "Editar anotações" + permission_edit_work_package_notes: "Moderar comentários" + permission_edit_work_package_notes_explanation: "Atenção: Usuários com esta permissão podem editar comentários de qualquer pessoa." permission_edit_work_packages: "Editar pacotes de trabalho" permission_edit_messages: "Editar mensagens" - permission_edit_own_work_package_notes: "Editar as próprias anotações" + permission_edit_own_work_package_notes: "Editar os próprios comentários" permission_edit_own_messages: "Editar as próprias mensagens" permission_edit_own_time_entries: "Editar os próprios registros de tempo" permission_edit_project: "Editar projeto" @@ -3330,6 +3367,7 @@ pt-BR: activated: "ativado" deactivated: "desativado" search_input_placeholder: "Pesquisar..." + setting_apiv3_cors_title: "Compartilhamento de recursos entre origens (CORS)" setting_apiv3_cors_enabled: "Habilitar CORS" setting_apiv3_cors_origins: "Cross-Origin Resource Sharing (CORS) permitidos pela API V3" setting_apiv3_cors_origins_text_html: > @@ -3555,6 +3593,27 @@ pt-BR: new: heading: "Novo atributo" description: "As alterações realizadas neste atributo do projeto serão aplicadas em todos os projetos onde ele estiver habilitado. Atributos obrigatórios não podem ser desativados em projetos específicos." + project_life_cycle_step_definitions: + heading: "Ciclo de vida do projeto" + heading_description: "O ciclo de vida do projeto é composto por fases e marcos que estruturam seus projetos. Eles serão exibidos na página de visão geral do projeto e estarão disponíveis na lista de projetos. É possível selecionar fases e marcos individuais para personalizar um projeto, mas a reordenação não pode ser feita no nível do projeto." + label_add: "Adicionar" + label_add_description: "Adicionar definição de ciclo de vida" + label_add_stage: "Fase" + label_add_gate: "Portão" + filter: + label: "Pesquisar fase ou marco do projeto" + section_header: "Fases e marcos" + non_defined: "Nem fases nem marcos estão atualmente definidos." + new: + description: "Alterações neste estágio do projeto serão aplicadas a todos os projetos nos quais ele esteja ativado." + new_stage: + heading: "Novo fase" + new_gate: + heading: "Novo marco" + edit_stage: + heading: "Editar fase" + edit_gate: + heading: "Editar marco" projects: missing_dependencies: "Módulo de projeto %{module} foi verificado e depende de %{dependencies}. Você também precisa verificar estas dependências." section_new_projects: "Configurações para novos projetos" @@ -3588,6 +3647,7 @@ pt-BR: text_are_you_sure_continue: "Tem certeza de que deseja continuar?" text_are_you_sure_with_children: "Excluir o pacote de trabalho e todos os pacotes de trabalho filhos?" text_are_you_sure_with_project_custom_fields: "Ao excluir este atributo, os valores associados a ele serão removidos de todos os projetos. Tem certeza de que deseja continuar?" + text_are_you_sure_with_project_life_cycle_step: "Ao excluir esta etapa, os usos associados a ele serão removidos de todos os projetos. Tem certeza de que deseja continuar?" text_assign_to_project: "Atribuir ao projeto" text_form_configuration: > Você pode personalizar quais campos serão exibidos em formulários de pacote de trabalho. Livremente, você pode agrupar os campos para refletir as necessidades para o seu domínio. @@ -3667,6 +3727,7 @@ pt-BR: text_notice_security_badge_displayed_html: > Nota: se habilitado, isto irá exibir um distintivo com o seu status de instalação no %{information_panel_label}painel de administração e na página inicial. Ele é exibido apenas para administradores.
    O distintivo verificará sua versão do OpenProject contra o banco de dados oficial de versões do OpenProject para alertá-lo de quaisquer atualizações ou vulnerabilidades conhecidas. Para obter mais informações sobre o que fornece este distintivo, quais dados necessários para fornecer atualizações disponíveis e como desativar este distintivo, por favor verifique a documentação de configuração. text_own_membership_delete_confirmation: "Você está prestes a remover algumas ou todas as permissões e você pode não ser capaz de editar este projeto depois disso. Tem certeza que deseja continuar?" + text_permanent_delete_confirmation_checkbox_label: "Compreendo que esta exclusão é irreversível" text_plugin_assets_writable: "Diretório de plugins ativos é gravável" text_powered_by: "Desenvolvido por %{link}" text_project_identifier_info: "Apenas letras minúsculas (a-z), números, hífens e sublinhados são permitidos, deve-se começar com uma letra minúscula." @@ -4034,6 +4095,8 @@ pt-BR: builtin: Aplicativo de instância integrado confidential: Confidencial singular: "Aplicação OAuth" + scopes: "Escopos" + client_credentials: "Credenciais do cliente" plural: "Aplicações OAuth" named: "Aplicação OAuth '%{name}'" new: "Nova aplicação OAuth" diff --git a/config/locales/crowdin/pt-PT.yml b/config/locales/crowdin/pt-PT.yml index 0f8168181bd6..36b792d70cf7 100644 --- a/config/locales/crowdin/pt-PT.yml +++ b/config/locales/crowdin/pt-PT.yml @@ -227,6 +227,10 @@ pt-PT: item: title: Este item não tem nenhum nível hierárquico abaixo description: Adicione itens a esta lista para criar subitens dentro de outra lista + delete_dialog: + title: "Eliminar item de campo personalizado" + heading: "Eliminar item de campo personalizado?" + description: "Esta ação irá remover irreversivelmente o item e todos os seus subitens. Todos os valores atribuídos serão permanentemente eliminados. Se este campo for obrigatório, a remoção de itens pode fazer com que os pacotes de trabalho existentes se tornem inválidos." placeholder: label: "Etiqueta do item" short: "Nome abreviado" @@ -247,6 +251,7 @@ pt-PT: confirm_destroy_option: "Apagar uma opção irá apagar todas as suas ocorrências (ex. em pacotes de trabalho). Tem certeza que quer apagá-la?" reorder_alphabetical: "Reordenar valores em ordem alfabética" reorder_confirmation: "Aviso: A ordem atual de valores disponíveis será perdida. Continuar?" + placeholder_version_select: "A seleção do pacote de trabalho ou do projeto é necessária em primeiro lugar" instructions: is_required: "Marque o campo personalizado como obrigatório. Isto tornará obrigatório o preenchimento do campo ao criar novos recursos ou ao atualizar recursos existentes." is_required_for_project: "Selecione para ativar este atributo e torná-lo obrigatório em todos os projetos. Não pode ser desativado para projetos individuais." @@ -285,6 +290,7 @@ pt-PT: label: "Etiqueta" short: "Nome abreviado" parent: "Principal" + blueprint: "Modelo do plano" global_search: placeholder: "Pesquisar em %{app_title}" overwritten_tabs: @@ -467,6 +473,7 @@ pt-PT: my: access_token: create_dialog: + title: Token gerado header: O token %{type} foi gerado warning: Note que esta é a única vez que irá ver este token, certifique-se de que o copia agora. errors: @@ -643,6 +650,7 @@ pt-PT: title: "Falta um fluxo de trabalho para a partilha de pacotes de trabalho" message: "Nenhum fluxo de trabalho está configurado para a função \"Editor do pacote de trabalho\". Sem um fluxo de trabalho, o utilizador não pode alterar o estado do pacote de trabalho. Os fluxos de trabalho podem ser copiados. Selecione um tipo de fonte (por exemplo, \"Tarefa\") e uma função da fonte (por exemplo, \"Membro\"). Em seguida, selecione os tipos de destino. Para começar, pode selecionar todos os tipos como alvos. Por fim, selecione a função \"Editor do pacote de trabalho\" como destino e prima \"Copiar\". Depois de ter criado as predefinições, ajuste os fluxos de trabalho como faz para todas as outras funções." link_message: "Configure os fluxos de trabalho na administração." + templated_subject_hint: Gerado automaticamente através do tipo %{type} summary: reports: category: @@ -665,14 +673,15 @@ pt-PT: no_results_title_text: Atualmente, não existem relações disponíveis. blankslate_heading: "Sem relações" blankslate_description: "Este pacote de trabalho ainda não tem quaisquer relações." + label_add_child_button: "Elemento secundário" label_add_x: "Adicionar %{x}" label_edit_x: "Editar %{x}" label_add_description: "Adicionar descrição" lag: subject: "Desfasamento" - title: "Desfasamento (em dias)" caption: "O número mínimo de dias úteis a manter entre os dois pacotes de trabalho." relations: + label_new_child_created: "Novo pacote de trabalho criado e adicionado como um elemento secundário" label_relates_singular: "relacionado com" label_relates_plural: "relacionado com" label_relates_to_singular: "relacionado com" @@ -687,6 +696,9 @@ pt-PT: follows_description: "O pacote de trabalho relacionado tem necessariamente de ser iniciado antes deste começar" label_child_singular: "secundário" label_child_plural: "secundários" + new_child: "Novo elemento secundário" + new_child_text: "Cria um pacote de trabalho relacionado como um subitem do pacote de trabalho atual (principal)" + existing_child: "Elemento secundário existente" child_description: "Torna o pacote de trabalho relacionado num subitem do pacote de trabalho atual (principal)" label_blocks_singular: "bloqueia" label_blocks_plural: "bloqueia" @@ -723,6 +735,8 @@ pt-PT: required_description: "Assinala este pacote de trabalho como sendo um requisito para o pacote relacionado" label_parent_singular: "principal" label_parent_plural: "principal" + ghost_relation_title: "Pacote de trabalho relacionado" + ghost_relation_description: "Não tem as permissões necessárias para ver isto." label_invitation: Convite account: delete: "Eliminar conta" @@ -787,6 +801,7 @@ pt-PT: is_required: "Obrigatório" max_length: "Tamanho máximo" min_length: "Tamanho mínimo" + content_right_to_left: "Conteúdo da direita para a esquerda" multi_value: "Permitir seleção múltipla" possible_values: "Valores possíveis" regexp: "Expressão regular" @@ -822,6 +837,8 @@ pt-PT: attr_lastname: "Atributo Sobrenome" attr_login: "Atributo Utilizador" attr_mail: "Atributo E-mail" + filter_string: "Cadeia do filtro" + admin: "Administrador" base_dn: "Base DN" host: "Anfitrião" onthefly: "Criação automática de utilizador" @@ -865,6 +882,9 @@ pt-PT: project_custom_field: is_required: "Obrigatório para todos os projetos" custom_field_section: Secção + project/life_cycle_step_definition: + name: "Nome" + color: "Cor" query: column_names: "Colunas" relations_to_type_column: "Relações com %{type}" @@ -874,7 +894,7 @@ pt-PT: timeline_labels: "Etiquetas de cronograma" relation: lag: "Atraso" - from: "Pacote de trabalho" + from: "Pacote de trabalho relacionado" to: "Tarefas Relacionadas" reminder: remind_at_date: "Data" @@ -1198,12 +1218,16 @@ pt-PT: typed_dag: circular_dependency: "A relação cria um círculo de relações." attributes: - to: - error_not_found: "pacote de trabalho na posição 'para' não foi encontrada ou não está visível" - error_readonly: "uma ligação 'para' existente não pode ser mudada" - from: - error_not_found: "pacote de trabalho na posição 'de' não foi encontrada ou não está visível" - error_readonly: "uma ligação 'de' existente não pode ser mudada" + to_id: + error_not_found: "não encontrado ou não visível." + error_readonly: "não pode ser alterado para as relações existentes." + from_id: + error_not_found: "não encontrado ou não visível." + error_readonly: "não pode ser alterado para as relações existentes." + lag: + greater_than_or_equal_to: + zero: "não pode ser negativo." + less_than_or_equal_to: "é demasiado elevado." repository: not_available: "Fornecedor SCM não está disponível" not_whitelisted: "não é permitido pela configuração." @@ -1558,8 +1582,9 @@ pt-PT: button_copy_and_follow: "Copiar e seguir" button_create: "Criar" button_create_and_continue: "Criar e continuar" - button_delete: "Eliminar" button_decline: "Rejeitar" + button_delete: "Eliminar" + button_delete_permanently: "Eliminar permanentemente" button_delete_watcher: "Eliminar observador %{name}" button_download: "Transferir" button_duplicate: "Duplicar" @@ -1762,6 +1787,9 @@ pt-PT: hour: one: "hora" other: "horas" + day: + one: "dia" + other: "dias" description_active: "Ativo?" description_attachment_toggle: "Mostrar/ocultar anexos" description_autocomplete: > @@ -1797,6 +1825,10 @@ pt-PT: upsale: title: "Suplemento Enterprise" link_title: "Mais informação" + automatic_subject_generation: + description: "Crie temas gerados automaticamente utilizando atributos e texto referenciados." + customize_life_cycle: + description: "Crie e organize fases e portas de projeto diferentes das fornecidas pelo planeamento do ciclo de projeto PM2." form_configuration: description: "Personalize a configuração do formulário com estes complementos adicionais:" add_groups: "Adicionar novos grupos de atributos" @@ -2159,6 +2191,7 @@ pt-PT: label_add_subtask: "Adicionar subtarefa" label_added: "adicionado" label_added_by: "Adicionado por %{author}" + label_added_by_on: "Adicionado por %{author} a %{date}" label_added_time_by: "Adicionado por %{author} há %{age} atrás" label_additional_workflow_transitions_for_assignee: "Transições adicionais permitidas quando a tarefa está atribuída ao utilizador" label_additional_workflow_transitions_for_author: "Transições adicionais permitidas quando o utilizador é o autor da tarefa" @@ -2579,6 +2612,7 @@ pt-PT: label_project_new: "Novo Projecto" label_project_plural: "Projetos" label_project_list_plural: "Listas do projeto" + label_project_lifecycle: "Ciclo de vida do projeto" label_project_attributes_plural: "Atributos do projeto" label_project_custom_field_plural: "Atributos do projeto" label_project_settings: "Configurações do projeto" @@ -2605,6 +2639,7 @@ pt-PT: label_relation: "Relação" label_relation_actions: "Ações da relação" label_relation_delete: "Eliminar relação" + label_relation_edit: "Editar relação" label_relation_new: "Nova relação" label_release_notes: "Notas de lançamento" label_remaining_work: "Trabalho restante" @@ -3020,6 +3055,7 @@ pt-PT: notice_bad_request: "Pedido inválido." notice_not_authorized: "Não está autorizado a aceder a esta página." notice_not_authorized_archived_project: "O projeto ao qual tentou aceder foi arquivado." + notice_requires_enterprise_token: "O token da empresa está em falta ou não permite o acesso a esta página." notice_password_confirmation_failed: "A sua palavra passe está incorreta. Não foi possível continuar." notice_principals_found_multiple: "Foram encontrados %{number} resultados. Carregue em TAB para ver o primeiro resultado." notice_principals_found_single: "Foi encontrado um resultado. Carregue em TAB para vê-lo." @@ -3068,7 +3104,7 @@ pt-PT: text_getting_started_description: "Obtenha um resumo rápido da gestão do projeto e colaboração da equipa com o OpenProject. Pode reiniciar este vídeo a partir do menu de ajuda." welcome: "Bem-vindo ao %{app_title}" select_language: "Selecione o seu idioma" - permission_add_work_package_notes: "Adicionar notas" + permission_add_work_package_notes: "Adicionar comentários" permission_add_work_packages: "Adicionar tarefas" permission_add_messages: "Publicar mensagens" permission_add_project: "Criar projetos" @@ -3098,10 +3134,11 @@ pt-PT: permission_delete_timelines: "Apagar cronogramas" permission_delete_wiki_pages: "Eliminar páginas wiki" permission_delete_wiki_pages_attachments: "Eliminar anexos" - permission_edit_work_package_notes: "Editar notas" + permission_edit_work_package_notes: "Moderar comentários" + permission_edit_work_package_notes_explanation: "Atenção: os utilizadores com esta permissão podem editar os comentários de qualquer pessoa." permission_edit_work_packages: "Editar tarefas" permission_edit_messages: "Editar mensagens" - permission_edit_own_work_package_notes: "Editar as próprias notas" + permission_edit_own_work_package_notes: "Editar os próprios comentários" permission_edit_own_messages: "Editar as próprias mensagens" permission_edit_own_time_entries: "Editar registos pessoais de horas" permission_edit_project: "Editar projeto" @@ -3194,9 +3231,9 @@ pt-PT: are_you_sure: "Tem a certeza de que deseja arquivar o projeto '%{name}'?" archived: "Arquivado" count: - zero: "0 Projetos" - one: "1 Projeto" - other: "%{count} Projetos" + zero: "0 projetos" + one: "1 projeto" + other: "%{count} projetos" project_module_activity: "Atividade" project_module_forums: "Fórums" project_module_work_package_tracking: "Tarefas" @@ -3301,7 +3338,7 @@ pt-PT: storage: not_available: "O consumo de armazenamento de disco não está disponível para este repositório." update_timeout: "Manter as últimas informações de espaço em disco necessário para um repositório por N minutos. Como contar o espaço em disco necessário para um repositório pode ser caro, aumente este valor para reduzir o impacto no desempenho." - oauth_application_details: "O valor secreto do cliente não estará acessível novamente após fechar esta janela. Copie esses valores para as definições de integração do OpenProject da NextCloud:" + oauth_application_details: "O valor secreto do cliente não estará acessível novamente após fechar esta janela. Copie esses valores para as definições de integração do OpenProject da Nextcloud:" oauth_application_details_link_text: "Ir para a página de definições" setup_documentation_details: "Se precisar de ajuda para configurar um novo armazenamento de ficheiros, verifique a documentação: " setup_documentation_details_link_text: "Definição de armazenamentos" @@ -3328,6 +3365,7 @@ pt-PT: activated: "ativado" deactivated: "desativado" search_input_placeholder: "Procurar ..." + setting_apiv3_cors_title: "Partilha de recursos entre origens (CORS)" setting_apiv3_cors_enabled: "Habilitar CORS" setting_apiv3_cors_origins: "Partilha de recursos entre origens (CORS) permitidos pela API V3" setting_apiv3_cors_origins_text_html: > @@ -3553,6 +3591,27 @@ pt-PT: new: heading: "Novo atributo" description: "As alterações a este atributo do projeto irão refletir-se em todos os projetos em que estiver ativado. Os atributos obrigatórios não podem ser desativados por projeto." + project_life_cycle_step_definitions: + heading: "Ciclo de vida do projeto" + heading_description: "O ciclo de vida do projeto consiste em fases e portas que estruturam os seus projetos. Estas irão aparecer na página de visão geral de um projeto e estão disponíveis na lista de projetos. Pode selecionar fases e portas individuais para personalizar um projeto, mas não é possível reordenar ao nível do projeto." + label_add: "Adicionar" + label_add_description: "Adicionar definição do ciclo de vida" + label_add_stage: "Fase" + label_add_gate: "Porta" + filter: + label: "Pesquisar fase ou porta do projeto" + section_header: "Fases e portas" + non_defined: "Atualmente, não estão definidas nem as fases nem as portas." + new: + description: "As alterações a este passo do projeto serão refletidas em todos os projetos em que estiver ativado." + new_stage: + heading: "Nova fase" + new_gate: + heading: "Nova porta" + edit_stage: + heading: "Editar fase" + edit_gate: + heading: "Editar porta" projects: missing_dependencies: "Foi verificado o módulo do projeto %{module} que depende de %{dependencies}. Também tem de verificar estas dependências." section_new_projects: "Configurações para novos projetos" @@ -3586,6 +3645,7 @@ pt-PT: text_are_you_sure_continue: "Tem a certeza que deseja continuar?" text_are_you_sure_with_children: "Apagar o pacote de trabalho e todos os pacotes de trabalho filhos?" text_are_you_sure_with_project_custom_fields: "A eliminação deste atributo também elimina os seus valores em todos os projetos. Tem a certeza de que pretende fazê-lo?" + text_are_you_sure_with_project_life_cycle_step: "A eliminação deste passo também elimina as suas utilizações em todos os projetos. Tem a certeza de que pretende fazê-lo?" text_assign_to_project: "Atribuir ao projeto" text_form_configuration: > Pode personalizar quais os campos que serão exibidos nos formulários de pacote de trabalho. Pode agrupar livremente os campos para refletir as necessidades para o seu domínio. @@ -3665,6 +3725,7 @@ pt-PT: text_notice_security_badge_displayed_html: > Nota: se ativo, irá mostrar um emblema com o estado da sua instalação no painel de administração %{information_panel_label} e na página inicial. Só é mostrado a administradores.
    O emblema verificará a sua versão atual do OpenProject em relação à base de dados oficial da versão do OpenProject para o alertar sobre quaisquer atualizações ou vulnerabilidades conhecidas. Para obter mais informações sobre o que a verificação fornece, quais os dados que são necessários para fornecer atualizações disponíveis e como desativar esta verificação, visite the configuration documentation. text_own_membership_delete_confirmation: "Está prestes a eliminar parcial ou totalmente as suas permissões. É possível que não possa editar o projeto após esta acção.\nTem a certeza de que deseja continuar?" + text_permanent_delete_confirmation_checkbox_label: "Compreendo que esta eliminação não pode ser anulada" text_plugin_assets_writable: "É possíver escrever na pasta de ativos dos módulos de extensão" text_powered_by: "Desenvolvido por %{link}" text_project_identifier_info: "Apenas letras minúsculas (a-z), números, traços e underscores são permitidos, deve começar com uma letra minúscula." @@ -4033,6 +4094,8 @@ pt-PT: builtin: Aplicação de instância incorporada confidential: Confidencial singular: "Aplicação OAuth" + scopes: "Âmbitos" + client_credentials: "Credenciais do cliente" plural: "Aplicações OAuth" named: "Aplicação OAuth '%{name}'" new: "Nova aplicação OAuth" diff --git a/config/locales/crowdin/ro.yml b/config/locales/crowdin/ro.yml index 082abde9f29e..4d6da8c469c7 100644 --- a/config/locales/crowdin/ro.yml +++ b/config/locales/crowdin/ro.yml @@ -229,6 +229,10 @@ ro: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ ro: confirm_destroy_option: "Ștergerea unei opțiuni va șterge toate aparițiile acesteia (de exemplu, în pachetele de lucru). Sunteți sigur că doriți să o ștergeți?" reorder_alphabetical: "Reordonează valorile alfabetic" reorder_confirmation: "Avertisment: Ordinea curentă a valorilor disponibile se va pierde. Continuați?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Bifează pentru a activa acest atribut și a-l face obligatoriu în toate proiectele. Nu poate fi dezactivat pentru proiecte individuale." @@ -287,6 +292,7 @@ ro: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Caută în %{app_title}" overwritten_tabs: @@ -476,6 +482,7 @@ ro: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -655,6 +662,7 @@ ro: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -677,14 +685,15 @@ ro: no_results_title_text: Momentan nu există relaţii disponibile. blankslate_heading: "Fără relații" blankslate_description: "Acest pachet de lucru nu are încă o relație." + label_add_child_button: "Child" label_add_x: "Adaugă %{x}" label_edit_x: "Editează %{x}" label_add_description: "Adaugă descriere" lag: subject: "Întârziere" - title: "Întârziere (în zile)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "asociat cu" label_relates_plural: "asociat cu" label_relates_to_singular: "asociat cu" @@ -699,6 +708,9 @@ ro: follows_description: "Pachetul de lucru asociat trebuie neapărat să înceapă după finalizarea acestuia" label_child_singular: "copil" label_child_plural: "copii" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Face din pachetul de lucru asociat un subelement al pachetului de lucru actual (părinte)" label_blocks_singular: "blochează" label_blocks_plural: "blochează" @@ -735,6 +747,8 @@ ro: required_description: "Marchează acest pachet de lucru ca fiind o cerință pentru cel asociat" label_parent_singular: "părinte" label_parent_plural: "părinte" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitație account: delete: "Ştergere cont" @@ -799,6 +813,7 @@ ro: is_required: "Obligatoriu" max_length: "Lungime maximă" min_length: "Lungime minimă" + content_right_to_left: "Right-to-Left content" multi_value: "Permite selecție multiplă" possible_values: "Valori posibile" regexp: "Expresie regulată" @@ -834,6 +849,8 @@ ro: attr_lastname: "Câmp nume" attr_login: "Atribut nume de utilizator" attr_mail: "Atribut e-mail" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Nume domeniu de bază" host: "Server gazdă" onthefly: "Crearea automată a utilizatorilor" @@ -877,6 +894,9 @@ ro: project_custom_field: is_required: "Obligatoriu în toate proiectele" custom_field_section: Secțiune + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Coloane" relations_to_type_column: "Relații cu %{type}" @@ -886,7 +906,7 @@ ro: timeline_labels: "Etichete de cronologie" relation: lag: "Întârziere" - from: "Pachet de lucru" + from: "Related work package" to: "Pachet de lucru asociat" reminder: remind_at_date: "Date" @@ -1210,12 +1230,16 @@ ro: typed_dag: circular_dependency: "Relația creează un cerc închis." attributes: - to: - error_not_found: "pachetul de lucru în poziția `to` nu a fost găsit sau nu este vizibil" - error_readonly: "legătura `to` a unei relații existente este imuabilă" - from: - error_not_found: "pachetul de lucru din poziția `from` nu este găsit sau nu este vizibil" - error_readonly: "legătura `from` a unei relații existente este imuabilă" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Nu este disponibil furnizorul de SCM" not_whitelisted: "nu este permisă de configurație." @@ -1580,8 +1604,9 @@ ro: button_copy_and_follow: "Copiază și continuă" button_create: "Creează" button_create_and_continue: "Creează și continuă" - button_delete: "Șterge" button_decline: "Refuză" + button_delete: "Șterge" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Ștergere observator %{name}" button_download: "Descărcare" button_duplicate: "Duplicare" @@ -1802,6 +1827,10 @@ ro: one: "oră" few: "ore" other: "ore" + day: + one: "day" + few: "days" + other: "days" description_active: "Activ?" description_attachment_toggle: "Afișare/Ascundere atașamente" description_autocomplete: > @@ -1837,6 +1866,10 @@ ro: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Personalizați configurația formularului cu aceste add-on-uri suplimentare:" add_groups: "Adaugă noi grupuri de atribut" @@ -2199,6 +2232,7 @@ ro: label_add_subtask: "Adaugă sub-sarcină" label_added: "adăugat" label_added_by: "Adăugat de %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Adăugat de %{author} acum %{age}" label_additional_workflow_transitions_for_assignee: "Tranziții suplimentare permise când utilizatorul este executantul" label_additional_workflow_transitions_for_author: "Tranziții suplimentare permise când utilizatorul este autorul" @@ -2619,6 +2653,7 @@ ro: label_project_new: "Proiect nou" label_project_plural: "Proiecte" label_project_list_plural: "Listă proiecte" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Atribute proiect" label_project_custom_field_plural: "Atribute proiect" label_project_settings: "Setările proiectului" @@ -2645,6 +2680,7 @@ ro: label_relation: "Relație" label_relation_actions: "Acțiuni relație" label_relation_delete: "Ștergere relație" + label_relation_edit: "Edit relation" label_relation_new: "Relație nouă" label_release_notes: "Note privind lansarea noii versiuni" label_remaining_work: "Muncă rămasă" @@ -3061,6 +3097,7 @@ ro: notice_bad_request: "Cerere invalidă." notice_not_authorized: "Nu sunteți autorizat să accesați această pagină." notice_not_authorized_archived_project: "Proiectul pe care încercați să îl accesați a fost arhivat." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Parola dvs. nu este corectă. Nu se poate continua." notice_principals_found_multiple: "S-au găsit %{number} rezultate\n Tab pentru a se concentra pe primul rezultat." notice_principals_found_single: "Există un singur rezultat\n Tab pentru a-l concentra." @@ -3110,7 +3147,7 @@ ro: text_getting_started_description: "Obțineți o imagine de ansamblu rapidă a gestionării proiectelor și a colaborării în echipă cu OpenProject. Puteți reporni acest videoclip din meniul de ajutor." welcome: "Bun venit la %{app_title}" select_language: "Te rog selectează limba" - permission_add_work_package_notes: "Adaugă note" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Adaugă pachete de lucru" permission_add_messages: "Publicare mesaje" permission_add_project: "Creează proiecte" @@ -3140,10 +3177,11 @@ ro: permission_delete_timelines: "Ștergere linii de timp" permission_delete_wiki_pages: "Ștergere pagini wiki" permission_delete_wiki_pages_attachments: "Ștergere atașamente" - permission_edit_work_package_notes: "Editare note" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Editare pachete de lucru" permission_edit_messages: "Editare mesaje" - permission_edit_own_work_package_notes: "Editare note proprii" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Editare mesaje proprii" permission_edit_own_time_entries: "Editare jurnale de timp proprii" permission_edit_project: "Editare proiect" @@ -3236,9 +3274,9 @@ ro: are_you_sure: "Sunteţi sigur că doriţi să arhivaţi proiectul '%{name}'?" archived: "Arhivat" count: - zero: "0 proiecte" - one: "1 Project" - other: "%{count} proiecte" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activitate" project_module_forums: "Forumuri" project_module_work_package_tracking: "Pachete de lucru" @@ -3372,6 +3410,7 @@ ro: activated: "Activat" deactivated: "Dezactivat" search_input_placeholder: "Caută ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Activați CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) origini permise" setting_apiv3_cors_origins_text_html: > @@ -3597,6 +3636,27 @@ ro: new: heading: "New attribute" description: "Modificările la acest atribut al proiectului se vor reflecta în toate proiectele în care este activată. Atributele necesare nu pot fi dezactivate pentru fiecare proiect." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Setări pentru proiecte noi" @@ -3630,6 +3690,7 @@ ro: text_are_you_sure_continue: "Sigur dorești să continui?" text_are_you_sure_with_children: "Doriți ștergerea pachetului de lucru și a tuturor pachetelor fii?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Alocare la proiect" text_form_configuration: > Puteți personaliza ce câmpuri vor fi afișate în formularele pachetelor de lucru. Puteți grupa în mod liber câmpurile pentru a reflecta nevoile domeniului dumneavoastră. @@ -3709,6 +3770,7 @@ ro: text_notice_security_badge_displayed_html: > Notă: dacă este activată, aceasta va afișa o insignă cu starea instalării în fereastra %{information_panel_label} panoul de administrare și pe pagina principală. Aceasta este afișată numai pentru administratori.
    Insigna va verifica versiunea curentă a OpenProject în raport cu baza de date oficială a versiunilor OpenProject pentru a alerta cu privire la orice actualizări sau vulnerabilități cunoscute. Pentru mai multe informații despre ce oferă verificarea, ce date sunt necesare pentru a furniza actualizările disponibile și cum să dezactivezi această verificare, te rog să vizitezi documentația de configurare. text_own_membership_delete_confirmation: "Sunteţi cale de a elimina unele sau toate permisiunile şi e posibil să nu mai puteți edita acest proiect după aceea. \nSunteţi sigur că doriţi să continuaţi?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Se poate scrie în directorul de resurse pentru module" text_powered_by: "Propulsat de %{link}" text_project_identifier_info: "Doar litere mici (a-z), numere, cratime şi linii de subliniere sunt permise, trebuie să înceapă cu o literă mică." @@ -4078,6 +4140,8 @@ ro: builtin: Built-in instance application confidential: Confidential singular: "Aplicație OAuth" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "Aplicație OAuth" named: "OAuth aplicație '%{name}'" new: "Aplicație OAuth" diff --git a/config/locales/crowdin/ru.yml b/config/locales/crowdin/ru.yml index 1e97adea069c..ba991ba6686c 100644 --- a/config/locales/crowdin/ru.yml +++ b/config/locales/crowdin/ru.yml @@ -114,7 +114,7 @@ ru: attribute_help_texts: note_public: "Любой текст и изображения, которые вы добавляете в это поле, видны всем аутентифицированным пользователям!" text_overview: "В этом представлении можно создать пользовательскую текстовую справку для атрибутов представления. При ее наличии, она будет показана по клику по значку справки возле атрибута." - label_plural: "Атрибут текстов справки" + label_plural: "Справка по атрибуту" show_preview: "Предпросмотр текста" add_new: "Добавить текст справки" edit: "Редактировать текст справки для %{attribute_caption}" @@ -228,6 +228,10 @@ ru: item: title: Этот элемент не имеет уровня иерархии ниже description: Добавьте элементы в этот список, чтобы создать подпункты внутри другого списка + delete_dialog: + title: "Удалить элемент пользовательского поля" + heading: "Удалить элемент пользовательского поля?" + description: "Это действие необратимо удалит элемент и все его подпункты. Все присвоенные значения будут удалены навсегда. Если это поле является обязательным, удаление элементов может привести к тому, что существующие рабочие пакеты работ станут недействительными." placeholder: label: "Название элемента" short: "Краткое имя" @@ -248,6 +252,7 @@ ru: confirm_destroy_option: "Удаление опции приведет к удалению всех ее вхождений (например, в пакеты работ). Вы уверены, что вы хотите удалить ее?" reorder_alphabetical: "Переупорядочить значения по алфавиту" reorder_confirmation: "Внимание: Текущий порядок доступных значений будет утерян. Продолжить?" + placeholder_version_select: "Сначала необходимо выбрать пакет работ или проект" instructions: is_required: "Пометить пользовательское поле как обязательное. Это сделает заполнение поля обязательным при создании новых или обновлении существующих ресурсов." is_required_for_project: "Установите флажок, чтобы включить этот атрибут и сделать его обязательным для всех проектов. Он не может быть отключен для отдельных проектов." @@ -286,6 +291,7 @@ ru: label: "Метка" short: "Короткое имя" parent: "Родитель" + blueprint: "Шаблон чертежа" global_search: placeholder: "Поиск в %{app_title}" overwritten_tabs: @@ -482,6 +488,7 @@ ru: my: access_token: create_dialog: + title: Токен сгенерирован header: Токен %{type} создан warning: Обратите внимание, что это единственный раз, когда Вы увидите этот токен, поэтому обязательно скопируйте его сейчас. errors: @@ -558,10 +565,10 @@ ru: react_with: "Реакция %{reaction}" and_user: "и %{user}" and_others: - one: и еще 1 + one: и ещё 1 few: и еще %{count} many: и еще %{count} - other: и еще %{count} + other: и ещё %{count} reaction_by: "%{reaction} от" reportings: index: @@ -578,8 +585,7 @@ ru: Отметьте эту опцию, чтобы исключить пакеты работ с этим статусом из итогов Работы, Оставшейся работы и % Завершения в иерархии. status_percent_complete_text: |- - В режиме расчета прогресса на основе статуса% Завершения работы - автоматически устанавливается на это значение, когда выбран этот статус. + В режиме расчета прогресса на основе статуса % завершения пакета работ автоматически устанавливается на это значение, когда выбран этот статус. Игнорируется в режиме, основанном на работе. status_readonly_html: | Установите этот флажок, чтобы пометить пакеты работ как доступные только для чтения. @@ -663,6 +669,7 @@ ru: title: "Отсутствует рабочий процесс для совместного использования пакета работ" message: "Для роли «Редактор рабочего пакета» не настроен рабочий процесс. Без рабочего процесса пользователь, к которому предоставлен общий доступ, не может изменить состояние рабочего пакета. Рабочие процессы можно копировать. Выберите тип источника (например, «Задача») и роль источника (например, «Участник»). Затем выберите целевые типы. Для начала вы можете выбрать все типы в качестве целей. Наконец, выберите роль «Редактор рабочего пакета» в качестве цели и нажмите «Копировать». После создания настроек по умолчанию настройте рабочие процессы так же, как и для любой другой роли." link_message: "Настройте рабочие процессы в Администрировании." + templated_subject_hint: Автоматически сгенерировано по типу %{type} summary: reports: category: @@ -685,14 +692,15 @@ ru: no_results_title_text: На данный момент связи отсутствуют. blankslate_heading: "Нет связей" blankslate_description: "У этого пакета работ пока нет никаких связей." + label_add_child_button: "Дочерний пакет работ" label_add_x: "Добавить %{x}" label_edit_x: "Редактировать %{x}" label_add_description: "Добавить описание" lag: subject: "Отставание" - title: "Отставание (в днях)" caption: "Минимальное количество рабочих дней, которое должно быть между двумя пакетами работ." relations: + label_new_child_created: "Новый пакет работ создан и добавлен как дочерний" label_relates_singular: "связан с" label_relates_plural: "связаны с" label_relates_to_singular: "связан с" @@ -707,6 +715,9 @@ ru: follows_description: "Соответствующий пакет работ обязательно должен быть завершен до того, как начнется этот пакет" label_child_singular: "дочерний пакет работ" label_child_plural: "дочерние пакеты работ" + new_child: "Новый дочерний пакет работ" + new_child_text: "Создает связанный пакет работ в качестве подпункта текущего (родительского) пакета работ" + existing_child: "Существующий дочерний пакет работ" child_description: "Делает связанный пакет работ дочерним текущему (родительскому) пакету работ" label_blocks_singular: "блоки" label_blocks_plural: "блоки" @@ -743,6 +754,8 @@ ru: required_description: "Отмечает этот пакет работ как требование к связанному" label_parent_singular: "родитель" label_parent_plural: "родители" + ghost_relation_title: "Связанный пакет работ" + ghost_relation_description: "Это не видно для вас из-за разрешений." label_invitation: Приглашение account: delete: "Удалить учётную запись" @@ -807,6 +820,7 @@ ru: is_required: "Обязательно" max_length: "Максимальная длина" min_length: "Минимальная длина" + content_right_to_left: "Направление письма справа налево" multi_value: "Разрешить множественный выбор" possible_values: "Возможные значения" regexp: "Регулярное выражение" @@ -842,6 +856,8 @@ ru: attr_lastname: "Атрибут Фамилия" attr_login: "Имя пользователя" attr_mail: "Атрибут Email" + filter_string: "Строка фильтра" + admin: "Администратор" base_dn: "Базовый DN" host: "Хост" onthefly: "Автоматическое создание пользователя" @@ -885,6 +901,9 @@ ru: project_custom_field: is_required: "Требуется для всех проектов" custom_field_section: Раздел + project/life_cycle_step_definition: + name: "Имя" + color: "Цвет" query: column_names: "Столбцы" relations_to_type_column: "Отношения к %{type}" @@ -894,7 +913,7 @@ ru: timeline_labels: "Временные метки" relation: lag: "Задержка" - from: "Пакет работ" + from: "Связанный пакет работ" to: "Похожий пакет работ" reminder: remind_at_date: "Дата" @@ -907,7 +926,7 @@ ru: is_closed: "Пакет работ закрыт" is_readonly: "Пакет работ только для просмотра" excluded_from_totals: "Исключить из расчета итогов в иерархии" - default_done_ratio: "% Завершения" + default_done_ratio: "% завершения" time_entry: activity: "Деятельность" hours: "Часы" @@ -953,10 +972,10 @@ ru: begin_insertion: "Начало вставки" begin_deletion: "Начало удаления" children: "Вложенные элементы" - derived_done_ratio: "Всего % завершено" + derived_done_ratio: "Общий % завершения" derived_remaining_hours: "Всего оставшихся работ" derived_remaining_time: "Всего оставшихся работ" - done_ratio: "% Завершения" + done_ratio: "% завершения" duration: "Продолжительность" end_insertion: "Завершение вставки" end_deletion: "Завершение удаления" @@ -970,7 +989,7 @@ ru: parent_issue: "Родитель" parent_work_package: "Родитель" priority: "Приоритет" - progress: "% Завершения" + progress: "% завершения" readonly: "Только для чтения" remaining_hours: "Оставшиеся часы" remaining_time: "Оставшиеся часы" @@ -1218,12 +1237,16 @@ ru: typed_dag: circular_dependency: "Зацикливание зависимостей." attributes: - to: - error_not_found: "рабочий пакет в позиции `до` не найден или не отображается" - error_readonly: "в существующих отношениях связь `до` неизменна" - from: - error_not_found: "рабочий пакет в позиции `от` не найден или не отображается" - error_readonly: "в существующих отношениях связь `от` неизменна" + to_id: + error_not_found: "не найден или невидим." + error_readonly: "не может быть изменен для существующих отношений." + from_id: + error_not_found: "не найден или невидим." + error_readonly: "не может быть изменен для существующих отношений." + lag: + greater_than_or_equal_to: + zero: "не может быть отрицательным." + less_than_or_equal_to: "слишком высокий." repository: not_available: "SCM поставщик не доступен" not_whitelisted: "не допускается конфигурацией." @@ -1278,10 +1301,10 @@ ru: assigned_to: format: "%{message}" done_ratio: - does_not_match_work_and_remaining_work: "не соответствует Работа и Остаток работы" - cannot_be_set_when_work_is_zero: "невозможно установить, если значение Работа равно 0h" - must_be_set_when_remaining_work_is_set: "требуется, если установлен параметр Оставшаяся работа." - must_be_set_when_work_and_remaining_work_are_set: "требуется, когда установлены значения Работа и Остаток работы." + does_not_match_work_and_remaining_work: "не соответствует Предполагаемому времени и Оставшимся часам" + cannot_be_set_when_work_is_zero: "невозможно установить, если Предполагаемое время равно 0ч" + must_be_set_when_remaining_work_is_set: "требуется, если установлен параметр Оставшиеся часы." + must_be_set_when_work_and_remaining_work_are_set: "требуется, когда установлены значения Предполагаемое время и Оставшиеся часы." inclusion: "должно быть между 0 и 100." due_date: not_start_date: "не совпадает с датой начала, хотя это требуется для вех." @@ -1312,16 +1335,16 @@ ru: estimated_hours: not_a_number: "не является допустимой продолжительностью." cant_be_inferior_to_remaining_work: "не может быть меньше, чем Остаток работы." - must_be_set_when_remaining_work_and_percent_complete_are_set: "требуется, если установлены значения Оставшаяся работа и % Завершения." + must_be_set_when_remaining_work_and_percent_complete_are_set: "требуется, если установлены параметры Оставшиеся часы и % завершения." remaining_hours: not_a_number: "не является допустимой продолжительностью." - cant_exceed_work: "не может быть выше, чем Работа." - must_be_set_when_work_is_set: "требуется, если установлен параметр «Работа»." - must_be_set_when_work_and_percent_complete_are_set: "требуется, если установлены значения Работа и % Завершения." + cant_exceed_work: "не может быть больше, чем Предполагаемое время." + must_be_set_when_work_is_set: "требуется, если установлен параметр Предполагаемое время." + must_be_set_when_work_and_percent_complete_are_set: "требуется, если установлены параметры Предполагаемое время и % завершения." must_be_set_to_zero_hours_when_work_is_set_and_percent_complete_is_100p: >- - должно быть равно 0h, если установлено 100% для Работа и % Завершения. + должно быть равно 0ч, если установлен параметр Предполагаемое время и % завершения установлен в 100%. must_be_empty_when_work_is_empty_and_percent_complete_is_100p: >- - должен быть пустым, если Работа пусто, а % Завершения равен 100%. + должно быть пустым, если параметр Предполагаемое время не установлен, а % завершения равен 100%. readonly_status: "Пакет работ находится в статусе доступном только для чтения, поэтому его атрибуты не могут быть изменены." type: attributes: @@ -1501,7 +1524,7 @@ ru: default_columns: "Столбцы по умолчанию" description: "Описание" derived_due_date: "Дата окончания производства" - derived_estimated_hours: "Общая работа" + derived_estimated_hours: "Общее Предполагаемое время" derived_start_date: "Дата начала производства" display_sums: "Отображение суммы" due_date: "Дата окончания" @@ -1598,8 +1621,9 @@ ru: button_copy_and_follow: "Скопировать и продолжить" button_create: "Создать" button_create_and_continue: "Создать и продолжить" - button_delete: "Удалить" button_decline: "Отклонить" + button_delete: "Удалить" + button_delete_permanently: "Удалить навсегда" button_delete_watcher: "Удаление наблюдателя %{name}" button_download: "Скачать" button_duplicate: "Дублировать" @@ -1838,6 +1862,11 @@ ru: few: "час" many: "час" other: "час" + day: + one: "день" + few: "days" + many: "days" + other: "дней" description_active: "Активно?" description_attachment_toggle: "Показать/скрыть вложения" description_autocomplete: > @@ -1873,6 +1902,10 @@ ru: upsale: title: "Корпоративное дополнение" link_title: "Дополнительная информация" + automatic_subject_generation: + description: "Создать автоматически генерируемые темы, используя атрибуты и текст." + customize_life_cycle: + description: "Создать и организовать этапы и стадии проекта, отличные от тех, что предусмотрены планированием цикла проекта PM2." form_configuration: description: "Настройте конфигурацию формы с помощью этих дополнительных дополнений:" add_groups: "Добавить новую группу атрибутов" @@ -2107,8 +2140,8 @@ ru: status_changed: "Статус '%{status_name}'" system_update: "Обновление системы OpenProject:" work_package_duplicate_closed: "Дубликат пакета работ обновлён:" - total_percent_complete_mode_changed_to_work_weighted_average: "Вычисление % Завершения теперь взвешивается по Работе." - total_percent_complete_mode_changed_to_simple_average: "Вычисление % Завершения теперь основано на среднем арифметическом % Завершения." + total_percent_complete_mode_changed_to_work_weighted_average: "Вычисление общего % завершения теперь осуществляется по средневзвешенным значениям Предполагаемого времени." + total_percent_complete_mode_changed_to_simple_average: "Вычисление общего % завершения теперь осуществляется по среднему арифметическому значений % завершения." cause_descriptions: work_package_predecessor_changed_times: внесением изменений в предшественника %{link} work_package_parent_changed_times: внесением изменений в родительский %{link} @@ -2127,7 +2160,7 @@ ru: progress_mode_changed_to_status_based: Расчет прогресса установлен в режим "На основе статуса" status_excluded_from_totals_set_to_false_message: теперь включено в иерархию итогов status_excluded_from_totals_set_to_true_message: теперь исключено из иерархии итогов - status_percent_complete_changed: "% Завершения изменен с %{old_value}% на %{new_value}%" + status_percent_complete_changed: "% завершения изменен с %{old_value}% на %{new_value}%" system_update: file_links_journal: > Теперь на вкладке Активность появится активность, связанная со ссылками файлов (файлы, хранящиеся во внешних хранилищах). Ниже описывается деятельность по уже существующим ссылкам: @@ -2235,6 +2268,7 @@ ru: label_add_subtask: "Добавить подзадачу" label_added: "Добавлено" label_added_by: "Добавлено %{author}" + label_added_by_on: "Добавлено %{author} %{date}" label_added_time_by: "Добавлено %{author} %{age} назад" label_additional_workflow_transitions_for_assignee: "Дополнительные переходы допускается, если пользователь является правопреемником" label_additional_workflow_transitions_for_author: "Дополнительные переходы допускаются, если пользователь является автором" @@ -2655,6 +2689,7 @@ ru: label_project_new: "Новый проект" label_project_plural: "Проекты" label_project_list_plural: "Списки проектов" + label_project_lifecycle: "Жизненный цикл проекта" label_project_attributes_plural: "Атрибуты проекта" label_project_custom_field_plural: "Атрибуты проекта" label_project_settings: "Настройки проекта" @@ -2681,6 +2716,7 @@ ru: label_relation: "Связь" label_relation_actions: "Действия со связями" label_relation_delete: "Удалить связь" + label_relation_edit: "Изменить отношение" label_relation_new: "Новая связь" label_release_notes: "Список изменений" label_remaining_work: "Оставшиеся часы" @@ -3098,6 +3134,7 @@ ru: notice_bad_request: "Неправильный запрос." notice_not_authorized: "Вы не авторизованы для доступа к этой странице." notice_not_authorized_archived_project: "Проект, к которому Вы пытаетесь получить доступ, заархивирован." + notice_requires_enterprise_token: "Токен Enterprise отсутствует или не разрешает доступ к этой странице." notice_password_confirmation_failed: "Пароль не правильный. Продолжить нельзя." notice_principals_found_multiple: "Найдено %{number} результатов. Нажмите для перехода к первому." notice_principals_found_single: "Найден один результат. Нажмите для перехода к нему." @@ -3148,7 +3185,7 @@ ru: text_getting_started_description: "Получите быстрый обзор управления проектом и сотрудничества команды с OpenProject. Вы можете перезапустить это видео в меню справки." welcome: "Добро пожаловать в %{app_title}" select_language: "Пожалуйста, выберите язык" - permission_add_work_package_notes: "Добавлять комментарии" + permission_add_work_package_notes: "Добавить комментарии" permission_add_work_packages: "Добавление пакетов работ" permission_add_messages: "Написать сообщения" permission_add_project: "Создание проектов" @@ -3178,10 +3215,11 @@ ru: permission_delete_timelines: "Удалить графики" permission_delete_wiki_pages: "Удалить wiki-страницы" permission_delete_wiki_pages_attachments: "Удалить вложения" - permission_edit_work_package_notes: "Редактировать комментарии" + permission_edit_work_package_notes: "Модерировать комментарии" + permission_edit_work_package_notes_explanation: "Внимание: Пользователи с таким правом могут редактировать любые комментарии." permission_edit_work_packages: "Редактировать пакеты работ" permission_edit_messages: "Редактировать сообщения" - permission_edit_own_work_package_notes: "Редактировать собственные комментарии" + permission_edit_own_work_package_notes: "Редактировать свои комментарии" permission_edit_own_messages: "Редактировать свои сообщения" permission_edit_own_time_entries: "Редактировать собственные учетные записи о времени" permission_edit_project: "Редактировать проект" @@ -3276,7 +3314,7 @@ ru: count: zero: "0 проектов" one: "1 проект" - other: "%{count} проектов" + other: "%{count} проект(ов/а)" project_module_activity: "Деятельность" project_module_forums: "Форумы" project_module_work_package_tracking: "Комплекс работ" @@ -3408,6 +3446,7 @@ ru: activated: "активирован" deactivated: "деактивирован" search_input_placeholder: "Поиск ..." + setting_apiv3_cors_title: "Совместное использование ресурсов между источниками (Cross-Origin Resource Sharing, CORS)" setting_apiv3_cors_enabled: "Включить CORS" setting_apiv3_cors_origins: "Разделение ресурсов (CORS) разрешено в API V3" setting_apiv3_cors_origins_text_html: > @@ -3472,7 +3511,7 @@ ru: setting_duration_format: "Формат длительности" setting_duration_format_hours_only: "Только часы" setting_duration_format_days_and_hours: "Дни и часы" - setting_duration_format_instructions: "Это определяет, как будут отображаться Работа, Оставшаяся работа и Затраченное время." + setting_duration_format_instructions: "Это определяет, как будут отображаться Предполагаемое время, Оставшиеся часы и Затраченное время." setting_emails_footer: "содержимое нижней части почтовых сообщений" setting_emails_header: "Заголовок письма" setting_email_login: "Использовать email как логин" @@ -3490,12 +3529,12 @@ ru: setting_work_package_done_ratio: "Режим расчета прогресса" setting_work_package_done_ratio_field: "На основе трудозатрат" setting_work_package_done_ratio_field_caption_html: >- - % Завершено может быть свободно установлен на любое значение. Если Вы опционально введете значение для параметра Предполагаемое время, то автоматически будет выведено значение Оставшиеся часы. + % завершения может быть свободно установлен на любое значение. Если Вы опционально введете значение для параметра Предполагаемое время, то автоматически будет выведено значение Оставшиеся часы. setting_work_package_done_ratio_status: "На основе статуса" setting_work_package_done_ratio_status_caption_html: >- - С каждым статусом связано значение % Завершения. Изменение статуса приведет к изменению % Завершения. + С каждым статусом связано значение % завершения. Изменение статуса приведет к изменению % завершения. setting_work_package_done_ratio_explanation_html: > - В режиме На основе трудозатрат для параметра % Завершено можно свободно установить любое значение. Если вы дополнительно введете значение «Предполагаемое время», «Оставшиеся часы» будут получены автоматически. В режиме На основе статуса с каждым статусом связано значение % Завершено. Изменение статуса приведет к изменению % Завершено. + В режиме На основе трудозатрат для параметра % завершения можно свободно установить любое значение. Если вы дополнительно введете значение параметра Предполагаемое время, то Оставшиеся часы будут получены автоматически. В режиме На основе статуса с каждым статусом связано значение % завершения. Изменение статуса приведет к изменению % завершения. setting_work_package_properties: "Свойства пакета работ" setting_work_package_startdate_is_adddate: "Использовать текущую дату как дату начала для новых пакетов работ" setting_work_packages_projects_export_limit: "Ограничение экспорта пакетов работ / проектов" @@ -3514,10 +3553,10 @@ ru: setting_password_min_length: "Минимальная длина" setting_password_min_adhered_rules: "Минимальное количество необходимых классов" setting_per_page_options: "Количество объектов на страницу" - setting_percent_complete_on_status_closed: "% Завершено, когда статус закрыт" + setting_percent_complete_on_status_closed: "% завершения, когда статус Закрыто" setting_percent_complete_on_status_closed_no_change: "Без изменений" setting_percent_complete_on_status_closed_no_change_caption_html: >- - Значение % Завершено не изменится, даже если пакет работ будет закрыт. + Значение % завершения не изменится, даже если пакет работ будет закрыт. setting_percent_complete_on_status_closed_set_100p: "Автоматически устанавливается на 100%" setting_percent_complete_on_status_closed_set_100p_caption: >- Закрытый пакет работ считается завершенным. @@ -3544,13 +3583,13 @@ ru: setting_sys_api_enabled: "Разрешить веб-сервис управления репозиторием" setting_sys_api_description: "Веб-сервис управления репозиторием обеспечивает интеграцию и авторизацию пользователя для доступа к репозиторию." setting_time_format: "Время" - setting_total_percent_complete_mode: "Расчёт общего % Завершено по всей иерархии" + setting_total_percent_complete_mode: "Расчет общего % завершения полной иерархии" setting_total_percent_complete_mode_work_weighted_average: "Взвешенное по работе" setting_total_percent_complete_mode_work_weighted_average_caption_html: >- - Общий % Завершено будет рассчитан как средневзвешенное значение по Предполагаемому времени каждого пакета работ в иерархии. Пакеты работ без Предполагаемого времени будут игнорироваться. + Общий % завершения будет рассчитан как средневзвешенное значение по Предполагаемому времени каждого пакета работ в иерархии. Пакеты работ без Предполагаемого времени будут игнорироваться. setting_total_percent_complete_mode_simple_average: "Среднее арифметическое" setting_total_percent_complete_mode_simple_average_caption_html: >- - Предполагаемое время игнорируется, и Общий % Завершено будет средним арифметическим от значений % Завершено пакетов работ в иерархии. + Предполагаемое время игнорируется, и Общий % завершения будет средним арифметическим значением от % завершения пакетов работ в иерархии. setting_accessibility_mode_for_anonymous: "Разрешить режим доступа людей с ограниченными возможностями для анонимных пользователей" setting_user_format: "Формат имени пользователя" setting_user_default_timezone: "Часовой пояс пользователя по умолчанию" @@ -3633,6 +3672,27 @@ ru: new: heading: "Новый атрибут" description: "Изменения этого атрибута проекта будут отражены во всех проектах, где он включен. Обязательные атрибуты не могут быть отключены для каждого проекта." + project_life_cycle_step_definitions: + heading: "Жизненный цикл проекта" + heading_description: "Жизненный цикл проекта состоит из этапов и стадий, которые структурируют ваши проекты. Они появляются на странице обзора проекта и доступны в списке проектов. Отдельные этапы и стадии можно выбрать для настройки проекта, но изменение порядка на уровне проекта невозможно." + label_add: "Добавить" + label_add_description: "Добавить описание жизненного цикла" + label_add_stage: "Этап" + label_add_gate: "Стадия" + filter: + label: "Поиск этапа или стадии проекта" + section_header: "Этапы и стадии" + non_defined: "В настоящее время не определены ни этапы, ни стадии." + new: + description: "Изменения в этом шаге проекта будут отражены во всех проектах, где он включен." + new_stage: + heading: "Новый этап" + new_gate: + heading: "Новая стадия" + edit_stage: + heading: "Изменить этап" + edit_gate: + heading: "Изменить стадию" projects: missing_dependencies: "Был проверен модуль проекта %{module}, который зависит от %{dependencies}. Вам также необходимо проверить эти зависимости." section_new_projects: "Настройки для новых проектов" @@ -3666,6 +3726,7 @@ ru: text_are_you_sure_continue: "Вы уверены, что хотите продолжить?" text_are_you_sure_with_children: "Удалить пакет работ и все дочерние пакеты работ?" text_are_you_sure_with_project_custom_fields: "Удаление этого атрибута также приведет к удалению его значений во всех проектах. Вы уверены, что хотите это сделать?" + text_are_you_sure_with_project_life_cycle_step: "Удаление этого шага также приведет к удалению его использования во всех проектах. Вы уверены, что хотите это сделать?" text_assign_to_project: "Назначить на проект" text_form_configuration: > Вы можете настроить, какие поля будут показываться в формах пакетов работ. Вы можете свободно сгруппировать поля с учетом потребностей вашего домена. @@ -3745,6 +3806,7 @@ ru: text_notice_security_badge_displayed_html: > Примечание: Если этот параметр включен, значок с вашим статусом установки будет отображен в панели администрирования %{information_panel_label} и на домашней странице. Он отображается только администраторам.
    Знак будет проверять текущую версию OpenProject в официальной базе данных релизов OpenProject для оповещения вас о каких-либо обновлениях или известных уязвимостях. Для дополнительной информации, необходимой для проверки доступных обновлений, и о том как отключить эту проверку, пожалуйста, посетите конфигурации документации. text_own_membership_delete_confirmation: "Вы собираетесь удалить все или некоторые разрешения, доступные Вам. Вы не сможете редактировать проект после этого действия. Вы уверены?" + text_permanent_delete_confirmation_checkbox_label: "Я понимаю, что это удаление невозможно отменить" text_plugin_assets_writable: "Папка активов дополнения(plugin) доступна для записи" text_powered_by: "С использованием %{link}" text_project_identifier_info: "Разрешены только строчные буквы (a-z), цифры, тире и знаки подчеркивания, начинать с буквы нижнего регистра." @@ -3898,21 +3960,21 @@ ru: modal: work_based_help_text: "Каждое поле автоматически рассчитывается от двух других, когда это возможно." status_based_help_text: "% Выполнения определяется статусом пакета работ." - migration_warning_text: "В режиме расчета прогресса \"На основе трудозатрат\" процент завершения невозможно установить вручную, он привязан к трудозатратам. Существующее значение сохранено, но его нельзя изменить. Пожалуйста, сначала введите трудозатраты." + migration_warning_text: "В режиме расчета прогресса \"На основе трудозатрат\" % завершения невозможно установить вручную, он привязан к трудозатратам. Существующее значение сохранено, но его нельзя изменить. Пожалуйста, сначала введите трудозатраты." derivation_hints: done_ratio: - cleared_because_remaining_work_is_empty: "Очищено, потому что Оставшаяся работа пуста." - cleared_because_work_is_0h: "Очищено, потому что Работа равна 0h." + cleared_because_remaining_work_is_empty: "Очищено, потому что параметр Оставшиеся часы не установлен." + cleared_because_work_is_0h: "Очищено, потому что параметр Предполагаемое время установлен в 0ч." derived: "Получено из Работы и Оставшейся работы." estimated_hours: - cleared_because_remaining_work_is_empty: "Очищено, потому что оставшаяся работа пуста." - derived: "Получено из Оставшейся работы и % Завершения." - same_as_remaining_work: "Установите то же значение, что и Оставшаяся работа." + cleared_because_remaining_work_is_empty: "Очищено, потому что параметр Оставшиеся часы не установлен." + derived: "Получено из параметров Оставшиеся часы и % завершения." + same_as_remaining_work: "Установите то же значение, что и для параметра Оставшиеся часы." remaining_hours: - cleared_because_work_is_empty: "Очищено, потому что Работа пуста." - cleared_because_percent_complete_is_empty: "Очищено, потому что % Завершения пуст." + cleared_because_work_is_empty: "Очищено, потому что параметр Предполагаемое время не установлен." + cleared_because_percent_complete_is_empty: "Очищено, потому что % завершения не установлен." decreased_by_delta_like_work: "Уменьшилось на %{delta}, в соответствии с уменьшением объема работ." - derived: "Получено из Работы и % Завершения." + derived: "Получено из параметров Предполагаемое время и % завершения." increased_by_delta_like_work: "Увеличилось на %{delta}, в соответствии с увеличением объема работ." same_as_work: "Установите то же значение, что и для Работы." permissions: @@ -4114,6 +4176,8 @@ ru: builtin: Встроенное приложение confidential: Конфиденциально singular: "Приложение OAuth" + scopes: "Области" + client_credentials: "Учетные данные клиента" plural: "OAuth приложения" named: "OAuth приложение '%{name}'" new: "Новое приложение OAuth" diff --git a/config/locales/crowdin/rw.yml b/config/locales/crowdin/rw.yml index aa0c1223dde2..362c2de1d9b0 100644 --- a/config/locales/crowdin/rw.yml +++ b/config/locales/crowdin/rw.yml @@ -229,6 +229,10 @@ rw: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ rw: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ rw: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ rw: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ rw: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ rw: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ rw: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ rw: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ rw: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ rw: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ rw: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ rw: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ rw: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ rw: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ rw: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ rw: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ rw: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ rw: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ rw: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ rw: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ rw: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ rw: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ rw: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ rw: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ rw: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ rw: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ rw: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ rw: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/si.yml b/config/locales/crowdin/si.yml index 4db6345357a2..b1965c908f7d 100644 --- a/config/locales/crowdin/si.yml +++ b/config/locales/crowdin/si.yml @@ -229,6 +229,10 @@ si: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ si: confirm_destroy_option: "විකල්පයක් මකා දැමීමෙන් එහි සියලු සිදුවීම් මකා දමනු ඇත (උදා: වැඩ පැකේජවල). ඔබට එය මකා දැමීමට අවශ්ය බව ඔබට විශ්වාසද?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ si: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ si: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ si: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ si: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ si: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ si: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: ඇරයුම account: delete: "ගිණුම මකන්න" @@ -790,6 +804,7 @@ si: is_required: "අවශ්‍යයි" max_length: "උපරිම දිග" min_length: "අවම දිග" + content_right_to_left: "Right-to-Left content" multi_value: "බහු-තේරීමට ඉඩ දෙන්න" possible_values: "හැකි අගයන්" regexp: "නිතිපතා ප්රකාශනය" @@ -825,6 +840,8 @@ si: attr_lastname: "අවසාන නාමය ලක්ෂණය" attr_login: "පරිශීලක නාමය ගුණාංග" attr_mail: "ඊ-තැපැල් ගුණාංග" + filter_string: "Filter string" + admin: "Administrator" base_dn: "ඩී. එන් මූලික" host: "සත්කාරක" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ si: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "තීරු" relations_to_type_column: "සබඳතා %{type}" @@ -877,7 +897,7 @@ si: timeline_labels: "කාල නියමය ලේබල්" relation: lag: "Lag" - from: "වැඩ පැකේජය" + from: "Related work package" to: "අදාළ වැඩ පැකේජය" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ si: typed_dag: circular_dependency: "සම්බන්ධතාවය සබඳතා කවයක් නිර්මාණය කරයි." attributes: - to: - error_not_found: "සොයාගත නොහැකි හෝ දෘශ්යමාන නොවන `to` තත්ත්වය තුළ වැඩ පැකේජය" - error_readonly: "පවතින සම්බන්ධතාවයක `to` සබැඳිය නොසැලකිය හැකි ය" - from: - error_not_found: "සොයාගත නොහැකි හෝ දෘශ්යමාන නොවන `from` තත්ත්වය තුළ වැඩ පැකේජය" - error_readonly: "පවතින සම්බන්ධතාවයක `from` සබැඳිය නොසැලකිය හැකි ය" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM වෙළෙන්දා ලබා ගත නොහැක" not_whitelisted: "වින්යාසය මගින් අවසර නැත." @@ -1561,8 +1585,9 @@ si: button_copy_and_follow: "පිටපත් කර අනුගමනය කරන්න" button_create: "සාදන්න" button_create_and_continue: "සාදන්න සහ ඉදිරියට යන්න" - button_delete: "මකන්න" button_decline: "පරිහානිය" + button_delete: "මකන්න" + button_delete_permanently: "Delete permanently" button_delete_watcher: "මුරකරු මකන්න %{name}" button_download: "බාගත කරන්න" button_duplicate: "අනුපිටපත්" @@ -1765,6 +1790,9 @@ si: hour: one: "පැය" other: "පැය" + day: + one: "day" + other: "days" description_active: "ක්රියාකාරී?" description_attachment_toggle: "ඇමුණුම් පෙන්වන්න/සඟවන්න" description_autocomplete: > @@ -1800,6 +1828,10 @@ si: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "නව ගුණාංග කණ්ඩායම් එකතු කරන්න" @@ -2162,6 +2194,7 @@ si: label_add_subtask: "උප කාර්යය එකතු කරන්න" label_added: "එකතු" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "%{author} %{age} පෙර විසින් එකතු කරන ලදි" label_additional_workflow_transitions_for_assignee: "පරිශීලකයා වන විට අතිරේක සංක්රමණයන් අවසර දෙනු ලැබේ" label_additional_workflow_transitions_for_author: "පරිශීලකයා කතුවරයා වන විට අතිරේක සංක්රමණයන් අවසර දෙනු ලැබේ" @@ -2582,6 +2615,7 @@ si: label_project_new: "නව ව්යාපෘතිය" label_project_plural: "ව්‍යාපෘති" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "ව්යාපෘති සැකසුම්" @@ -2608,6 +2642,7 @@ si: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "සම්බන්ධතාවය මකන්න" + label_relation_edit: "Edit relation" label_relation_new: "නව සම්බන්ධතාවය" label_release_notes: "සටහන් නිකුත් කිරීම" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ si: notice_bad_request: "නරක ඉල්ලීම." notice_not_authorized: "මෙම පිටුවට ප්රවේශ වීමට ඔබට අවසර නැත." notice_not_authorized_archived_project: "ඔබ ප්රවේශ වීමට උත්සාහ කරන ව්යාපෘතිය සංරක්ෂණය කර ඇත." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "ඔබගේ මුරපදය නිවැරදි නොවේ. දිගටම කරගෙන යා නොහැක." notice_principals_found_multiple: "සොයාගෙන ඇත %{number} ප්රතිඵල. \n පළමු ප්රතිඵලය අවධානය යොමු කිරීමට ටැබ්." notice_principals_found_single: "එක් ප්රති result ලයක් තිබේ. \n එය අවධානය යොමු කිරීමට ටැබ්." @@ -3072,7 +3108,7 @@ si: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "කරුණාකර ඔබේ භාෂාව තෝරන්න" - permission_add_work_package_notes: "සටහන් එකතු කරන්න" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "වැඩ පැකේජ එකතු කරන්න" permission_add_messages: "තැපැල් පණිවිඩ" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ si: permission_delete_timelines: "කාලනියමයන් මකන්න" permission_delete_wiki_pages: "විකි පිටු මකන්න" permission_delete_wiki_pages_attachments: "ඇමුණුම් මකන්න" - permission_edit_work_package_notes: "සටහන් සංස්කරණය කරන්න" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "වැඩ පැකේජ සංස්කරණය කරන්න" permission_edit_messages: "පණිවිඩ සංස්කරණය කරන්න" - permission_edit_own_work_package_notes: "තමන්ගේම සටහන් සංස්කරණය කරන්න" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "තමන්ගේම පණිවිඩ සංස්කරණය කරන්න" permission_edit_own_time_entries: "ම කාලය ලඝු-සටහන් සංස්කරණය" permission_edit_project: "ව්යාපෘතිය සංස්කරණය කරන්න" @@ -3198,9 +3235,9 @@ si: are_you_sure: "ඔබට '%{name}' ව්යාපෘතිය සංරක්ෂණය කිරීමට අවශ්ය බව ඔබට විශ්වාසද?" archived: "සංරක්ෂිත" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "ක්‍රියාකාරකම" project_module_forums: "සංසද" project_module_work_package_tracking: "වැඩ පැකේජ" @@ -3334,6 +3371,7 @@ si: activated: "activated" deactivated: "deactivated" search_input_placeholder: "සොයන්න..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ si: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ si: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "වැඩ පැකේජය සහ සියලුම ළමා වැඩ පැකේජ මකන්න?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "ව්යාපෘතියට පැවරීම" text_form_configuration: > වැඩ පැකේජ ආකෘතිවල කුමන ක්ෂේත්රයන් පෙන්විය හැකිද යන්න ඔබට රිසිකරණය කළ හැකිය. ඔබ නිදහසේ ඔබේ වසම සඳහා අවශ්යතා පිළිබිඹු කිරීමට ක්ෂේත්ර කණ්ඩායම් හැකි. @@ -3671,6 +3731,7 @@ si: text_notice_security_badge_displayed_html: > සටහන: සක්රීය කර ඇත්නම්, මෙය %{information_panel_label} පරිපාලන පැනලයේ ඔබේ ස්ථාපන තත්ත්වය සහිත ලාංඡනයක් සහ මුල් පිටුවේ පෙන්වනු ඇත. එය පරිපාලකයින්ට පමණක් පෙන්වනු ලැබේ.
    මෙම ලාංඡනය මඟින් ඔබගේ වර්තමාන OpenProject අනුවාදය නිල OpenProject නිකුතු දත්ත ගබඩාවට එරෙහිව පරීක්ෂා කරනු ඇත. චෙක්පත සපයන දේ පිළිබඳ වැඩි විස්තර සඳහා, ලබා ගත හැකි යාවත්කාලීන ලබා දීමට අවශ්ය දත්ත මොනවාද, සහ මෙම චෙක්පත අක්රිය කරන්නේ කෙසේද, කරුණාකර මානකරන ලියකියවිලිවෙත පිවිසෙන්න. text_own_membership_delete_confirmation: "ඔබ ඔබේ අවසර කිහිපයක් හෝ සියල්ල ඉවත් කිරීමට ආසන්නව සිටින අතර ඉන් පසුව මෙම ව්යාපෘතිය සංස්කරණය කිරීමට තවදුරටත් නොහැකි වනු ඇත.\nඔබට දිගටම කරගෙන යාමට අවශ්ය බව ඔබට විශ්වාසද?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "ප්ලගිනය වත්කම් නාමාවලිය ලිවිය හැකි" text_powered_by: "%{link}විසින් තල්ලු" text_project_identifier_info: "අඩු සිද්ධි අකුරු (a-z), අංක, ඩෂ් සහ යටි ඉරි වලට පමණක් අවසර ඇත, අඩු සිද්ධි අකුරකින් ආරම්භ කළ යුතුය." @@ -4039,6 +4100,8 @@ si: builtin: Built-in instance application confidential: Confidential singular: "OAUTH අයදුම්" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAUTH අයදුම්පත්" named: "OAUTH යෙදුම '%{name}'" new: "නව OAUTH අයදුම්" diff --git a/config/locales/crowdin/sk.yml b/config/locales/crowdin/sk.yml index 7da88701e743..73c41737ab96 100644 --- a/config/locales/crowdin/sk.yml +++ b/config/locales/crowdin/sk.yml @@ -229,6 +229,10 @@ sk: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ sk: confirm_destroy_option: "Odstránením hodnoty sa odstránia všetky predtým nastavené hodnoty (napríklad pre pracovné balíčky). Naozaj chcete odstrániť hodnotu?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ sk: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -483,6 +489,7 @@ sk: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -664,6 +671,7 @@ sk: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -686,14 +694,15 @@ sk: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -708,6 +717,9 @@ sk: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -744,6 +756,8 @@ sk: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Pozvánka account: delete: "Vymazať účet" @@ -808,6 +822,7 @@ sk: is_required: "Požadované" max_length: "Maximálna dĺžka" min_length: "Minimálna dĺžka" + content_right_to_left: "Right-to-Left content" multi_value: "Povoliť multi-select" possible_values: "Možné hodnoty" regexp: "Regulárny výraz" @@ -843,6 +858,8 @@ sk: attr_lastname: "Priezvisko" attr_login: "Username attribute" attr_mail: "E-mail adresa" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -886,6 +903,9 @@ sk: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Stĺpce" relations_to_type_column: "Vzťahy k %{type}" @@ -895,7 +915,7 @@ sk: timeline_labels: "Značky časovej osi" relation: lag: "Lag" - from: "Pracovný balíček" + from: "Related work package" to: "Súvisiaci pracovný balíček" reminder: remind_at_date: "Date" @@ -1219,12 +1239,16 @@ sk: typed_dag: circular_dependency: "Vzťah vytvorí kruh vzťahov." attributes: - to: - error_not_found: "pracovný balíček v pozícii `na` nebol nájdený alebo nie je viditeľný" - error_readonly: "odkaz `na` existujúci vzťah nie je možné zmeniť" - from: - error_not_found: "pracovný balíček v pozícii `z` nebol nájdený alebo nie je viditeľný" - error_readonly: "prepojenie existujúceho vzťahu `z` sa nedá zmeniť" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM dodávateľ nie je k dispozícii" not_whitelisted: "nie je povolené aktuálnou konfiguráciou." @@ -1599,8 +1623,9 @@ sk: button_copy_and_follow: "Kopírovať a nasledovať" button_create: "Vytvoriť" button_create_and_continue: "Vytvoriť a pokračovať" - button_delete: "Odstrániť" button_decline: "Odmietnuť" + button_delete: "Odstrániť" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Odobrať pozorovateľa %{name}" button_download: "Prevziať" button_duplicate: "Duplikovať" @@ -1839,6 +1864,11 @@ sk: few: "hodín" many: "hodín" other: "hodín" + day: + one: "day" + few: "days" + many: "days" + other: "days" description_active: "Aktívny?" description_attachment_toggle: "Zobraziť / skryť prílohy" description_autocomplete: > @@ -1874,6 +1904,10 @@ sk: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Pridajte nové skupiny atribútov" @@ -2236,6 +2270,7 @@ sk: label_add_subtask: "Pridať podúlohu" label_added: "pridané" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Pridal %{author} %{age} vzad" label_additional_workflow_transitions_for_assignee: "Povolené dodatočné prechody, pokiaľ je užívateľ priradený" label_additional_workflow_transitions_for_author: "Povolené dodatočné prechody, pokiaľ je užívateľ autorom" @@ -2656,6 +2691,7 @@ sk: label_project_new: "Nový projekt" label_project_plural: "Projekty" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Nastavenia projektu" @@ -2682,6 +2718,7 @@ sk: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Odstrániť vzťah" + label_relation_edit: "Edit relation" label_relation_new: "Nový vzťah" label_release_notes: "Zoznam zmien" label_remaining_work: "Remaining work" @@ -3099,6 +3136,7 @@ sk: notice_bad_request: "Nesprávna požiadavka." notice_not_authorized: "Nemáte dostatočné oprávnenia na zobrazenie tejto stránky." notice_not_authorized_archived_project: "Projekt, ku ktorému sa snažíte pristupovať, bol archivovaný." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Heslo nie je správne. Nie je možné pokračovať." notice_principals_found_multiple: "Nájdených %{number} výsledkov. \nStlačte TAB pre prechod na prvý výsledok." notice_principals_found_single: "Bol nájdený jeden výsledok.\nStlačením tlačidla TAB zobraziť." @@ -3149,7 +3187,7 @@ sk: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Prosím vyberte Váš jazyk" - permission_add_work_package_notes: "Pridať poznámky" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Pridať pracovné balíky" permission_add_messages: "Publikovať správy" permission_add_project: "Create projects" @@ -3179,10 +3217,11 @@ sk: permission_delete_timelines: "Odstrániť časové osy" permission_delete_wiki_pages: "Odstrániť wiki stránky" permission_delete_wiki_pages_attachments: "Odstrániť prílohy" - permission_edit_work_package_notes: "Upraviť poznámky" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Upraviť pracovné balíčky" permission_edit_messages: "Upraviť správy" - permission_edit_own_work_package_notes: "Upraviť vlastné poznámky" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Úprava vlastných správ" permission_edit_own_time_entries: "Upraviť vlastné časové záznamy" permission_edit_project: "Upraviť projekt" @@ -3275,9 +3314,9 @@ sk: are_you_sure: "Naozaj chcete archivovať projekt \"%{name}\"?" archived: "Archivované" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Činnosť" project_module_forums: "Diskusie" project_module_work_package_tracking: "Pracovné balíčky" @@ -3411,6 +3450,7 @@ sk: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Hľadať..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3636,6 +3676,27 @@ sk: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3669,6 +3730,7 @@ sk: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Zmazať pracovný balíček a všetky podradené pracovné balíčky?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Priradiť k projektu" text_form_configuration: > Môžete prispôsobiť, ktoré polia sa zobrazia vo formulári v pracovnom balíku. Môžete si voľne zoskupovať polia tak aby napĺňali potreby vašej domény. @@ -3748,6 +3810,7 @@ sk: text_notice_security_badge_displayed_html: > Poznámka: Ak je táto možnosť povolená, zobrazí sa v štýle %{information_panel_label} na panely správcu, a na domovskej stránke. Zobrazuje sa iba administrátorom.
    Znak skontroluje vašu aktuálnu verziu OpenProject s oficiálnou verziu databázy OpenProject, ktorá vás upozorní na akékoľvek aktualizácie alebo známe chyby. Ďalšie informácie o tom, čo daná kontrola poskytuje, aké údaje sú potrebné na poskytovanie dostupných aktualizácií a ako zakázať túto kontrolu, prosím navštívte dokumentáciu konfigurácie. text_own_membership_delete_confirmation: "Chystáte sa odstrániť jedno respektíve viac vašich povolení, pričom po aplikovaní zmien môžte stratiť možnosť naďalej upravovať nastavenia projektu. Naozaj chcete pokračovať?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Povolený zápis do priečinka pre pluginy" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Sú povolené len malé písmená (a-z), čísla, pomlčky a podčiarkovníky, hodnota musí začínať malým písmenom." @@ -4118,6 +4181,8 @@ sk: builtin: Built-in instance application confidential: Confidential singular: "OAuth aplikácia" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth aplikácie" named: "OAuth aplikácia '%{name}'" new: "Nová aplikácia OAuth" diff --git a/config/locales/crowdin/sl.yml b/config/locales/crowdin/sl.yml index 5afea7c1a04f..7f6f7aa29572 100644 --- a/config/locales/crowdin/sl.yml +++ b/config/locales/crowdin/sl.yml @@ -228,6 +228,10 @@ sl: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -248,6 +252,7 @@ sl: confirm_destroy_option: "Če izbrišete možnost, boste izbrisali vse njene primere (npr. v delovnih paketih). Ali ste prepričani, da ga želite izbrisati?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -286,6 +291,7 @@ sl: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -482,6 +488,7 @@ sl: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -662,6 +669,7 @@ sl: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -684,14 +692,15 @@ sl: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -706,6 +715,9 @@ sl: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -742,6 +754,8 @@ sl: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Povabilo account: delete: "Izbriši račun" @@ -806,6 +820,7 @@ sl: is_required: "Zahtevano" max_length: "Maksimalna dolžina" min_length: "Minimalna dolžina" + content_right_to_left: "Right-to-Left content" multi_value: "Dovoli izbiro z več izbirami" possible_values: "Možne vrednosti" regexp: "Vsakdanje izražanje" @@ -841,6 +856,8 @@ sl: attr_lastname: "Oznaka za priimek" attr_login: "Lastnosti uporabnikov" attr_mail: "Atribut elektronskega naslova" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Bazni DN" host: "Gostitelj" onthefly: "Samodejno ustvarjanje uporabnika" @@ -884,6 +901,9 @@ sl: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Stolpci" relations_to_type_column: "Povezave z %{type}" @@ -893,7 +913,7 @@ sl: timeline_labels: "Oznake časovnice" relation: lag: "Lag" - from: "Zahtevek" + from: "Related work package" to: "Soroden zahtevek" reminder: remind_at_date: "Date" @@ -1217,12 +1237,16 @@ sl: typed_dag: circular_dependency: "Odnos ustvarja krog odnosov." attributes: - to: - error_not_found: "delovni paket v položaju \"do\" ni najden ali ni viden" - error_readonly: "obstoječi odnos \"do\" povezave je nespremenljiv" - from: - error_not_found: "delovni paket v položaju 'od' ni najden ali ni viden." - error_readonly: "obstoječe razmerje 'od' povezave je nespremenljivo" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM prodajalec ni na voljo" not_whitelisted: "konfiguracija ne dovoljuje" @@ -1597,8 +1621,9 @@ sl: button_copy_and_follow: "Kopiraj in sledi" button_create: "Ustvari" button_create_and_continue: "Ustvari in nadaljuj" - button_delete: "Izbriši" button_decline: "Zavrni" + button_delete: "Izbriši" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Odstrani spremljevalca %{name}" button_download: "Prenesi" button_duplicate: "Podvoji" @@ -1837,6 +1862,11 @@ sl: two: "ure" few: "ure" other: "ure" + day: + one: "day" + two: "days" + few: "days" + other: "days" description_active: "Aktivno?" description_attachment_toggle: "Prikaži/ skrij priloge" description_autocomplete: > @@ -1872,6 +1902,10 @@ sl: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Dodajte nove skupine atributov" @@ -2234,6 +2268,7 @@ sl: label_add_subtask: "Dodaj podrejeno nalogo" label_added: "Dodano" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Dodal %{author} %{age} nazaj" label_additional_workflow_transitions_for_assignee: "Dovoljeni so tako dodatni prehodi, kadar je uporabnik prejemnik" label_additional_workflow_transitions_for_author: "Dovoljeni so dodatni prehodi, ko je uporabnik avtor" @@ -2654,6 +2689,7 @@ sl: label_project_new: "Nov projekt" label_project_plural: "Projekti" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Nastavitve projekta" @@ -2680,6 +2716,7 @@ sl: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Izbriši povezavo" + label_relation_edit: "Edit relation" label_relation_new: "Nova povezava" label_release_notes: "Opombe ob izdaji" label_remaining_work: "Remaining work" @@ -3098,6 +3135,7 @@ sl: notice_bad_request: "Napačen zahtevek." notice_not_authorized: "Nimate privilegijev za dostop do te strani." notice_not_authorized_archived_project: "Projekt, do katerega poskušate dostopati, je bil arhiviran." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Vaše geslo ni pravilno. Ne morete nadaljevati." notice_principals_found_multiple: "Najdeno je %{number} rezultatov.\nKliknite tipko tab da fokusirate prvi rezultat." notice_principals_found_single: "Najden je en rezultat.\nPritisnite tab, da ga prikaže." @@ -3148,7 +3186,7 @@ sl: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Prosimo izberite jezik" - permission_add_work_package_notes: "Dodaj zapiske" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Dodaj delovne pakete" permission_add_messages: "Objavi sporočila" permission_add_project: "Create projects" @@ -3178,10 +3216,11 @@ sl: permission_delete_timelines: "Izbrišite časovnice" permission_delete_wiki_pages: "Izbrišite wiki strani" permission_delete_wiki_pages_attachments: "Izbriši priponke" - permission_edit_work_package_notes: "Uredi zapiske" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Uredi delovne pakete" permission_edit_messages: "Uredi sporočila" - permission_edit_own_work_package_notes: "Uredi lastne zapiske" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Uredi lastna sporočila" permission_edit_own_time_entries: "Uredi svoje dnevnike" permission_edit_project: "Uredi projekt" @@ -3274,9 +3313,9 @@ sl: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Arhiviran" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktivnost" project_module_forums: "Forumi" project_module_work_package_tracking: "Delovni paketi" @@ -3409,6 +3448,7 @@ sl: activated: "aktivirano" deactivated: "deaktivirano" search_input_placeholder: "Iskanje..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Omogoči CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) dovoljen izvir" setting_apiv3_cors_origins_text_html: > @@ -3634,6 +3674,27 @@ sl: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Nastavitve za nove projekte" @@ -3667,6 +3728,7 @@ sl: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Izbrišite delovni paket in vse njegove podrejene delovne pakete?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Dodeli projektu" text_form_configuration: > Lahko ponastavite katera polja se bodo prikazala v obliki delovnega paketa. Svobodno lahko grupirate polja, katera odsevajo potrebe za vašo domeno. @@ -3746,6 +3808,7 @@ sl: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "Odstranili boste nekaj ali vsa dovoljenja in po tem morda ne boste mogli več urejati tega projekta.\nAli ste prepričani, da želite nadaljevati?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Imenik vtičnikov se lahko zapiše" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Dovoljene so samo male črke (a-z), številke, črtice in podčrtaji, ki se začnejo z malo začetnico." @@ -4116,6 +4179,8 @@ sl: builtin: Built-in instance application confidential: Confidential singular: "Aplikacija OAuth" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "Aplikacija OAuth" named: "OAuth aplikacija '%{name}'" new: "Nova OAuth aplikacija" diff --git a/config/locales/crowdin/sr.yml b/config/locales/crowdin/sr.yml index f5179eef37de..04f6b4b107dc 100644 --- a/config/locales/crowdin/sr.yml +++ b/config/locales/crowdin/sr.yml @@ -229,6 +229,10 @@ sr: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ sr: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ sr: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -476,6 +482,7 @@ sr: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -655,6 +662,7 @@ sr: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -677,14 +685,15 @@ sr: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -699,6 +708,9 @@ sr: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -735,6 +747,8 @@ sr: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -799,6 +813,7 @@ sr: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -834,6 +849,8 @@ sr: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -877,6 +894,9 @@ sr: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -886,7 +906,7 @@ sr: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1210,12 +1230,16 @@ sr: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1580,8 +1604,9 @@ sr: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1802,6 +1827,10 @@ sr: one: "hour" few: "hours" other: "hours" + day: + one: "day" + few: "days" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1837,6 +1866,10 @@ sr: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2199,6 +2232,7 @@ sr: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2619,6 +2653,7 @@ sr: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2645,6 +2680,7 @@ sr: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3062,6 +3098,7 @@ sr: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3111,7 +3148,7 @@ sr: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3141,10 +3178,11 @@ sr: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3237,9 +3275,9 @@ sr: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3373,6 +3411,7 @@ sr: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3598,6 +3637,27 @@ sr: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3631,6 +3691,7 @@ sr: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3710,6 +3771,7 @@ sr: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4079,6 +4141,8 @@ sr: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/sv.yml b/config/locales/crowdin/sv.yml index 3f1945935290..6c4fd342f26e 100644 --- a/config/locales/crowdin/sv.yml +++ b/config/locales/crowdin/sv.yml @@ -229,6 +229,10 @@ sv: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ sv: confirm_destroy_option: "Radering av ett alternativ kommer radera alla förekomster (i arbetspaket). Är du säker på att du vill radera?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ sv: label: "Etikett" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ sv: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -645,6 +652,7 @@ sv: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -667,14 +675,15 @@ sv: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -689,6 +698,9 @@ sv: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -725,6 +737,8 @@ sv: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Inbjudan account: delete: "Ta bort konto" @@ -789,6 +803,7 @@ sv: is_required: "Krävs" max_length: "Maximal längd" min_length: "Minsta längd" + content_right_to_left: "Right-to-Left content" multi_value: "Tillåt flerval" possible_values: "Möjliga värden" regexp: "Reguljära uttryck" @@ -824,6 +839,8 @@ sv: attr_lastname: "Efternamnsattribut" attr_login: "Attribut för användarnamn" attr_mail: "E-postattribut" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -867,6 +884,9 @@ sv: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Kolumner" relations_to_type_column: "Relationer till %{type}" @@ -876,7 +896,7 @@ sv: timeline_labels: "Etiketter för tidslinje" relation: lag: "Lag" - from: "Arbetspaket" + from: "Related work package" to: "Relaterat arbetspaketet" reminder: remind_at_date: "Date" @@ -1200,12 +1220,16 @@ sv: typed_dag: circular_dependency: "Förhållandet skapar en cirkel av relationer." attributes: - to: - error_not_found: "arbetspaketet i 'till' hittades inte eller är inte synligt" - error_readonly: "en befintlig relations 'till'-länk går ej att ändra" - from: - error_not_found: "arbetspaketet i 'från' hittades inte eller är inte synligt" - error_readonly: "en befintlig relations 'från'-länk går ej att ändra" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM leverantör är inte tillgänglig" not_whitelisted: "tillåts inte av konfigurationen." @@ -1560,8 +1584,9 @@ sv: button_copy_and_follow: "Kopiera och följ" button_create: "Skapa" button_create_and_continue: "Skapa och fortsätt" - button_delete: "Ta bort" button_decline: "Avslå" + button_delete: "Ta bort" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Ta bort bevakare %{name}" button_download: "Ladda ner" button_duplicate: "Duplicera" @@ -1764,6 +1789,9 @@ sv: hour: one: "timme" other: "timmar" + day: + one: "day" + other: "days" description_active: "Aktiv?" description_attachment_toggle: "Visa/Dölj bilagor" description_autocomplete: > @@ -1799,6 +1827,10 @@ sv: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Lägg till nya attributgrupper" @@ -2161,6 +2193,7 @@ sv: label_add_subtask: "Lägg till deluppgift" label_added: "lagt till" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Lagts till av %{author} %{age} sen" label_additional_workflow_transitions_for_assignee: "Ytterligare övergångar tillåtna när användaren är tilldelad" label_additional_workflow_transitions_for_author: "Ytterligare övergångar tillåtna när användaren är författaren" @@ -2581,6 +2614,7 @@ sv: label_project_new: "Nytt projekt" label_project_plural: "Projekt" label_project_list_plural: "Projektlistor" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Projektinställningar" @@ -2607,6 +2641,7 @@ sv: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Ta bort relation" + label_relation_edit: "Edit relation" label_relation_new: "Ny relation" label_release_notes: "Versionsnoteringar" label_remaining_work: "Remaining work" @@ -3023,6 +3058,7 @@ sv: notice_bad_request: "Felaktig förfrågan." notice_not_authorized: "Du har inte behörighet att komma åt denna sida." notice_not_authorized_archived_project: "Projektet som du försöker komma åt har arkiverats." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Ditt lösenord är inte korrekt. Kan inte fortsätta." notice_principals_found_multiple: "%{number} resultat hittades. Använd TAB för att fokusera på det första." notice_principals_found_single: "Ett resultat. Använd TAB för att fokusera på det." @@ -3071,7 +3107,7 @@ sv: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Välj ditt språk" - permission_add_work_package_notes: "Lägg till anteckningar" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Lägg till arbetspaket" permission_add_messages: "Publicera meddelanden" permission_add_project: "Skapa projekt" @@ -3101,10 +3137,11 @@ sv: permission_delete_timelines: "Ta bort tidslinjer" permission_delete_wiki_pages: "Ta bort wikisidor" permission_delete_wiki_pages_attachments: "Ta bort bifogade filer" - permission_edit_work_package_notes: "Redigera anteckningar" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Redigera arbetspaket" permission_edit_messages: "Redigera meddelanden" - permission_edit_own_work_package_notes: "Redigera egna anteckningar" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Redigera egna meddelanden" permission_edit_own_time_entries: "Redigera egna tidrapporter" permission_edit_project: "Redigera projekt" @@ -3197,9 +3234,9 @@ sv: are_you_sure: "Är du säker på att du vill arkivera projektet '%{name}'?" archived: "Arkiverad" count: - zero: "0 projekt" - one: "1 projekt" - other: "%{count} projekt" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Aktivitet" project_module_forums: "Forum" project_module_work_package_tracking: "Arbetspaket" @@ -3331,6 +3368,7 @@ sv: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Sök ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3556,6 +3594,27 @@ sv: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3589,6 +3648,7 @@ sv: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Ta bort arbetspaket och alla underarbetspaket?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Tilldela till projektet" text_form_configuration: > Du kan anpassa vilka fält som ska visas i formulär för arbetspaket. Du kan fritt gruppera fälten för att återspegla behoven för din domän. @@ -3668,6 +3728,7 @@ sv: text_notice_security_badge_displayed_html: > Obs: om aktiverad, kommer detta att visa ett märke med din installationsstatus i administrationspanelen %{information_panel_label} och på startsidan. Det visas endast för administratörer.
    Emblemet kommer att kontrollera din nuvarande OpenProject-version mot den officiella OpenProject-utgåvans databas för att varna dig om eventuella uppdateringar eller kända sårbarheter. För mer information om vad kontrollen ger, vilka uppgifter som behövs för att tillhandahålla tillgängliga uppdateringar, och hur du inaktiverar denna kontroll, besök konfigurationsdokumentationen. text_own_membership_delete_confirmation: "Du håller på att ta bort några eller alla av dina behörigheter och kommer därefter inte längre att kunna redigera detta projekt. Är du säker på att du vill fortsätta?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Katalogen \"Plugin assets\" skrivbar" text_powered_by: "Drivs av %{link}" text_project_identifier_info: "Bara gemena bokstäver (a-z), siffror, bindestreck och understreck tillåts och måste dessutom börja med en gemen bokstav." @@ -4035,6 +4096,8 @@ sv: builtin: Built-in instance application confidential: Confidential singular: "OAuth-autentisering" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applikationer" named: "OAuth applikationen '%{name}'" new: "Ny OAuth applikation" diff --git a/config/locales/crowdin/th.yml b/config/locales/crowdin/th.yml index c51ba5333b8b..7e0e706e5e72 100644 --- a/config/locales/crowdin/th.yml +++ b/config/locales/crowdin/th.yml @@ -229,6 +229,10 @@ th: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ th: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ th: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -462,6 +468,7 @@ th: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -637,6 +644,7 @@ th: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -659,14 +667,15 @@ th: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -681,6 +690,9 @@ th: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -717,6 +729,8 @@ th: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "ลบบัญชีผู้ใช้" @@ -781,6 +795,7 @@ th: is_required: "จำเป็นต้องระบุ" max_length: "ความยาวตัวอักษรสูงสุด" min_length: "จำนวนตัวอักษรขั้นต่ำ" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "ค่าที่เป็นไปได้" regexp: "สูตรโดยทั่วไป" @@ -816,6 +831,8 @@ th: attr_lastname: "คุณสมบัติของนามสกุล" attr_login: "Username attribute" attr_mail: "คุณสมบัติของอีเมล" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "โฮสต์" onthefly: "Automatic user creation" @@ -859,6 +876,9 @@ th: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "คอลัมน์" relations_to_type_column: "Relations to %{type}" @@ -868,7 +888,7 @@ th: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "ชุดภารกิจ" + from: "Related work package" to: "ชุดภารกิจที่เกี่ยวข้อง" reminder: remind_at_date: "Date" @@ -1192,12 +1212,16 @@ th: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1542,8 +1566,9 @@ th: button_copy_and_follow: "คัดลอก และปฏิบัติตาม" button_create: "สร้าง" button_create_and_continue: "สร้าง และดำเนินการต่อ" - button_delete: "ลบ" button_decline: "Decline" + button_delete: "ลบ" + button_delete_permanently: "Delete permanently" button_delete_watcher: "ลบผู้ดูข้อมูล คุณ %{name}" button_download: "ดาวน์โหลด" button_duplicate: "ทำซ้ำ" @@ -1728,6 +1753,8 @@ th: units: hour: other: "ชั่วโมง" + day: + other: "days" description_active: "ใช้งานอยู่หรือไม่?" description_attachment_toggle: "แสดง/ซ่อนไฟล์แนบ" description_autocomplete: > @@ -1763,6 +1790,10 @@ th: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2125,6 +2156,7 @@ th: label_add_subtask: "เพิ่มงานย่อย" label_added: "เพิ่มแล้ว" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "ถูกเพิ่มโดย %{author} เมื่อ %{age} ที่ผ่านมา" label_additional_workflow_transitions_for_assignee: "ยินยอมให้มีการเปลี่ยนแปลงได้เพิ่มขึ้นเมื่อผู้ใช้เป็นผู้ได้รับมอบหมายความรับผิดชอบ" label_additional_workflow_transitions_for_author: "ยินยอมให้มีการเปลี่ยนแปลงได้เพิ่มขึ้นเมื่อผู้ใช้เป็นผู้สร้าง" @@ -2545,6 +2577,7 @@ th: label_project_new: "โครงการใหม่" label_project_plural: "โครงการ" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "การตั้งค่าโครงการ" @@ -2571,6 +2604,7 @@ th: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "ลบความสัมพันธ์" + label_relation_edit: "Edit relation" label_relation_new: "ความสัมพันธ์ใหม่" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -2986,6 +3020,7 @@ th: notice_bad_request: "คำขอไม่ถูกต้อง" notice_not_authorized: "คุณไม่ได้รับอนุญาตให้เข้าถึงเพจนี้" notice_not_authorized_archived_project: "โครงการที่คุณกำลังพยายามเข้าถึงถูกเก็บถาวรแล้ว" + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3033,7 +3068,7 @@ th: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "เพิ่มหมายเหตุ" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "เพิ่มลำดับภารกิจ" permission_add_messages: "โพสต์ข้อความ" permission_add_project: "Create projects" @@ -3063,10 +3098,11 @@ th: permission_delete_timelines: "ลบแผนผังเวลา" permission_delete_wiki_pages: "ลบหน้าวิกิ" permission_delete_wiki_pages_attachments: "ลบไฟล์แนบ" - permission_edit_work_package_notes: "แก้ไขหมายเหตุ" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "แก้ไขชุดภารกิจ" permission_edit_messages: "แก้ไขข้อความ" - permission_edit_own_work_package_notes: "แก้ไขหมายเหตุ" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "แก้ไขข้อความของตัวเอง" permission_edit_own_time_entries: "แก้ไขบันทึกเวลาของตนเอง" permission_edit_project: "แก้ไขโครงการ" @@ -3159,9 +3195,9 @@ th: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "กิจกรรม" project_module_forums: "กระทู้" project_module_work_package_tracking: "ชุดภารกิจ" @@ -3295,6 +3331,7 @@ th: activated: "activated" deactivated: "deactivated" search_input_placeholder: "ค้นหา..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3520,6 +3557,27 @@ th: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3553,6 +3611,7 @@ th: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "ลบชุดภารกิจและ ชุดภารกิจย่อยที่เกี่ยวข้องทั้งหมดหรือไม่?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "กำหนดไปยังโครงการ" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3632,6 +3691,7 @@ th: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
    The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "สามารถบันทึก ไดเรคทอรี่ของ Plugin asset ได้" text_powered_by: "ดำเนินการโดย %{link}" text_project_identifier_info: "ใช้ได้เฉพาะตัวพิมพ์เล็ก (a-z), ตัวเลข เส้นประ และขีดใต้ โดย ต้องเริ่มต้น ด้วยตัวอักษรพิมพ์เล็กเท่านั้น" @@ -3999,6 +4059,8 @@ th: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/tr.seeders.yml b/config/locales/crowdin/tr.seeders.yml index c2bc83a440b8..638819150734 100644 --- a/config/locales/crowdin/tr.seeders.yml +++ b/config/locales/crowdin/tr.seeders.yml @@ -85,17 +85,17 @@ tr: item_0: name: Initiating item_1: - name: Ready for Planning + name: Planlama için Hazır item_2: - name: Planning + name: Planlanıyor item_3: - name: Ready for Executing + name: Yürütmeye Hazır item_4: - name: Executing + name: Yürütme item_5: - name: Ready for Closing + name: Kapanışa Hazır item_6: - name: Closing + name: Kapatılıyor priorities: item_0: name: Düşük @@ -107,18 +107,18 @@ tr: name: Acil projects: demo-project: - name: Demo project + name: Demo proje status_explanation: Tüm görevler programa uygundur. İlgili kişiler görevlerini biliyor. Sistem tamamen kurulmuştur. description: Bu, bu demo projesinin hedeflerinin kısa bir özetidir. news: item_0: - title: Welcome to your demo project + title: Demo projenize hoş geldiniz summary: | - We are glad you joined. - In this module you can communicate project news to your team members. - description: The actual news + Katıldığınız için mutluyuz. + Bu modülde proje haberlerini ekip üyelerinize iletebilirsiniz. + description: Gerçek haberler categories: - item_0: Category 1 (to be changed in Project settings) + item_0: Kategori 1 (Proje ayarlarında değiştirilecektir) queries: item_0: name: Proje planı @@ -130,9 +130,9 @@ tr: name: Takım planlayıcısı boards: kanban: - name: Kanban board + name: Kanban panosu basic: - name: Temel kurulu + name: Temel pano lists: item_0: name: İstek listesi @@ -143,7 +143,7 @@ tr: item_3: name: Hiçbir zaman parent_child: - name: Work breakdown structure + name: İş kırılım yapısı project-overview: widgets: item_0: @@ -190,50 +190,50 @@ tr: item_2: subject: Create sponsorship brochure and hand-outs item_1: - subject: Invite attendees to conference + subject: Katılımcıları konferansa davet edin item_2: - subject: Setup conference website + subject: Konferans web sitesi kurulumu item_2: - subject: Conference + subject: Konferans item_3: - subject: Follow-up tasks + subject: Takip görevleri children: item_0: - subject: Upload presentations to website + subject: Sunumları web sitesine yükleyin item_1: - subject: Party for conference supporters :-) + subject: Konferans destekçileri için parti :-) description: |- - * [ ] Beer - * [ ] Snacks - * [ ] Music - * [ ] Even more beer + * [ ] Bira + * [ ] Atıştırmalıklar + * [ ] Müzik + * [ ] Daha da fazla bira item_4: - subject: End of project + subject: Proje sonu wiki: | - _In this wiki you can collaboratively create and edit pages and sub-pages to create a project wiki._ + Bu wiki'de bir proje wiki'si oluşturmak için sayfaları ve alt sayfaları işbirliği içinde oluşturabilir ve düzenleyebilirsiniz._ - **You can:** + **Şunları yapabilirsiniz:** - * Insert text and images, also with copy and paste from other documents - * Create a page hierarchy with parent pages - * Include wiki pages to the project menu - * Use macros to include, e.g. table of contents, work package lists, or Gantt charts - * Include wiki pages in other text fields, e.g. project overview page - * Include links to other documents - * View the change history - * View as Markdown + * Diğer belgelerden kopyalayıp yapıştırarak da metin ve resim ekleyebilirsiniz + * Üst sayfalarla bir sayfa hiyerarşisi oluşturun + * Proje menüsüne wiki sayfalarını ekleyin + * Eklemek için makroları kullanın, örn.örneğin içindekiler tablosu, iş paketi listeleri veya Gantt şemaları + * Wiki sayfalarını diğer metin alanlarına dahil edin, örneğin projeye genel bakış sayfası + * Diğer belgelere bağlantılar ekleyin + * Değişiklik geçmişini görüntüleyin + * Markdown olarak görüntüleyin - More information: [https://www.openproject.org/docs/user-guide/wiki/](https://www.openproject.org/docs/user-guide/wiki/) + Daha fazla bilgi: [https://www.openproject.org/docs/user-guide/wiki/](https://www.openproject.org/docs/user-guide/wiki/) scrum-project: - name: Scrum project + name: Scrum projesi status_explanation: Tüm görevler programa uygundur. İlgili kişiler görevlerini biliyor. Sistem tamamen kurulmuştur. description: Bu, bu demo Scrum projesinin hedeflerinin kısa bir özetidir. news: item_0: - title: Welcome to your Scrum demo project + title: Scrum demo projenize hoş geldiniz summary: | - We are glad you joined. - In this module you can communicate project news to your team members. + Katıldığınız için mutluyuz. + Bu modülde proje haberlerini ekip üyelerinize iletebilirsiniz. versions: item_0: name: Bug Backlog @@ -292,28 +292,28 @@ tr: item_3: name: Koşu 2 categories: - item_0: Category 1 (to be changed in Project settings) + item_0: Kategori 1 (Proje ayarlarında değiştirilecektir) queries: item_0: name: Proje planı item_1: name: Ürün bekleme süresi item_2: - name: Sprint 1 + name: Koşu 1 item_3: name: Görevler boards: kanban: - name: Kanban board + name: Kanban panosu basic: name: Görev tahtası lists: item_0: - name: Wish list + name: İstek listesi item_1: - name: Short list + name: Kısa liste item_2: - name: Priority list for today + name: Bugün için öncelik listesi item_3: name: Hiçbir zaman project-overview: @@ -347,18 +347,18 @@ tr: name: Proje planı work_packages: item_0: - subject: New login screen + subject: Yeni giriş ekranı item_1: - subject: Password reset does not send email + subject: Parola sıfırlama e-posta göndermiyor item_2: - subject: New website + subject: Yeni web sitesi children: item_0: - subject: Newsletter registration form + subject: Bülten kayıt formu item_1: - subject: Implement product tour + subject: Ürün turunu uygulayın item_2: - subject: New landing page + subject: Yeni açılış sayfası children: item_0: subject: Create wireframes for new landing page @@ -374,28 +374,28 @@ tr: item_6: subject: SSL sertifikası item_7: - subject: Set-up Staging environment + subject: Staging ortamının kurulması item_8: - subject: Choose a content management system + subject: Bir içerik yönetim sistemi seçimi item_9: - subject: Website navigation structure + subject: Web sitesi gezinti yapısı children: item_0: subject: Set up navigation concept for website. item_10: - subject: Internal link structure + subject: İç bağlantı yapısı item_11: - subject: Develop v1.0 + subject: v1.0 geliştirmesi item_12: - subject: Release v1.0 + subject: Sürüm v1.0 item_13: - subject: Develop v1.1 + subject: v1.1 geliştirmesi item_14: - subject: Release v1.1 + subject: Sürüm v1.1 item_15: - subject: Develop v2.0 + subject: v2.0 geliştirmesi item_16: - subject: Release v2.0 + subject: Sürüm v2.0 wiki: | ### Sprint planning meeting diff --git a/config/locales/crowdin/tr.yml b/config/locales/crowdin/tr.yml index 0409938b2f36..10377cb1a9bb 100644 --- a/config/locales/crowdin/tr.yml +++ b/config/locales/crowdin/tr.yml @@ -32,7 +32,7 @@ tr: label_activity_show_only_comments: "Sadece yorumları göster" label_activity_show_only_changes: "Yalnızca değişiklikleri göster" label_sort_asc: "En alttaki en yeni" - label_sort_desc: "En yeniler en üstte" + label_sort_desc: "En üstte en yeniler" label_type_to_comment: "Bir yorum ekleyin. Kişilere bildirmek için @ yazın." label_submit_comment: "Yorum gönder" changed_on: "changed on" @@ -229,6 +229,10 @@ tr: item: title: Bu öğenin altında herhangi bir hiyerarşi düzeyi yoktur description: Başka bir listenin içinde alt öğeler oluşturmak için bu listeye öğeler ekleyin + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Öğe etiketi" short: "Kısa adı" @@ -249,6 +253,7 @@ tr: confirm_destroy_option: "Bir seçeneğin silinmesi, kullanıldığı her yerden (örneğin iş paketleri) silinmesine neden olur. Silmek istediğinizden emin misiniz?" reorder_alphabetical: "Değerleri alfabetik olarak yeniden sıralayın" reorder_confirmation: "Uyarı: Mevcut değerlerin sırası kaybolacak. Devam et?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Özel alanı gerekli olarak işaretleyin. Bu, yeni kaynaklar oluştururken veya mevcut kaynakları güncellerken alanın doldurulmasını zorunlu hale getirecektir." is_required_for_project: "Bu özelliği etkinleştirmek ve tüm projelerde gerekli kılmak için işaretleyin. Tek tek projeler için devre dışı bırakılamaz." @@ -259,7 +264,7 @@ tr: editable: "Alanın kullanıcılar tarafından düzenlenebilir olmasına izin verin." admin_only: "Bu niteliğin yalnızca yöneticilere görünür kılmak için işaretleyin. Yönetici hakları olmayan kullanıcılar bunu görüntüleyemez veya düzenleyemez." is_filter: > - Allow the custom field to be used in a filter in work package views. Note that only with 'For all projects' selected, the custom field will show up in global views. + Özel alanın iş paketi görünümlerinde bir filtrede kullanılmasına izin verin. Yalnızca 'Tüm projeler için' seçildiğinde, özel alanın genel görünümlerde görüneceğini unutmayın. tab: no_results_title_text: Şu anda özel bir alan bulunmamakta. no_results_content_text: Yeni bir özel alan oluştur @@ -270,15 +275,15 @@ tr: int?: "bir tamsayı olmalıdır." filled?: "doldurulmalı." greater_or_equal_zero: "must be greater or equal to 0." - not_found: "not found." + not_found: "bulunamadı." rules: item: - root_item: "cannot be a root item." - not_persisted: "must be an already existing item." + root_item: "bir kök öğe olamaz." + not_persisted: "zaten var olan bir öğe olmalıdır." label: - not_unique: "must be unique within the same hierarchy level." + not_unique: "aynı hiyerarşi seviyesi içinde benzersiz olmalıdır." short: - not_unique: "must be unique within the same hierarchy level." + not_unique: "aynı hiyerarşi seviyesi içinde benzersiz olmalıdır." parent: not_descendant: "must be a descendant of the hierarchy root." rules: @@ -287,6 +292,7 @@ tr: label: "Etiket" short: "Kısa adı" parent: "Üst" + blueprint: "Pattern blueprint" global_search: placeholder: "%{app_title} içinde ara" overwritten_tabs: @@ -463,14 +469,15 @@ tr: cannot_remove_inherited: "The work packages shares shared via groups cannot be removed." cannot_remove_inherited_with_role: "The work packages shares with role %{shared_role_name} are shared via groups and cannot be removed." cannot_remove_inherited_note_admin_html: "You can either revoke the share to the group or remove this specific member from the group in the %{administration_settings_link}." - cannot_remove_inherited_note_non_admin: "You can either revoke the share to the group or contact your administrator to remove this specific member from the group." - will_revoke_directly_granted_access: "This action will revoke their access to all of them, but the work packages shared with a group." - will_revoke_access_to_all: "This action will revoke their access to all of them." + cannot_remove_inherited_note_non_admin: "Grup paylaşımını iptal edebilir ya da bu üyeyi gruptan çıkarmak için yöneticinizle iletişime geçebilirsiniz." + will_revoke_directly_granted_access: "Bu eylem, bir grupla paylaşılan iş paketleri hariç hepsine erişimlerini iptal edecektir." + will_revoke_access_to_all: "Bu eylem, hepsine erişimlerini iptal edecektir." my: access_token: create_dialog: + title: Token generated header: '%{type} belirteci oluşturuldu' - warning: Note that this is the only time you will see this token, make sure to copy it now. + warning: Bu belirteci sadece bir kez göreceğinizi unutmayın, şimdi kopyaladığınızdan emin olun. errors: token_name_blank: "Lütfen API anahtarı için bir ad girin" token_name_in_use: "Bu API anahtarı adı kullanılmaktadır, lütfen başka bir tane seçin" @@ -487,7 +494,7 @@ tr: notice_reset_token: "Yeni bir %{type} anahtar üretildi. Erişim anahtarınız:" token_value_warning: "Not: Bu anahtarı görebileceğiniz tek an bu, kopyaladığınıza emin olun." no_results_title_text: Şu anda hiçbir erişim anahtarı mevcut değil. - notice_api_token_revoked: "The API token has been deleted. To create a new token please use the button in the API section." + notice_api_token_revoked: "API belirteci silinmiştir. Yeni bir belirteç oluşturmak için lütfen API bölümündeki düğmeyi kullanın." notice_rss_token_revoked: "The RSS token has been deleted. To create a new token please use the link in the RSS section." notice_ical_token_revoked: 'iCalendar token "%{token_name}" for calendar "%{calendar_name}" of project "%{project_name}" has been revoked. The iCalendar URL with this token is now invalid.' news: @@ -513,8 +520,8 @@ tr: member_in_these_groups: "Bu kullanıcı şu anda aşağıdaki grupların bir üyesidir:" no_results_title_text: Bu kullanıcı şu anda hiçbir gruba üye değil. summary_with_more: Member of %{names} and %{count_link}. - more: "%{count} more" - summary: Member of %{names}. + more: "%{count} tane daha" + summary: '%{names} üyesi.' memberships: no_results_title_text: Bu kullanıcı şuan için bir proje üyesi değil. open_profile: "Profili aç" @@ -561,9 +568,9 @@ tr: Yeni iş paketleri varsayılan olarak bu türe ayarlanmıştır. Salt okunur olamazlar. status_excluded_from_totals_text: |- Bir hiyerarşide bu duruma sahip iş paketlerini İş, - Kalan iş ve % Tamamlandı toplamlarından hariç tutmak için bu seçeneği işaretleyin. + Kalan iş ve tamamlanma yüzdesi toplamlarından hariç tutmak için bu seçeneği işaretleyin. status_percent_complete_text: |- - Durum bazlı ilerleme hesaplama modunda, bu durum seçildiğinde bir işin % Tamamlandı durumu otomatik olarak bu değere ayarlanır. + Durum bazlı ilerleme hesaplama modunda, bu durum seçildiğinde bir işin tamamlanma yüzdesi durumu otomatik olarak bu değere ayarlanır. İş bazlı modda yok sayılır. status_readonly_html: | Bu durumdaki iş paketlereni salt okunur olarak işaretlemek için bu seçeneği işaretleyin. @@ -598,20 +605,20 @@ tr: tab: "Ayarlar" type_color_text: The selected color distinguishes different types in Gantt charts or work packages tables. It is therefore recommended to use a strong color. subject_configuration: - tab: "Subject configuration" + tab: "Konu yapılandırması" manually_editable_subjects: - label: "Manually editable subjects" - caption: "Users can manually enter and edit work package subjects without restrictions." + label: "Elle düzenlenebilir konular" + caption: "Kullanıcılar iş paketi konularını kısıtlama olmaksızın elle girebilir ve düzenleyebilir." automatically_generated_subjects: label: "Automatically generated subjects" - caption: "Define a pattern using referenced attributes and text to automatically generate work package subjects. Users will not be able to manually edit subjects." + caption: "İş paketi konularını otomatik olarak oluşturmak için başvurulan öznitelikleri ve metni kullanarak bir kalıp tanımlayın. Kullanıcılar konuları elle düzenleyemeyecektir." pattern: - label: "Subject pattern" + label: "Konu deseni" caption: "Search for an attribute or add text. To create a space between elements add it as a text." versions: overview: work_packages_in_archived_projects: "Sürüm, hala bu sürüme atanmış iş paketleri olan arşivlenmiş projelerle paylaşılmakta. Bunlar sayılır, ancak bağlantılı görünümlerde gösterilmez." - no_results_title_text: Bu sürüme atadığım iş paketi bulunmuyor. + no_results_title_text: Bu sürüme atanan iş paketi bulunmuyor. wiki: page_not_editable_index: İstenen sayfa mevcut değil (henüz). Tüm wiki sayfalarının dizinine yönlendirildiniz. no_results_title_text: Şu anda wiki sayfası bulunmuyor. @@ -643,8 +650,9 @@ tr: sharing: missing_workflow_warning: title: "İş paketi paylaşımı için iş akışı eksik" - message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." + message: "'İş paketi düzenleyicisi' rolü için hiçbir iş akışı yapılandırılmamıştır. Bir iş akışı olmadan, paylaşılan kullanıcı iş paketinin durumunu değiştiremez. İş akışları kopyalanabilir. Bir kaynak türü (örn. 'Görev') ve kaynak rolü (örn. 'Üye') seçin. Ardından hedef türleri seçin. Başlangıç olarak, tüm türleri hedef olarak seçebilirsiniz. Son olarak, hedef olarak 'İş paketi düzenleyicisi' rolünü seçin ve 'Kopyala' düğmesine basın. Varsayılanları bu şekilde oluşturduktan sonra, diğer tüm roller için yaptığınız gibi iş akışlarında ince ayar yapın." link_message: "İş akışlarını yönetim alanından yapılandırın." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -663,18 +671,19 @@ tr: no_results_title_text: Şu anda sürüm bulunmuyor. work_package_relations_tab: index: - action_bar_title: "Add relations to other work packages to create a link between them." - no_results_title_text: There are currently no relations available. + action_bar_title: "Aralarında bir bağlantı oluşturmak için diğer iş paketlerine ilişkiler ekleyin." + no_results_title_text: Şu anda herhangi bir ilişki mevcut değildir. blankslate_heading: "İlişki yok" blankslate_description: "Bu iş paketinin henüz herhangi bir ilişkisi bulunmamaktadır." + label_add_child_button: "Alt" label_add_x: "%{x} ekle" label_edit_x: "%{x} düzenle" label_add_description: "Açıklama ekle" lag: subject: "Gecikme" - title: "Gecikme (gün olarak)" caption: "İki iş paketi arasında beklenmesi gereken en az iş günü sayısı." relations: + label_new_child_created: "Yeni iş paketi oluşturuldu ve alt olarak eklendi" label_relates_singular: "ilişkili" label_relates_plural: "ilişkili" label_relates_to_singular: "ilişkili" @@ -689,6 +698,9 @@ tr: follows_description: "Bu iş paketinin başlayabilmesi için ilgili iş paketinin mutlaka bitmesi gerekir" label_child_singular: "alt" label_child_plural: "alt" + new_child: "Yeni alt" + new_child_text: "Geçerli (ana) iş paketinin bir alt öğesi olarak ilgili bir iş paketi oluşturur" + existing_child: "Mevcut alt" child_description: "İlgili iş paketini geçerli (ana) iş paketinin bir alt öğesi yapar" label_blocks_singular: "engelleyen" label_blocks_plural: "engelleyen" @@ -711,10 +723,10 @@ tr: label_includes_singular: "includes" label_includes_plural: "includes" includes_description: "Marks the related work package as including this one with no additional effect" - label_partof_singular: "part of" - label_partof_plural: "part of" - label_part_of_singular: "part of" - label_part_of_plural: "part of" + label_partof_singular: "bir parçasıdır" + label_partof_plural: "bir parçasıdır" + label_part_of_singular: "bir parçasıdır" + label_part_of_plural: "bir parçasıdır" partof_description: "Marks the related work package as being part of this one with no additional effect" part_of_description: "Marks the related work package as being part of this one with no additional effect" label_requires_singular: "requires" @@ -725,6 +737,8 @@ tr: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "İlgili iş paketi" + ghost_relation_description: "Bu, izinler nedeniyle sizin tarafınızdan görülemez." label_invitation: Davet account: delete: "Hesabı sil" @@ -789,6 +803,7 @@ tr: is_required: "Gerekli" max_length: "Maksimum uzunluk" min_length: "Minimum uzunluk" + content_right_to_left: "Sağdan Sola içerik" multi_value: "Çoklu seçime izin ver" possible_values: "Olası değerler" regexp: "Düzenli ifade" @@ -824,6 +839,8 @@ tr: attr_lastname: "Soyad özniteliği" attr_login: "Kullanıcı adı özelliği" attr_mail: "E-posta özniteliği" + filter_string: "Filter string" + admin: "Yönetici" base_dn: "Temel DN" host: "Sunucu" onthefly: "Otomatik kullanıcı oluşturma" @@ -867,6 +884,9 @@ tr: project_custom_field: is_required: "Tüm projelerde zorunludur" custom_field_section: Bölüm + project/life_cycle_step_definition: + name: "İsim" + color: "Renk" query: column_names: "Sütunlar" relations_to_type_column: "%{type} ile ilişkileri" @@ -876,11 +896,11 @@ tr: timeline_labels: "Zaman çizelgesi etiketleri" relation: lag: "Gecikme" - from: "İş paketi" + from: "İlgili iş paketi" to: "İlgili iş paketi" reminder: remind_at_date: "Tarih" - remind_at_time: "Time" + remind_at_time: "Zaman" repository: url: "URL" role: @@ -889,7 +909,7 @@ tr: is_closed: "İş paketi kapalı" is_readonly: "İş paketi salt okunur" excluded_from_totals: "Hiyerarşideki toplamların hesaplanmasından hariç tut" - default_done_ratio: "% Tamamlandı" + default_done_ratio: "Tamamlanma yüzdesi" time_entry: activity: "Etkinlik" hours: "Saat" @@ -938,7 +958,7 @@ tr: derived_done_ratio: "Toplam tamamlanma %" derived_remaining_hours: "Toplam kalan iş" derived_remaining_time: "Toplam kalan iş" - done_ratio: "% Tamamlandı" + done_ratio: "Tamamlanma yüzdesi" duration: "Süre" end_insertion: "Ekleme işlemi bitti" end_deletion: "Silme işlemi bitti" @@ -952,7 +972,7 @@ tr: parent_issue: "Üst" parent_work_package: "Üst" priority: "Öncelik" - progress: "% Tamamlandı" + progress: "Tamamlanma yüzdesi" readonly: "Salt okunur" remaining_hours: "Kalan çalışma" remaining_time: "Kalan çalışma" @@ -964,7 +984,7 @@ tr: time_entries: "Zaman kaydet" type: "Tür" version: "Sürüm" - watcher: "Takipçi" + watcher: "Takip eden" errors: messages: accepted: "kabul edilmelidir." @@ -1085,10 +1105,10 @@ tr: ical_token_query_assignment: attributes: name: - blank: "is mandatory. Please select a name." - not_unique: "is already in use. Please select another name." + blank: "zorunludur. Lütfen bir isim seçiniz." + not_unique: "zaten kullanılıyor. Lütfen başka bir isim seçiniz." meeting: - error_conflict: "Unable to save because the meeting was updated by someone else in the meantime. Please reload the page." + error_conflict: "Toplantı bu sırada başka biri tarafından güncellendiği için kaydedilemiyor. Lütfen sayfayı yeniden yükleyin." notifications: at_least_one_channel: "Bildirim göndermek için en az bir kanal belirtilmelidir." attributes: @@ -1129,8 +1149,8 @@ tr: project/life_cycle_step_definition: attributes: type: - must_be_a_stage_or_gate: "must be either Project::StageDefinition or Project::GateDefinition" - type_and_class_name_mismatch: "must match the instantiated class name" + must_be_a_stage_or_gate: "Project::StageDefinition veya Project::GateDefinition olmalıdır" + type_and_class_name_mismatch: "örneklenen sınıf adıyla eşleşmelidir" project/gate_definition: attributes: type: @@ -1142,8 +1162,8 @@ tr: project/life_cycle_step: attributes: type: - must_be_a_stage_or_gate: "must be either Project::Stage or Project::Gate" - must_be_a_stage: "must be a Project::Stage" + must_be_a_stage_or_gate: "Project::Stage veya Project::Gate olmalıdır" + must_be_a_stage: "bir Project::Stage olmalıdır" must_be_a_gate: "must be a Project::Gate" type_and_class_name_mismatch: "must match the instantiated class name" project/gate: @@ -1151,7 +1171,7 @@ tr: base: end_date_not_allowed: "Cannot assign end date to a Project::Gate" type: - type_and_class_name_mismatch: "must be a Project::Gate" + type_and_class_name_mismatch: "bir Project::Gate olmalıdır" date: non_continuous_dates: "can't be earlier than the previous %{step}'s end date." project/stage: @@ -1159,9 +1179,9 @@ tr: date_range: start_date_must_be_before_end_date: "start date must be before the end date." non_continuous_dates: "can't be earlier than the previous %{step}'s end date." - incomplete: "is incomplete." + incomplete: "tamamlanmamıştır." type: - type_and_class_name_mismatch: "must be a Project::Stage" + type_and_class_name_mismatch: "bir Project::Stage olmalıdır" query: attributes: project: @@ -1187,7 +1207,7 @@ tr: format: "%{message}" group_by_hierarchies_exclusive: "grubu tarafından '%{group_by}' ile birlikte kullanılamaz. Her ikisi de etkinleştiremezsiniz." can_only_be_modified_by_owner: "The query can only be modified by its owner." - need_permission_to_modify_public_query: "You cannot modify a public query." + need_permission_to_modify_public_query: "Genel bir sorguyu değiştiremezsiniz." filters: custom_fields: inexistent: "Hiçbir özel alan filtresi yok." @@ -1200,12 +1220,16 @@ tr: typed_dag: circular_dependency: "İlişki, bir ilişki çemberi oluşturur." attributes: - to: - error_not_found: "çalışma paketinde `to` konum bulunamadı veya görünür değil" - error_readonly: "`to` ilişkisi olduğundan bağlantı değiştirilemez" - from: - error_not_found: "iş paketi içerisinde `from` pozisyonu bulunamayor ya da görünür değil" - error_readonly: "`from` ilişkisi olduğundan bağlantı değiştirilemez" + to_id: + error_not_found: "bulunamadı veya görünmüyor." + error_readonly: "mevcut ilişkiler için değiştirilemez." + from_id: + error_not_found: "bulunamadı veya görünmüyor." + error_readonly: "mevcut ilişkiler için değiştirilemez." + lag: + greater_than_or_equal_to: + zero: "negatif olamaz." + less_than_or_equal_to: "çok yüksek." repository: not_available: "SCM satıcısı yok" not_whitelisted: "yapılandırmasına izin verilmiyor." @@ -1221,13 +1245,13 @@ tr: base: working_days_are_missing: "Haftanın en az bir günü iş günü olarak tanımlanmalıdır." previous_working_day_changes_unprocessed: "Çalışma günleri yapılandırmasında yapılan önceki değişiklikler henüz uygulanmadı." - hours_per_day_are_missing: "The number of hours per day must be defined." - durations_are_not_positive_numbers: "The durations must be positive numbers." - hours_per_day_is_out_of_bounds: "Hours per day can't be more than 24" + hours_per_day_are_missing: "Günlük saat sayısı tanımlanmalıdır." + durations_are_not_positive_numbers: "Süreler pozitif sayı olmalıdır." + hours_per_day_is_out_of_bounds: "Günlük saat 24'ten fazla olamaz" status: attributes: default_done_ratio: - inclusion: "must be between 0 and 100." + inclusion: "0 ile 100 arasında olmalıdır." readonly_default_exlusive: "varsayılan olarak işaretlenen durumlar için etkinleştirilemez." time_entry: attributes: @@ -1260,10 +1284,10 @@ tr: assigned_to: format: "%{message}" done_ratio: - does_not_match_work_and_remaining_work: "does not match Work and Remaining work" - cannot_be_set_when_work_is_zero: "cannot be set when Work is 0h" - must_be_set_when_remaining_work_is_set: "required when Remaining work is set." - must_be_set_when_work_and_remaining_work_are_set: "required when Work and Remaining work are set." + does_not_match_work_and_remaining_work: "İş ve Kalan çalışma ile eşleşmiyor" + cannot_be_set_when_work_is_zero: "İş 0sa olduğunda ayarlanamaz" + must_be_set_when_remaining_work_is_set: "Kalan iş ayarlandığında gereklidir." + must_be_set_when_work_and_remaining_work_are_set: "İş ve Kalan iş ayarlandığında gereklidir." inclusion: "must be between 0 and 100." due_date: not_start_date: "kilometre taşları için gerekli olmasına rağmen başlangıç tarihi değil." @@ -1322,7 +1346,7 @@ tr: confirmation: "Parola onayı parolayla eşleşmiyor." format: "%{message}" password: - weak: "Must contain characters of the following classes (at least %{min_count} of %{all_count}): %{rules}" + weak: "Aşağıdaki sınıflardan karakterler içermelidir (%{all_count} taneden en az %{min_count} tane): %{rules}" lowercase: "küçük harf (örneğin 'a')" uppercase: "büyük harf (örneğin 'A')" numeric: "rakam (örneğin '1')" @@ -1345,7 +1369,7 @@ tr: attributes: roles: ungrantable: "atanamaz bir rolü var." - more_than_one: "has more than one role." + more_than_one: "birden fazla rolü vardır." principal: unassignable: "bir projeye atanamaz." version: @@ -1430,7 +1454,7 @@ tr: other: "%{count} saat" hour_html: one: "%{count} saat" - other: "%{count} saatler" + other: "%{count} saat" updated: "%{old_value} değeri %{value} olarak değişti" logged_for: "Logged for" filter: @@ -1452,7 +1476,7 @@ tr: base: "Genel Hata:" blocks_ids: "Engellenen iş paketlerinin ID'leri" category: "Kategori" - comment: "Yorumlar" + comment: "Yorum" comments: "Yorum" content: "İçerik" color: "Renk" @@ -1538,7 +1562,7 @@ tr: button_add_item_below: "Öğeyi aşağıya ekle" button_add_sub_item: "Alt öğeyi ekle" button_add_member: Üye ekle - button_add_watcher: "Takipçi ekle" + button_add_watcher: "Takip eden ekle" button_annotate: "Atanan" button_apply: "Uygula" button_archive: "Arşivle" @@ -1560,9 +1584,10 @@ tr: button_copy_and_follow: "Kopyala ve takip et" button_create: "Oluştur" button_create_and_continue: "Oluştur ve devam et" - button_delete: "Sil" button_decline: "Reddet" - button_delete_watcher: "%{name} isimli takipçiyi sil" + button_delete: "Sil" + button_delete_permanently: "Kalıcı olarak sil" + button_delete_watcher: "%{name} isimli takip edeni sil" button_download: "İndir" button_duplicate: "Çoğalt" button_edit: "Düzenle" @@ -1588,7 +1613,7 @@ tr: button_reset: "Sıfırla" button_rollback: "Bu sürüme geri al" button_save: "Kaydet" - button_save_as: "Farklı Kaydet" + button_save_as: "Farklı kaydet" button_apply_changes: "Değişiklikleri uygula" button_save_back: "Kaydet ve geri dön" button_set_reminder: "Hatırlatma ayarla" @@ -1600,12 +1625,12 @@ tr: button_uncheck_all: "Tüm işaretleri kaldır" button_unlock: "Kilidi kaldır" button_unfavorite: "Favorilerden çıkar" - button_unwatch: "İzleme" + button_unwatch: "Takip etme" button_update: "Güncelle" button_upgrade: "Yükselt" button_upload: "Yükle" button_view: "Göster" - button_watch: "İzle" + button_watch: "Takip et" button_manage_menu_entry: "Menü öğesini düzenle" button_add_menu_entry: "Menü öğesi ekle" button_configure_menu_entry: "Menü öğesini düzenle" @@ -1764,6 +1789,9 @@ tr: hour: one: "saat" other: "saat" + day: + one: "gün" + other: "gün" description_active: "Aktif?" description_attachment_toggle: "Ekleri göster/gizle" description_autocomplete: > @@ -1797,8 +1825,12 @@ tr: direction: soldan sağa ee: upsale: - title: "Enterprise eklenti" + title: "Kurumsal eklenti" link_title: "Daha fazla bilgi" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Bu ek eklentilerle form yapılandırmasını özelleştirin:" add_groups: "Yeni öznitelik grubu ekleyin" @@ -1931,9 +1963,9 @@ tr: caption: "Depending on the chart size more than one page might be exported." long_text_fields: input_caption: "By default all long text fields are selected." - input_label: "Add long text fields" - input_placeholder: "Search for long text fields" - drag_area_label: "Manage long text fields" + input_label: "Uzun metin alanları ekle" + input_placeholder: "Uzun metin alanları için ara" + drag_area_label: "Uzun metin alanlarını yönet" xls: include_relations: label: "İlişkileri dahil edin" @@ -1941,25 +1973,25 @@ tr: include_descriptions: label: "Açıklamaları dahil et" caption: "Bu seçenek ham formatta bir açıklama sütunu ekleyecektir." - your_work_packages_export: "Work packages are being exported" - succeeded: "Export completed" - failed: "An error has occurred while trying to export the work packages: %{message}" + your_work_packages_export: "İş paketleri dışa aktarılıyor" + succeeded: "Dışa aktarma tamamlandı" + failed: "İş paketlerini dışa aktarmaya çalışırken bir hata oluştu: %{message}" format: atom: "Atom" csv: "CSV" pdf: "PDF" pdf_overview_table: "PDF Tablosu" - pdf_report_with_images: "PDF Report with images" + pdf_report_with_images: "Resimli PDF Raporu" pdf_report: "PDF Raporu" pdf_gantt: "PDF Gantt" image: omitted: "Görüntü dışa aktarılmadı." macro: - error: "Macro error, %{message}" - attribute_not_found: "attribute not found: %{attribute}" - model_not_found: "invalid attribute model: %{model}" - resource_not_found: "resource not found: %{resource}" - rich_text_unsupported: "Rich text embedding currently not supported in export" + error: "Makro hatası, %{message}" + attribute_not_found: "öznitelik bulunamadı: %{attribute}" + model_not_found: "geçersiz öznitelik modeli: %{model}" + resource_not_found: "kaynak bulunamadı: %{resource}" + rich_text_unsupported: "Zengin metin yerleştirme şu anda dışa aktarmada desteklenmiyor" units: hours: sa days: g @@ -2021,11 +2053,11 @@ tr: shortcuts: "Kısayollar" blog: "OpenProject blog" forums: "Topluluk forumu" - newsletter: "Güvenlik uyarıları / haber bülteni" + newsletter: "Güvenlik uyarıları / Haber bülteni" image_conversion: imagemagick: "Resim büyüsü" journals: - changes_retracted: "Değişiklikler geri çekildi." + changes_retracted: "Değişiklikler geri alındı." caused_changes: dates_changed: "Tarihler değişti" default_attribute_written: "Read-only attributes written" @@ -2033,7 +2065,7 @@ tr: status_changed: "Status '%{status_name}'" system_update: "OpenProject sistem güncellemesi:" work_package_duplicate_closed: "Duplicate work package updated:" - total_percent_complete_mode_changed_to_work_weighted_average: "Calculation of % Complete totals now weighted by Work." + total_percent_complete_mode_changed_to_work_weighted_average: "Tamamlanan % toplamlarının hesaplanması artık İşe göre ağırlıklandırılıyor." total_percent_complete_mode_changed_to_simple_average: "Calculation of % Complete totals now based on a simple average of only % Complete values." cause_descriptions: work_package_predecessor_changed_times: öncülü olarak değişti %{link} @@ -2091,12 +2123,12 @@ tr: action: "Eylem" expiration: "Bitiş tarihi" indefinite_expiration: "Hiçbir zaman" - simple_revoke_confirmation: "Are you sure you want to revoke this token?" + simple_revoke_confirmation: "Bu belirteci iptal etmek istediğinizden emin misiniz?" api: title: "API" - text_hint: "API tokens allow third-party applications to communicate with this OpenProject instance via REST APIs." - static_token_name: "API token" - disabled_text: "API tokens are not enabled by the administrator. Please contact your administrator to use this feature." + text_hint: "API belirteçleri, üçüncü taraf uygulamaların REST API'leri aracılığıyla bu OpenProject kurulumunuzla iletişim kurmasına olanak tanır." + static_token_name: "API belirteci" + disabled_text: "API belirteçleri yönetici tarafından etkinleştirilmemiştir. Bu özelliği kullanmak için lütfen yöneticinize başvurun." ical: title: "iCalendar" text_hint: 'iCalendar tokens allow users to subscribe to OpenProject calendars and view up-to-date work package information from external clients.' @@ -2112,21 +2144,21 @@ tr: static_token_name: "RSS token" disabled_text: "RSS tokens are not enabled by the administrator. Please contact your administrator to use this feature." storages: - title: "File Storages" + title: "Dosya Depoları" text_hint: "File Storage tokens connect this OpenProject instance with an external File Storage." - empty_text_hint: "There is no storage access linked to your account." + empty_text_hint: "Hesabınıza bağlı herhangi bir depolama erişimi yoktur." revoke_token: "Do you really want to remove this token? You will need to login again on %{storage}" removed: "Dosya Depolama belirteci başarıyla kaldırıldı" failed: "An error occurred and the token couldn't be removed. Please try again later." - unknown_storage: "Unknown storage" + unknown_storage: "Bilinmeyen depolama" notifications: reasons: assigned: "Atanan" dateAlert: "Tarih uyarısı" mentioned: "Bahsedilen" responsible: "Sorumlu" - shared: "Shared" - watched: "Takipçi" + shared: "Paylaşıldı" + watched: "Takip eden" reminder: "Hatırlatıcı" facets: unread: "Okunmamış" @@ -2161,6 +2193,7 @@ tr: label_add_subtask: "Alt görev ekle" label_added: "eklendi" label_added_by: "%{author} tarafından eklendi" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "%{author} tarafından %{age} önce eklendi" label_additional_workflow_transitions_for_assignee: "Kullanıcı atanan olduğu zaman tanınacak ek yetkiler" label_additional_workflow_transitions_for_author: "Kullanıcı oluşturan olduğunda izin verilen ek geçişler" @@ -2199,19 +2232,19 @@ tr: label_ldap_auth_source_plural: "LDAP bağlantıları" label_attribute_expand_text: "The complete text for '%{attribute}'" label_authentication: "Kimlik Doğrulaması" - label_authentication_settings: "Authentication settings" + label_authentication_settings: "Kimlik doğrulama ayarları" label_available_custom_fields_projects: "Available custom fields projects" label_available_global_roles: "Mevcut genel roller" - label_available_project_attributes: "Available project attributes" + label_available_project_attributes: "Mevcut proje öznitelikleri" label_available_project_forums: "Mevcut forumlar" label_available_project_repositories: "Uygun depolar" label_available_project_versions: "Uygun sürümler" label_available_project_work_package_categories: "Uygun iş paketi kategorileri" label_available_project_work_package_types: "Uygun iş paketi tipleri" - label_available_projects: "Available projects" + label_available_projects: "Mevcut projeler" label_api_doc: "API belgelendirmesi" - label_backup: "Yedek" - label_backup_code: "Yedek kod" + label_backup: "Yedekleme" + label_backup_code: "Yedek kodu" label_basic_details: "Temel bilgiler" label_between: "arasında" label_blocked_by: "bağlı" @@ -2231,7 +2264,7 @@ tr: label_calendars_and_dates: "Takvimler ve tarihler" label_calendar_show: "Takvimi Göster" label_category: "Kategori" - label_completed: Completed + label_completed: Tamamlandı label_consent_settings: "Kullanıcı Rızası" label_wiki_menu_item: Viki menü öğesi label_select_main_menu_item: Yeni ana menü öğesi seç @@ -2250,7 +2283,7 @@ tr: label_check_uncheck_all_in_column: "Sütunundaki tümü işaretle / işaretini kaldır" label_check_uncheck_all_in_row: "Sıralı tümü işaretle / işaretini kaldır" label_child_element: "Alt eleman" - label_choices: "Choices" + label_choices: "Seçenekler" label_close_versions: "Tamamlanmış sürümleri kapat" label_closed_work_packages: "kapalı" label_collapse: "Daralt" @@ -2273,8 +2306,8 @@ tr: label_copy_workflow_from: "İş akışı kopyala" label_copy_project: "Projeyi kopyala" label_core_version: "Çekirdek sürümü" - label_core_build: "Core build" - label_created_by: "Created by %{user}" + label_core_build: "Çekirdek yapı" + label_created_by: "%{user} tarafından oluşturuldu" label_current_status: "Mevcut durum" label_current_version: "Mevcut sürüm" label_custom_field_add_no_type: "Bu alanı bir iş paketi türüne ekleyin" @@ -2298,7 +2331,7 @@ tr: label_delete: "Sil" label_deleted: "silindi" label_deleted_custom_field: "(özel alan silindi)" - label_deleted_custom_item: "(deleted item)" + label_deleted_custom_item: "(silinmiş öğe)" label_deleted_custom_option: "(silinen seçenek)" label_empty_element: "(boş)" label_missing_or_hidden_custom_option: "(eksik değer veya erişim izinleri eksik)" @@ -2334,7 +2367,7 @@ tr: label_enterprise: "Kurumsal" label_enterprise_active_users: "%{current}/%{limit} aktif kullanıcı rezervasyonu" label_enterprise_edition: "Enterprise sürüm" - label_enterprise_support: "Enterprise support" + label_enterprise_support: "Kurumsal destek" label_environment: "Ortam" label_estimates_and_progress: "Tahminler ve ilerleme" label_equals: "şuysa" @@ -2342,9 +2375,9 @@ tr: label_everywhere: "heryer" label_example: "Örnek" label_experimental: "Deneysel" - label_i_am_member: "I am member" - label_ifc_viewer: "Ifc Viewer" - label_ifc_model_plural: "Ifc Models" + label_i_am_member: "Ben üyeyim" + label_ifc_viewer: "Ifc Görüntüleyici" + label_ifc_model_plural: "Ifc Modelleri" label_import: "İçeri Aktar" label_export_to: "Ayrıca şu adreste bulunabilir:" label_expand: "Genişlet" @@ -2386,7 +2419,7 @@ tr: label_hierarchy_leaf: "Hiyerarşi ağacı" label_home: "Ana sayfa" label_subject_or_id: "Konu ya da ID" - label_calendar_subscriptions: "Calendar subscriptions" + label_calendar_subscriptions: "Takvim abonelikleri" label_identifier: "Tanımlayıcı" label_in: "şurada" label_in_less_than: "daha azdır" @@ -2394,7 +2427,7 @@ tr: label_inactive: "Etkin değil" label_incoming_emails: "Gelen e-postalar" label_includes: "içerir" - label_incomplete: Incomplete + label_incomplete: Tamamlanmadı label_include_sub_projects: Include sub-projects label_index_by_date: "Tarihe göre diz" label_index_by_title: "Başlığa göre dizin" @@ -2444,7 +2477,7 @@ tr: label_custom_export_cover: "Özel dışarı aktarma kapak arka planı" label_custom_export_cover_overlay: "Custom export cover background overlay" label_custom_export_cover_text_color: "Metin rengi" - label_custom_pdf_export_settings: "Custom PDF export settings" + label_custom_pdf_export_settings: "Özel PDF dışa aktarma ayarları" label_custom_favicon: "Özel favicon" label_custom_touch_icon: "Özel dokunma simgesi" label_logout: "Oturumu kapat" @@ -2458,10 +2491,10 @@ tr: label_member_new: "Yeni Üye" label_member_all_admin: "(Yönetici durumuna bağlı olarak tüm roller)" label_member_plural: "Üyeler" - label_membership_plural: "Memberships" + label_membership_plural: "Üyelikler" label_membership_added: "Üye eklendi" label_membership_updated: "Üye güncellendi" - label_menu: "Menu" + label_menu: "Menü" label_menu_badge: pre_alpha: "pre-alpha" alpha: "alfa" @@ -2489,7 +2522,7 @@ tr: label_my_account: "Hesap ayarları" label_my_activity: "Benim faaliyetim" label_my_account_data: "Hesap verilerim" - label_my_avatar: "My avatar" + label_my_avatar: "Avatarım" label_my_queries: "Özel sorgularım" label_name: "İsim" label_never: "Hiçbir zaman" @@ -2519,11 +2552,11 @@ tr: label_none_parentheses: "(yok)" label_not_contains: "içermiyor" label_not_equals: "değildir" - label_life_cycle_step_plural: "Project lifecycle" + label_life_cycle_step_plural: "Proje yaşam döngüsü" label_on: "açık" label_operator_all: "boş değil" label_operator_none: "boş" - label_operator_equals_or: "(VEYA) dır" + label_operator_equals_or: "(YA DA)" label_operator_equals_all: "(VE) dir" label_operator_shared_with_user_any: "herhangi bir" label_open_menu: "Menüyü Aç" @@ -2566,7 +2599,7 @@ tr: label_privacy_policy: "Veri gizliliği ve güvenlik politikası" label_product_version: "Ürün sürümü" label_profile: "Profil" - label_percent_complete: "% Tamamlandı" + label_percent_complete: "Tamamlanma yüzdesi" label_progress_tracking: "İlerleme takibi" label_project: "Proje" label_project_activity: "Proje etkinliği" @@ -2577,17 +2610,18 @@ tr: label_project_latest: "Son projeler" label_project_default_type: "Boş türe izin ver" label_project_hierarchy: "Proje hiyerarşisi" - label_project_mappings: "Projects" + label_project_mappings: "Projeler" label_project_new: "Yeni proje" label_project_plural: "Projeler" label_project_list_plural: "Proje listesi" + label_project_lifecycle: "Proje yaşam döngüsü" label_project_attributes_plural: "Proje öznitelikleri" label_project_custom_field_plural: "Proje öznitelikleri" label_project_settings: "Proje Ayarları" label_project_attributes_settings: "Project attributes settings" - label_project_storage_plural: "File Storages" - label_project_storage_project_folder: "File Storages: Project folders" - label_projects_disk_usage_information: "%{count} projects using %{used_disk_space} disk space" + label_project_storage_plural: "Dosya Depoları" + label_project_storage_project_folder: "Dosya Depoları: Proje klasörleri" + label_projects_disk_usage_information: "%{count} proje %{used_disk_space} disk alanı kullanıyor" label_project_view_all: "Tüm projeleri görüntüle" label_project_show_details: "Proje detaylarını göster" label_project_hide_details: "Proje detaylarını gizle" @@ -2604,13 +2638,14 @@ tr: label_related_work_packages: "İlişkili iş paketleri" label_relates: "ile ilişkili" label_relates_to: "ile ilişkili" - label_relation: "Relation" - label_relation_actions: "Relation actions" + label_relation: "İlişki" + label_relation_actions: "İlişki eylemleri" label_relation_delete: "İlişkiyi sil" + label_relation_edit: "İlişkiyi düzenle" label_relation_new: "Yeni ilişki" label_release_notes: "Sürüm notları" label_remaining_work: "Kalan çalışma" - label_remove_column: "Remove column" + label_remove_column: "Sütunu kaldır" label_remove_columns: "Seçili sütunları sil" label_renamed: "yeniden adlandırıldı" label_reply_plural: "Yanıtlar" @@ -2621,7 +2656,7 @@ tr: label_reporting: "Raporlama" label_reporting_plural: "Raporlamalar" label_repository: "Depo" - label_repository_remove: "Remove repository" + label_repository_remove: "Depoyu kaldır" label_repository_root: "Depo kökü" label_repository_plural: "Depolar" label_required: "gerekli" @@ -2644,7 +2679,7 @@ tr: label_scroll_right: "Sağa kaydır" label_search: "Ara" label_search_by_name: "İsme göre ara" - label_send_information: "Send new credentials to the user" + label_send_information: "Kullanıcıya yeni kimlik bilgilerini gönderme" label_send_test_email: "Deneme e-postası gönder" label_session: "Oturum" label_setting_plural: "Ayarlar" @@ -2652,10 +2687,10 @@ tr: label_show_completed_versions: "Tamamlanmış sürümleri göster" label_columns: "Sütunlar" label_sort: "Sırala" - label_sort_ascending: "Sort ascending" + label_sort_ascending: "Artan sırala" label_sort_by: "%{value} ile sırala" label_sorted_by: "%{value} göre sıralandı" - label_sort_descending: "Sort descending" + label_sort_descending: "Azalan sırala" label_sort_higher: "Yukarı taşı" label_sort_highest: "En üste taşı" label_sort_lower: "Aşağı taşı" @@ -2720,7 +2755,7 @@ tr: label_user_settings: "Kullanıcı ayarları" label_users_settings: "Kullanıcı ayarları" label_version_new: "Yeni sürüm" - label_version_edit: "Edit version" + label_version_edit: "Sürümü düzenle" label_version_plural: "Sürümler" label_version_sharing_descendants: "Alt projeler ile" label_version_sharing_hierarchy: "Proje hiyerarşisi ile" @@ -2731,7 +2766,7 @@ tr: label_view_all_revisions: "Tüm revizyonları görüntüle" label_view_diff: "Farklılıkları gör" label_view_revisions: "Düzeltmeleri izle" - label_watched_work_packages: "İzlenen iş paketleri" + label_watched_work_packages: "Takip edilen iş paketleri" label_what_is_this: "Bu nedir?" label_week: "Hafta" label_wiki_content_added: "Viki sayfası eklendi" @@ -2751,7 +2786,7 @@ tr: label_wiki_show_new_page_link: "Alt menü öğesini göster 'Yeni alt sayfa oluştur'" label_wiki_show_submenu_item: "Alt menü öğesi olarak göster " label_wiki_start: "Başlangıç sayfası" - label_work: "Work" + label_work: "Çalışma" label_work_package: "İş paketi" label_work_package_attachments: "İş paketi ekleri" label_work_package_category_new: "Yeni kategori" @@ -2773,7 +2808,7 @@ tr: label_working_days_and_hours: "Çalışma günleri ve saatleri" label_x_closed_work_packages_abbr: one: "1 kapalı" - other: "%{count} kapatıldı" + other: "%{count} kapalı" zero: "0 kapalı" label_x_comments: one: "1 yorum" @@ -2794,7 +2829,7 @@ tr: label_x_files: one: "1 dosya" other: "%{count} dosya" - zero: "no files" + zero: "dosya yok" label_yesterday: "dün" label_zen_mode: "Zen modu" label_role_type: "Tür" @@ -2834,7 +2869,7 @@ tr: mention: subject: "%{user_name}, #%{id} - %{subject} içinde sizden bahsetti" notification: - center: "bildirim merkezi" + center: "Bildirim Merkezi" see_in_center: "Bildirim merkezinde yorumu görün" settings: "E-posta ayarlarını değiştir" salutation: "Merhaba %{user}" @@ -2849,22 +2884,22 @@ tr: other: "Bildirimleri olan %{count} iş paketi daha var." open_in_browser: "Tarayıcıda aç" reason: - watched: "İzlendi" + watched: "Takip ediliyor" assigned: "Atanmış" responsible: "Sorumlu" mentioned: "Bahsedilen" - shared: "Shared" + shared: "Paylaşıldı" subscribed: "tüm" prefix: "Bildirim ayarı nedeniyle alındı: %{reason}" date_alert_start_date: "Tarih uyarısı" date_alert_due_date: "Tarih uyarısı" - reminder: "Reminder" + reminder: "Hatırlatma" see_all: "Tümünü gör" updated_at: "%{timestamp} tarihinde %{user} tarafından güncellendi" reminder_notifications: subject: "Reminder: %{note}" - heading: "You have a new reminder" - note: "Note: “%{note}”" + heading: "Yeni bir hatırlatıcınız var" + note: "Not: \"%{note}\"" sharing: work_packages: allowed_actions: "You may %{allowed_actions} this work package. This can change depending on your project role and permissions." @@ -2887,12 +2922,12 @@ tr: unhealthy: summary: 'The status of your storage, %{storage_name}, is currently displaying as "Error". We''ve detected an issue that might require your attention.' error-details: "Hata Detayları" - error-message: "Error Message" - error-occurred-on: "Occurred On" + error-message: "Hata Mesajı" + error-occurred-on: "Oluştuğu Tarih" recommendation: "We recommend heading over to the storage configuration page to address this issue" unsubscribe: "If you would no longer like to receive these notifications, you can unsubscribe at any time. To unsubscribe, please follow the instructions on this page" email_notification_settings: "Storage email notification settings" - see_storage_settings: "See storage settings" + see_storage_settings: "Depolama ayarlarına bakın" healthy: subject: 'Storage "%{name}" is now healthy!' solved_at: "solved at" @@ -2919,8 +2954,8 @@ tr: mail_body_lost_password: "Parolanızı değiştirmek için aşağıdaki bağlantıyı tıklayın:" mail_password_change_not_possible: title: "Şifre değişikliği mümkün değil" - body: "Your account at %{app_title} is connected to an external authentication provider (%{name})." - subtext: "Passwords for external account cannot be changed in the application. Please use the lost password functionality of your authentication provider." + body: "%{app_title} adresindeki hesabınız harici bir kimlik doğrulama sağlayıcısına (%{name}) bağlıdır." + subtext: "Harici hesap için şifreler uygulamada değiştirilemez. Lütfen kimlik doğrulama sağlayıcınızın kayıp şifre işlevini kullanın." mail_body_register: "%{app_title}'a hoş geldiniz. Lütfen bu bağlantıya tıklayarak hesabınızı etkinleştirin:" mail_body_register_header_title: "Proje üyesi davet e-postası" mail_body_register_user: "Sevgili %{name}," @@ -3011,7 +3046,7 @@ tr: notice_locking_conflict: "Bu arada, bilgi en az bir başka kullanıcı tarafından güncellendi." notice_locking_conflict_additional_information: "Güncelleme(ler) %{users} tarafından yapıldı." notice_locking_conflict_reload_page: "Lütfen sayfayı yeniden yükleyin, değişiklikleri inceleyin ve güncellemelerinizi yeniden uygulayın." - notice_locking_conflict_warning: "This page has been updated by someone else. To not lose your edits, copy them locally and reload to view the updated version." + notice_locking_conflict_warning: "Bu sayfa başka biri tarafından güncellenmiştir. Düzenlemelerinizi kaybetmemek için yerel olarak kopyalayın ve güncellenmiş sürümü görüntülemek için yeniden yükleyin." notice_locking_conflict_danger: "Çakışan değişiklikler nedeniyle değişiklikleriniz kaydedilemedi. Düzenlemelerinizi kaybetmemek için yerel olarak kopyalayın ve güncellenmiş sürümü görüntülemek için yeniden yükleyin." notice_locking_conflict_action_button: "Değişiklikleri iptal et ve yeniden yükle" notice_member_added: '%{name} projeye dahil edildi.' @@ -3022,11 +3057,12 @@ tr: notice_bad_request: "Hatalı istek." notice_not_authorized: "Bu sayfaya erişme yetkiniz yok." notice_not_authorized_archived_project: "Erişmeye çalıştığınız proje arşive kaldırılmış." + notice_requires_enterprise_token: "Kurumsal belirteç eksik veya bu sayfaya erişime izin vermiyor." notice_password_confirmation_failed: "Şifreniz doğru değil. Devam edilemez." notice_principals_found_multiple: "%{number} sonuç bulundu.\nİlk sonuç için TABa basın." notice_principals_found_single: "Bir sonuç bulundu. \n Ona gitmek için TABa basın." notice_project_not_deleted: "Proje silinemedi." - notice_project_not_found: "Project not found." + notice_project_not_found: "Proje bulunamadı." notice_successful_connection: "Bağlantı başarılı." notice_successful_create: "Oluşturma başarılı." notice_successful_delete: "Silme başarılı." @@ -3059,7 +3095,7 @@ tr: units: byte: one: "Bayt" - other: "Byte" + other: "Bayt" gb: "GB" kb: "KB" mb: "MB" @@ -3069,7 +3105,7 @@ tr: text_getting_started_description: "OpenProject ile proje yönetimi ve ekip işbirliği hakkında hızlı bir genel bakış elde edin. Bu videoyu yardım menüsünden yeniden başlatabilirsiniz." welcome: "%{app_title}'a hoş geldiniz" select_language: "Lütfen dilinizi seçin" - permission_add_work_package_notes: "Not eklemek" + permission_add_work_package_notes: "Yorum ekle" permission_add_work_packages: "İş paketi eklemek" permission_add_messages: "İleti göndermek" permission_add_project: "Proje oluşturma" @@ -3080,11 +3116,11 @@ tr: permission_manage_user: "Kullanıcı düzenleme" permission_manage_placeholder_user: "Yer tutucu kullanıcıları oluşturun, düzenleyin ve silin" permission_add_subprojects: "Alt proje oluşturmak" - permission_add_work_package_watchers: "Takipçi ekle" + permission_add_work_package_watchers: "Takip eden ekle" permission_assign_versions: "Sürüm ata" permission_browse_repository: "Depoya salt okunur erişim (göz atma ve ödeme)" permission_change_wiki_parent_page: "Üst Wiki sayfasını değiştirmek" - permission_change_work_package_status: "Change work package status" + permission_change_work_package_status: "İş paketi durumunu değiştirme" permission_change_work_package_status_explanation: "Allows changing status without Edit work packages permission" permission_comment_news: "Haberlere yorum yazmak" permission_commit_access: "Depoya okuma / yazma erişimi (tamamlama)" @@ -3099,14 +3135,15 @@ tr: permission_delete_timelines: "Zaman akışını silmek" permission_delete_wiki_pages: "Wiki sayfalarını silmek" permission_delete_wiki_pages_attachments: "Ekleri silmek" - permission_edit_work_package_notes: "Notları düzenle" + permission_edit_work_package_notes: "Yorumları denetle" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "İş paketlerini düzenlemek" permission_edit_messages: "İletileri düzenlemek" - permission_edit_own_work_package_notes: "Kendi notlarını düzenlemek" + permission_edit_own_work_package_notes: "Kendi notlarını düzenleme" permission_edit_own_messages: "Kendi iletilerini düzenlemek" permission_edit_own_time_entries: "Kendi zaman kayıtlarını düzenlemek" permission_edit_project: "Proje düzenleme" - permission_edit_project_attributes: "Edit project attributes" + permission_edit_project_attributes: "Proje özniteliklerini düzenleme" permission_edit_project_stages_and_gates: "Edit project stages and gates" permission_edit_reportings: "Raporlamayı düzenlemek" permission_edit_time_entries: "Diğer kullanıcılar için zaman günlüklerini düzenleyin" @@ -3119,7 +3156,7 @@ tr: permission_log_time: "Diğer kullanıcıların zamanını günlüğe kaydet" permission_manage_forums: "Forumları yönetmek" permission_manage_categories: "İş paket kategorilerini yönet" - permission_manage_dashboards: "Manage dashboards" + permission_manage_dashboards: "Gösterge panellerini yönetme" permission_manage_work_package_relations: "İş paketi ilişkilerini yönet" permission_manage_members: "Üyeleri yönetmek" permission_manage_news: "Haberleri yönet" @@ -3140,17 +3177,17 @@ tr: permission_select_project_life_cycle: "Select project stages and gates" permission_select_project_life_cycle_explanation: "Activate/Deactivate the stages and gates in a project. Enables the user to select the lifecycle appropriate for the project as inactive stages and gates will not be visible in the project overview page nor the project list." permission_select_project_modules: "Proje modülleri seçmek" - permission_share_work_packages: "Share work packages" + permission_share_work_packages: "İş paketini paylaşma" permission_manage_types: "İş paketi türlerini seçmek" - permission_manage_own_reminders: "Create own reminders" - permission_view_project: "View projects" + permission_manage_own_reminders: "Kendi hatırlatıcısını oluşturma" + permission_view_project: "Projeleri görüntüleme" permission_view_changesets: "OpenProject'de depo revizyonlarını görüntüle" permission_view_commit_author_statistics: "Yazar istatistiklerini inceleyin" - permission_view_dashboards: "View dashboards" - permission_view_work_package_watchers: "Takipçi listesini göster" + permission_view_dashboards: "Gösterge panellerini gösterme" + permission_view_work_package_watchers: "Takip eden listesini göster" permission_view_work_packages: "İş paketlerini görüntüle" permission_view_messages: "İletileri görüntüle" - permission_view_news: "View news" + permission_view_news: "Haberleri görüntüleme" permission_view_members: "Üyeleri görmek" permission_view_reportings: "Raporları görüntüle" permission_view_shared_work_packages: "View work package shares" @@ -3163,19 +3200,19 @@ tr: permission_work_package_assigned_explanation: "İşpaketleri bağlı projedeki rollere göre kullanıcı ve gruplara atanabilir" permission_view_project_activity: "View project activity" permission_view_project_attributes: "View project attributes" - permission_view_project_stages_and_gates: "View project stages and gates" - permission_save_bcf_queries: "Save BCF queries" - permission_manage_public_bcf_queries: "Manage public BCF queries" - permission_edit_attribute_help_texts: "Edit attribute help texts" - permission_manage_public_project_queries: "Manage public project lists" - permission_view_project_query: "View project query" - permission_edit_project_query: "Edit project query" + permission_view_project_stages_and_gates: "Proje aşamalarını ve kapılarını görüntüleyin" + permission_save_bcf_queries: "BCF sorgularını kaydetme" + permission_manage_public_bcf_queries: "Genel BCF sorgularını yönetme" + permission_edit_attribute_help_texts: "Öznitelik yardım metinlerini düzenleme" + permission_manage_public_project_queries: "Genel proje listelerini yönetme" + permission_view_project_query: "Proje sorgusunu görüntüleme" + permission_edit_project_query: "Proje sorgusunu düzenleme" placeholders: default: "-" project: destroy: confirmation: "If you continue, the project %{identifier} will be permanently destroyed. To confirm this action please introduce the project name in the field below, this will:" - project_delete_result_1: "Delete all related data." + project_delete_result_1: "İlgili tüm verileri silin." project_delete_result_2: "Delete all managed project folders in the attached storages." info: "Projeyi silme işlemi geri dönüşü olmayan bir işlemdir." project_verification: "Silme işlemini doğrulamak için projenin adını% {name} girin. %{name}" @@ -3196,8 +3233,8 @@ tr: archived: "Arşivlenen" count: zero: "Proje yok" - one: "1 Proje" - other: "%{count} Proje" + one: "1 proje" + other: "%{count} proje" project_module_activity: "Etkinlik" project_module_forums: "Forumlar" project_module_work_package_tracking: "İş paketleri" @@ -3331,6 +3368,7 @@ tr: activated: "etkinleştirmek" deactivated: "devre dışı bırakmak" search_input_placeholder: "Ara ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "CORS'u etkinleştir" setting_apiv3_cors_origins: "API V3 Kaynaklar Arası Kaynak Paylaşımı (CORS) izin verilen kaynaklar" setting_apiv3_cors_origins_text_html: > @@ -3361,9 +3399,9 @@ tr: setting_app_subtitle: "Uygulama alt başlığı" setting_app_title: "Uygulama başlığı" setting_attachment_max_size: "En büyük ek boyutu" - setting_show_work_package_attachments: "Show attachments in the files tab by default" - setting_antivirus_scan_mode: "Scan mode" - setting_antivirus_scan_action: "Infected file action" + setting_show_work_package_attachments: "Ekleri varsayılan olarak dosyalar sekmesinde göster" + setting_antivirus_scan_mode: "Tarama modu" + setting_antivirus_scan_action: "Etkilenen dosya eylemi" setting_autofetch_changesets: "Autofetch depo değişiklikleri" setting_autologin: "Otomatik Giriş" setting_available_languages: "Mevcut diller" @@ -3372,7 +3410,7 @@ tr: setting_brute_force_block_minutes: "Kullanıcının engellediği süre" setting_cache_formatted_text: "Biçimlendirilmiş metni önbelleğe al" setting_use_wysiwyg_description: "Tüm kullanıcılar için varsayılan olarak CKEditor5 WYSIWYG düzenleyiciyi etkinleştirmek için seçin. GFM Markdown için CKEditor sınırlı işleve sahiptir." - setting_column_options: "Default work package lists columns" + setting_column_options: "Varsayılan iş paketi listeleme sütunları" setting_commit_fix_keywords: "Anahtar kelimeleri düzeltme" setting_commit_logs_encoding: "İleti kodlamayı tamamla" setting_commit_logtime_activity_id: "Kaydedilen zaman için faaliyet" @@ -3388,13 +3426,13 @@ tr: setting_default_language: "Varsayılan dil" setting_default_projects_modules: "Yeni projeler için varsayılan etkin modüller" setting_default_projects_public: "Yeni projeler varsayılan olarak herkese açık" - setting_disable_password_login: "Disable password authentication" + setting_disable_password_login: "Parola kimlik doğrulamasını devre dışı bırak" setting_diff_max_lines_displayed: "Görüntülenen fark satırlarının maksimum sayısı" setting_omniauth_direct_login_provider: "Direct login SSO provider" setting_display_subprojects_work_packages: "Varsayılan olarak ana projenin iş listesinde alt proje iş paketlerini göster" - setting_duration_format: "Duration format" - setting_duration_format_hours_only: "Hours only" - setting_duration_format_days_and_hours: "Days and hours" + setting_duration_format: "Süre biçimi" + setting_duration_format_hours_only: "Sadece saat" + setting_duration_format_days_and_hours: "Gün ve saat" setting_duration_format_instructions: "This defines how Work, Remaining work, and Time spent durations are displayed." setting_emails_footer: "E-posta altbilgi" setting_emails_header: "E-posta üstbilgisi" @@ -3402,11 +3440,11 @@ tr: setting_enabled_scm: "Etkinleştirilmiş SCM" setting_enabled_projects_columns: "Columns in a projects list displayed by default" setting_feeds_enabled: "Yayınları Etkinleştir" - setting_ical_enabled: "Enable iCalendar subscriptions" + setting_ical_enabled: "iCalendar aboneliklerini etkinleştir" setting_feeds_limit: "Besleme içeriği sınırı" setting_file_max_size_displayed: "Satır içi görüntülenen maksimum metin dosyası boyutu" setting_host_name: "Ana bilgisayar adı" - setting_hours_per_day: "Hours per day" + setting_hours_per_day: "Gün başına saat" setting_hours_per_day_explanation: >- This defines what is considered a "day" when displaying duration in days and hours (for example, if a day is 8 hours, 32 hours would be 4 days). setting_invitation_expiration_days: "Etkinleştirme e-postasının süresi doluyor" @@ -3468,14 +3506,14 @@ tr: setting_sys_api_description: "Depo yönetimi web servisi depolara erişmek için entegrasyon ve kullanıcı yetkilendirmesi sağlar." setting_time_format: "Saat" setting_total_percent_complete_mode: "Calculation of % Complete hierarchy totals" - setting_total_percent_complete_mode_work_weighted_average: "Weighted by work" + setting_total_percent_complete_mode_work_weighted_average: "İşe göre ağırlıklandırılmış" setting_total_percent_complete_mode_work_weighted_average_caption_html: >- The total % Complete will be weighted against the Work of each work package in the hierarchy. Work packages without Work will be ignored. - setting_total_percent_complete_mode_simple_average: "Simple average" + setting_total_percent_complete_mode_simple_average: "Basit ortalama" setting_total_percent_complete_mode_simple_average_caption_html: >- Work is ignored and the total % Complete will be a simple average of % Complete values of work packages in the hierarchy. setting_accessibility_mode_for_anonymous: "İsimsiz kullanıcılar için erişilebilirlik modunu etkinleştir" - setting_user_format: "Users name format" + setting_user_format: "Kullanıcı adı biçimi" setting_user_default_timezone: "Kullanıcıların varsayılan saat dilimi" setting_users_deletable_by_admins: "Yöneticiler kullanıcı hesaplarını silebilsin" setting_users_deletable_by_self: "Kullanıcılar kendi hesaplarını silebilsin" @@ -3515,7 +3553,7 @@ tr: clamav_socket_html: Enter the socket to the clamd daemon, e.g., %{example} clamav_host_html: Enter the hostname and port to the clamd daemon separated by colon. e.g., %{example} description_html: > - Select the mode in which the antivirus scanner integration should operate.
    • %{disabled_option}: Uploaded files are not scanned for viruses.
    • %{socket_option}: You have set up ClamAV on the same server as OpenProject and the scan daemon clamd is running in the background
    • %{host_option}: You are streaming files to an external virus scanning host.
    + Antivirüs tarayıcı entegrasyonunun çalışması gereken modu seçin.
    • %{disabled_option}: Yüklenen dosyalar virüslere karşı taranmaz.
    • %{socket_option}: ClamAV'ı OpenProject ile aynı sunucuya kurdunuz ve tarama servisi clamd arka planda çalışıyor
    • %{host_option}: Dosyaları harici bir virüs tarama servisine aktarıyorsunuz.
    brute_force_prevention: "Otomatik kullanıcı engelleme" date_format: first_date_of_week_and_year_set: > @@ -3523,9 +3561,9 @@ tr: first_week_of_year_text_html: > Select the date of January that is contained in the first week of the year. This value together with first day of the week determines the total number of weeks in a year. For more information, please see our documentation on this topic. experimental: - save_confirmation: Caution! Risk of data loss! Only activate experimental features if you do not mind breaking your OpenProject installation and losing all of its data. - warning_toast: Feature flags are settings that activate features that are still under development. They shall only be used for testing purposes. They shall never be activated on OpenProject installations holding important data. These features will very likely corrupt your data. Use them at your own risk. - feature_flags: Feature flags + save_confirmation: Dikkat! Veri kaybı riski! Deneysel özellikleri sadece OpenProject kurulumunuzu bozmak ve tüm verilerini kaybetmeyi önemsemiyorsanız etkinleştirin. + warning_toast: Özellik bayrakları, halen geliştirilme aşamasında olan özellikleri etkinleştiren ayarlardır. Sadece test amaçlı kullanılmalıdırlar. Önemli veriler içeren OpenProject kurulumlarında asla etkinleştirilmemelidirler. Bu özellikler büyük olasılıkla verilerinizi bozacaktır. Bunları kendi sorumluluğunuzda kullanın. + feature_flags: Özellik bayrakları general: "Genel" highlighting: mode_long: @@ -3535,8 +3573,8 @@ tr: type: "Türe göre tüm satır" priority: "Önceliğe göre tüm satır" icalendar: - enable_subscriptions_text_html: Allows users with the necessary permissions to subscribe to OpenProject calendars and access work package information via an external calendar client. Note: Please read about iCalendar subscriptions to understand potential security risks before enabling this. - language_name_being_default: "%{language_name} (default)" + enable_subscriptions_text_html: Gerekli izinlere sahip kullanıcıların OpenProject takvimlerine abone olmalarını ve harici bir takvim istemcisi aracılığıyla iş paketi bilgilerine erişmelerini sağlar. Not: Bunu etkinleştirmeden önce olası güvenlik risklerini anlamak için lütfen iCalendar abonelikleri hakkında bilgi edinin. + language_name_being_default: "%{language_name} (varsayılan)" notifications: events_explanation: "Bir e-postanın hangi olay için gönderileceğini yönetir. İş paketleri, bildirimleri her kullanıcı için özel olarak yapılandırılabileceğinden bu listenin dışında tutulur." delay_minutes_explanation: "E-posta gönderimi, uygulama bildirimi yapılandırılmış olan kullanıcıların bir posta gönderilmeden önce uygulama içindeki bildirimi onaylamasına izin vermek için geciktirilebilir. Uygulama içinde bir bildirim okuyan kullanıcılar, okunan bildirim için bir e-posta almaz." @@ -3547,33 +3585,54 @@ tr: label_new_attribute: "Proje özniteliği" label_new_section: "Bölüm" label_edit_section: "Başlığı düzenle" - label_section_actions: "Section actions" + label_section_actions: "Bölüm eylemleri" heading_description: "These project attributes appear in the overview page of each project. You can add new attributes, group them into sections and re-order them as you please. These attributes can be enabled or disabled but not re-ordered at a project level." - label_project_custom_field_actions: "Project attribute actions" - label_no_project_custom_fields: "No project attributes defined in this section" + label_project_custom_field_actions: "Proje öznitelik eylemleri" + label_no_project_custom_fields: "Bu bölümde tanımlanmış proje özniteliği yok" edit: description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." new: - heading: "New attribute" + heading: "Yeni öznitelik" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Proje yaşam döngüsü" + heading_description: "Proje yaşam döngüsü, projelerinizi yapılandıran aşamalardan ve kapılardan oluşur. Bunlar bir projenin genel bakış sayfasında görünecek ve projeler listesinde bulunacaktır. Bir projeyi özelleştirmek için tek tek aşamalar ve kapılar seçilebilir, ancak proje düzeyinde yeniden sıralama mümkün değildir." + label_add: "Ekle" + label_add_description: "Yaşam döngüsü tanımı ekleyin" + label_add_stage: "Aşama" + label_add_gate: "Kapı" + filter: + label: "Proje aşaması veya kapısı ara" + section_header: "Aşamalar ve kapılar" + non_defined: "Şu anda ne aşamalar ne de kapılar tanımlanmıştır." + new: + description: "Bu proje adımında yapılan değişiklikler, etkin olduğu tüm projelere yansıtılacaktır." + new_stage: + heading: "Yeni aşama" + new_gate: + heading: "Yeni kapı" + edit_stage: + heading: "Aşamayı düzenle" + edit_gate: + heading: "Kapıyı düzenle" projects: - missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." + missing_dependencies: "%{dependencies} bağımlılıkları olan %{module} proje modülü kontrol edildi. Bu bağımlılıkları da kontrol etmeniz gerekir." section_new_projects: "Yeni projeler için ayarlar" - section_project_overview: "Settings for project lists" + section_project_overview: "Proje listeleri için ayarlar" session: "Oturum" user: default_preferences: "Varsayılan Tercihler" - display_format: "Display format" + display_format: "Gösterim biçimi" deletion: "Silme" working_days: section_work_week: "Çalışma Haftası" - section_holidays_and_closures: "Holidays and closures" + section_holidays_and_closures: "Tatiller ve kapanışlar" text_formatting: markdown: "Markdown" plain: "Düz yazı" status_active: "etkin" status_archived: "arşivlendi" - status_blocked: "blocked" + status_blocked: "engelli" status_invited: davet status_locked: kilitli status_registered: kayıtlı @@ -3589,6 +3648,7 @@ tr: text_are_you_sure_continue: "Devam etmek istediğinize emin misiniz?" text_are_you_sure_with_children: "Sil iş paketi ve tüm alt çalışma paketlerini?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Projeye ata" text_form_configuration: > İş paketi formunda görüntülenecek alanları özelleştirebilirsiniz. Tüm işlerinizde kullanabileceğiniz şekilde bunları gruplayabilirsiniz. @@ -3603,7 +3663,7 @@ tr: text_custom_field_hint_activate_per_project_and_type: > Özel alanların iş paketi türü ve proje bazında aktive edilmesi gerekiyor. text_wp_status_read_only_html: > - Enterprise sürümü, iş paketlerinin durum alanları için şu ek eklentileri ekleyecektir:
    • İş paketlerini belirli durumlar için salt okunur olarak işaretlemeye izin verin
      • < /ul> + Enterprise sürümü, iş paketlerinin durum alanları için şunlaru ekleyecektir:
      • İş paketlerini belirli durumlar için salt okunur olarak işaretlemeye izin verin
      text_project_custom_field_html: > Enterprise sürümü, projelerin özel alanları için şu ek eklentileri ekleyecektir:
      • Bir proje portföy görünümü oluşturmak için Projeler için özel alanları Proje listenize ekleyin
      text_custom_logo_instructions: > @@ -3641,7 +3701,7 @@ tr: text_work_packages_destroy_confirmation: "Seçilen çalışma paket(ler) ini silmek istediğinizden emin misiniz?" text_work_packages_ref_in_commit_messages: "İş paketlerini taahhüt mesajlarında referans ve sabitleme" text_journal_added: "%{value} %{label} eklendi" - text_journal_attachment_added: "%{label} %{value} added as attachment" + text_journal_attachment_added: "%{label} %{value} ek olarak eklendi" text_journal_attachment_deleted: "%{label} %{old} removed as attachment" text_journal_changed_plain: "%{label}, %{old} %{linebreak} iken %{new} olarak değiştirildi" text_journal_changed_no_detail: "%{label} güncellendi" @@ -3668,6 +3728,7 @@ tr: text_notice_security_badge_displayed_html: > Not: Etkinleştirildiğinde, bu, %{information_panel_label} yönetim panelinde ve giriş sayfasında yükleme durumunuzla birlikte bir rozet görüntüler. Sadece yöneticilere gösterilir.
      Rozet, mevcut OpenProject sürümünüzü resmi OpenProject sürüm veritabanına karşı kontrol eder ve sizi herhangi bir güncelleme veya bilinen güvenlik açığı hakkında uyarır. Çekin sağladığı, mevcut güncellemeleri sağlamak için hangi verilerin gerekli olduğu ve bu kontrolün nasıl devre dışı bırakılacağı hakkında daha fazla bilgi için lütfen yapılandırma belgelerini ziyaret edin. text_own_membership_delete_confirmation: "İzinlerinizden bazılarını veya tümünü kaldırmak üzeresiniz ve bundan sonra bu projeyi düzenleyemeyebilirsiniz. Devam etmek istediğine emin misin?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets dizini yazılabilir" text_powered_by: "%{link} tarafından destekleniyor" text_project_identifier_info: "Yalnızca küçük harfler (a-z), sayılar, tire ve alt tire kullanılabilir ve mutlaka küçük harfle başlamalıdır." @@ -3823,14 +3884,14 @@ tr: derivation_hints: done_ratio: cleared_because_remaining_work_is_empty: "Cleared because Remaining work is empty." - cleared_because_work_is_0h: "Cleared because Work is 0h." + cleared_because_work_is_0h: "İş süresiz olduğu için temizlendi." derived: "Derived from Work and Remaining work." estimated_hours: cleared_because_remaining_work_is_empty: "Cleared because Remaining work is empty." derived: "Derived from Remaining work and % Complete." same_as_remaining_work: "Set to same value as Remaining work." remaining_hours: - cleared_because_work_is_empty: "Cleared because Work is empty." + cleared_because_work_is_empty: "İş boş olduğu için temizlendi." cleared_because_percent_complete_is_empty: "Cleared because % Complete is empty." decreased_by_delta_like_work: "Decreased by %{delta}, matching the reduction in Work." derived: "Derived from Work and % Complete." @@ -3852,7 +3913,7 @@ tr: sharing: count: zero: "Kullanıcı yok" - one: "1 user" + one: "1 kullanıcı" other: "%{count} kullanıcı" filter: project_member: "Proje üyesi" @@ -3874,19 +3935,19 @@ tr: text_empty_state_description: "The %{entity} has not been shared with anyone yet." text_empty_state_header: "Paylaşılmamış" text_user_limit_reached: "Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}." - text_user_limit_reached_admins: 'Adding additional users will exceed the current limit. Please upgrade your plan to be able to add more users.' + text_user_limit_reached_admins: 'Ek kullanıcı eklemek mevcut sınırı aşacaktır. Daha fazla kullanıcı ekleyebilmek için lütfen planınızı yükseltin.' warning_user_limit_reached: > - Adding additional users will exceed the current limit. Please contact an administrator to increase the user limit to ensure external users are able to access this %{entity}. + Ek kullanıcı eklenmesi mevcut sınırı aşacaktır. Harici kullanıcıların %{entity} adresine erişebilmesini sağlamak amacıyla kullanıcı limitini artırmak için lütfen bir yöneticiyle iletişime geçin. warning_user_limit_reached_admin: > Adding additional users will exceed the current limit. Please upgrade your plan to be able to ensure external users are able to access this %{entity}. warning_no_selected_user: "Please select users to share this %{entity} with" warning_locked_user: "%{user} kullanıcısı kilitli ve paylaşılamaz" user_details: - locked: "Locked user" - invited: "Invite sent. " - resend_invite: "Resend." - invite_resent: "Invite has been resent" - not_project_member: "Not a project member" + locked: "Kilitli kullanıcı" + invited: "Davetiye gönderildi. " + resend_invite: "Tekrar gönder." + invite_resent: "Davet yeniden gönderildi" + not_project_member: "Proje üyesi değil" project_group: "Group members might have additional privileges (as project members)" not_project_group: "Group (shared with all members)" additional_privileges_project: "Might have additional privileges (as project member)" @@ -3904,10 +3965,10 @@ tr: caption: "Herkes bu proje listesini görüntüleyebilir. Genel düzenleme izinlerine sahip olanlar bunu değiştirebilir." blank_state: public: - header: "Shared with everyone" + header: "Herkesle paylaşıldı" description: "Everyone can view this project list. You can also add individual users with extra permissions." private: - header: "Not shared: Private" + header: "Paylaşılmadı: Özel" description: "This project list has not been shared with anyone yet. Only you can access this list." permissions: view: "Göster" @@ -3915,7 +3976,7 @@ tr: edit: "Düzenle" edit_description: "Proje listesini görüntüleyebilir, paylaşabilir ve düzenleyebilir." upsale: - message: "Sharing project lists with individual users is an enterprise add-on." + message: "Proje listelerini bireysel kullanıcılarla paylaşmak kurumsal bir eklentidir." working_days: info: > Days that are not selected are skipped when scheduling work packages (and not included in the day count). These can be overridden at a work-package level. @@ -3947,7 +4008,7 @@ tr: code_429: "Çok fazla istek. Lütfen daha sonra tekrar deneyiniz." code_500: "İç hata oluştu." code_500_outbound_request_failure: "An outbound request to another resource has failed with status code %{status_code}." - code_500_missing_enterprise_token: "The request can not be handled due to invalid or missing Enterprise token." + code_500_missing_enterprise_token: "Geçersiz veya eksik Enterprise belirteci nedeniyle istek işlenemiyor." not_found: work_package: "Aradığınız çalışma paketi bulunamadı veya silinmiş." expected: @@ -4033,12 +4094,14 @@ tr: oauth: application: builtin: Built-in instance application - confidential: Confidential + confidential: Gizli singular: "OAuth uygulaması" + scopes: "Scopes" + client_credentials: "Müşteri kimlik bilgileri" plural: "OAuth uygulamaları" named: "Oauth uygulaması %{name}" new: "Yeni OAuth uygulaması" - non_confidential: Non confidential + non_confidential: Gizli olmayan default_scopes: "(Varsayılan kapsamlar)" instructions: enabled: "Enable this application, allowing users to perform authorization grants with it." @@ -4051,8 +4114,8 @@ tr: register_intro: "OpenProject için bir OAuth API istemci uygulaması geliştiriyorsanız, tüm kullanıcıların kullanması için bu formu kullanarak kayıt olabilirsiniz." default_scopes: "" header: - builtin_applications: Built-in OAuth applications - other_applications: Other OAuth applications + builtin_applications: Yerleşik OAuth uygulamaları + other_applications: Diğer OAuth uygulamaları empty_application_lists: No OAuth applications have been registered. client_id: "Müşteri Kimliği" client_secret_notice: > @@ -4134,7 +4197,7 @@ tr: response: unexpected: "Beklenilmeyen bir yanıt alındı." you: sen - link: link + link: bağlantı plugin_openproject_auth_plugins: name: "OpenProject Auth Eklentileri" description: "Integration of OmniAuth strategy providers for authentication in OpenProject." diff --git a/config/locales/crowdin/uk.yml b/config/locales/crowdin/uk.yml index 4bf5c2b54edd..f0509a9c6655 100644 --- a/config/locales/crowdin/uk.yml +++ b/config/locales/crowdin/uk.yml @@ -224,6 +224,10 @@ uk: item: title: Цей елемент не має нижчого рівня ієрархії description: Додайте елементи до цього списку, щоб створити піделементи всередині іншого + delete_dialog: + title: "Видалити елемент користувацького поля" + heading: "Видалити елемент користувацького поля?" + description: "Ця дія, яку не можна відмінити, призведе до вилучення елемента й усіх його вкладених елементів. Усі їх значення буде видалено назавжди. Якщо це обов’язкове поле, пакети робіт, де їх буде вилучено, можуть стати недійсними." placeholder: label: "Мітка елемента" short: "Коротка назва" @@ -244,6 +248,7 @@ uk: confirm_destroy_option: "Видалення опції призведе до видалення всіх його подій (наприклад, у робочих пакетах). Дійсно видалити його?" reorder_alphabetical: "Перевпорядкувати значення за алфавітом" reorder_confirmation: "Увага! Поточний порядок доступних значень буде втрачено. Продовжити?" + placeholder_version_select: "Спочатку потрібно вибрати пакет робіт або проєкт" instructions: is_required: "Позначте користувацьке поле як обов’язкове. Так його потрібно буде заповнювати під час створення нових або оновлення наявних ресурсів." is_required_for_project: "Установіть прапорець, щоб увімкнути цей атрибут і зробити його обов’язковим в усіх проєктах. Його не можна деактивувати для окремих проєктів." @@ -282,6 +287,7 @@ uk: label: "Мітка" short: "Коротка назва" parent: "Батьківський елемент" + blueprint: "Шаблон плану" global_search: placeholder: "Пошук у додатку %{app_title}" overwritten_tabs: @@ -478,6 +484,7 @@ uk: my: access_token: create_dialog: + title: Маркер згенеровано header: Маркер %{type} згенеровано warning: Зверніть увагу, що ви більше не побачите цей маркер, тому обов’язково скопіюйте його зараз. errors: @@ -657,6 +664,7 @@ uk: title: "Відсутній робочий процес для надання доступу до пакета робіт" message: "Для ролі «Редактор пакета робіт» не налаштовано жодного робочого процесу. Без робочого процесу користувач, якому надано доступ, не може змінити статус пакета робіт. Робочі процеси можна копіювати. Виберіть вихідний тип (напр., «Завдання») і роль (напр., «Учасник»). Потім виберіть цільові типи. Для початку радимо вибирати всі типи як цільові. Нарешті, виберіть роль «Редактор пакета робіт» і натисніть «Копіювати». Після цього ви зможете налаштовувати робочі процеси для кожної ролі, як ви це зазвичай робите." link_message: "Налаштуйте робочі процеси на панелі адміністрування." + templated_subject_hint: Автоматично згенеровано з використанням типу %{type} summary: reports: category: @@ -679,14 +687,15 @@ uk: no_results_title_text: Зараз немає доступних зв’язків. blankslate_heading: "Немає зв’язків" blankslate_description: "Цей пакет робіт ще не має зв’язків." + label_add_child_button: "Дочірній" label_add_x: "Додати %{x}" label_edit_x: "Редагувати %{x}" label_add_description: "Додати опис" lag: subject: "Затримка" - title: "Затримка (у днях)" caption: "Мінімальна кількість робочих днів між двома пакетами робіт." relations: + label_new_child_created: "Новий пакет робіт створено й додано як дочірній" label_relates_singular: "зв’язано з" label_relates_plural: "зв’язано з" label_relates_to_singular: "зв’язано з" @@ -701,6 +710,9 @@ uk: follows_description: "Зв’язаний пакет робіт обов’язково має завершуватися перед початком цього" label_child_singular: "дочірній елемент" label_child_plural: "дочірні елементи" + new_child: "Новий дочірній" + new_child_text: "Створює звʼязаний пакет робіт як піделемент поточного (батьківського) пакета робіт" + existing_child: "Наявний дочірній" child_description: "Вкладає звʼязаний пакет робіт як піделемент поточного (батьківського) пакета робіт" label_blocks_singular: "блоки" label_blocks_plural: "блоки" @@ -737,6 +749,8 @@ uk: required_description: "Позначає цей робочий пакет як обовʼязковий для звʼязаного з ним" label_parent_singular: "батьківський елемент" label_parent_plural: "батьківський елемент" + ghost_relation_title: "Пов’язаний пакет робіт" + ghost_relation_description: "Ви не маєте дозволів на перегляд цього елемента." label_invitation: Запрошення account: delete: "Видалити обліковий запис" @@ -801,6 +815,7 @@ uk: is_required: "Обов'язкове поле" max_length: "Максимальна довжина" min_length: "Мінімальна довжина" + content_right_to_left: "Письмо зліва направо" multi_value: "Дозволити вибір" possible_values: "Можливі значення" regexp: "Регулярний вираз" @@ -836,6 +851,8 @@ uk: attr_lastname: "Атрибут «Прізвище»" attr_login: "Атрибут «Ім’я користувача»" attr_mail: "Атрибут «Електронна адреса»" + filter_string: "Рядок фільтра" + admin: "Адміністратор" base_dn: "Базове ім’я DN" host: "Хост" onthefly: "Автоматичне створення користувачів" @@ -879,6 +896,9 @@ uk: project_custom_field: is_required: "Обов’язково для всіх проєктів" custom_field_section: Розділ + project/life_cycle_step_definition: + name: "Ім’я" + color: "Колір" query: column_names: "Стовпці" relations_to_type_column: "Відносини з %{type}" @@ -888,7 +908,7 @@ uk: timeline_labels: "Мітки часової шкали" relation: lag: "Затримка" - from: "Пакет робіт" + from: "Пов’язаний пакет робіт" to: "Пов'язаний робочий пакет" reminder: remind_at_date: "Дата" @@ -1212,12 +1232,16 @@ uk: typed_dag: circular_dependency: "Відносини створюють коло відносин." attributes: - to: - error_not_found: "робочий пакет в положенні `до` не знайдено або не видно" - error_readonly: "зв'язок `до` існуючого відношення незмінна" - from: - error_not_found: "робочий пакет в `від` положення не знайдено або не видно" - error_readonly: "існуюча зв'язок `from` є незмінною" + to_id: + error_not_found: "не знайдено або приховано." + error_readonly: "не можна змінити для наявних зв’язків." + from_id: + error_not_found: "не знайдено або приховано." + error_readonly: "не можна змінити для наявних зв’язків." + lag: + greater_than_or_equal_to: + zero: "не може мати від’ємне значення." + less_than_or_equal_to: "має зависоке значення." repository: not_available: "Постачальник SCM недоступний" not_whitelisted: "не дозволяється конфігурацією." @@ -1592,8 +1616,9 @@ uk: button_copy_and_follow: "Скопіювати та продовжити" button_create: "Створити" button_create_and_continue: "Створити та продовжити" - button_delete: "Видалити" button_decline: "Відхилити" + button_delete: "Видалити" + button_delete_permanently: "Видалити назавжди" button_delete_watcher: "Видалити спостерігача %{name}" button_download: "Завантажити" button_duplicate: "Дублювати" @@ -1832,6 +1857,11 @@ uk: few: "годин(и)" many: "годин(и)" other: "годин(и)" + day: + one: "день" + few: "дні" + many: "днів" + other: "дня" description_active: "Активний?" description_attachment_toggle: "Показати/приховати вкладення" description_autocomplete: > @@ -1867,6 +1897,10 @@ uk: upsale: title: "Доповнення версії Enterprise" link_title: "Додаткові відомості" + automatic_subject_generation: + description: "Створюйте автоматично згенеровані теми на основі атрибутів і тексту." + customize_life_cycle: + description: "Створюйте й упорядковуйте різні етапи й контрольні точки проєкту, а не лише ті, що передбачені плануванням циклу проєкту PM2." form_configuration: description: "Налаштуйте конфігурацію форми за допомогою цих додаткових доповнень:" add_groups: "Додати нові групи атрибутів" @@ -2229,6 +2263,7 @@ uk: label_add_subtask: "Додати підзавдання" label_added: "додано" label_added_by: "Автор: %{author}" + label_added_by_on: "Додав(-ла) %{author} %{date}" label_added_time_by: "Доданий %{author} %{age} назад" label_additional_workflow_transitions_for_assignee: "Додаткові переходи можна коли користувач є правонаступником" label_additional_workflow_transitions_for_author: "Додаткові переходи дозволені користувачу, який є автором" @@ -2649,6 +2684,7 @@ uk: label_project_new: "Новий проект" label_project_plural: "Проекти" label_project_list_plural: "Списки проєкту" + label_project_lifecycle: "Життєвий цикл проєкту" label_project_attributes_plural: "Атрибути проєкту" label_project_custom_field_plural: "Атрибути проєкту" label_project_settings: "Налаштування проекту" @@ -2675,6 +2711,7 @@ uk: label_relation: "Зв’язок" label_relation_actions: "Дії зі зв’язками" label_relation_delete: "Видалити зв'язок" + label_relation_edit: "Редагувати зв’язок" label_relation_new: "Новий зв'язок" label_release_notes: "Примітки до випуску" label_remaining_work: "Залишок роботи" @@ -3092,6 +3129,7 @@ uk: notice_bad_request: "Неправильний Запит." notice_not_authorized: "Ви не авторизовані для доступу до цієї сторінки." notice_not_authorized_archived_project: "Проект ви намагаєтеся отримати доступ до архіву." + notice_requires_enterprise_token: "Токен Enterprise відсутній або не надає доступу до цієї сторінки." notice_password_confirmation_failed: "Ваш пароль неправильний. Неможливо продовжити." notice_principals_found_multiple: "There are %{number} знайдені результати. \nВкладка для фокусування першого результату." notice_principals_found_single: "Знайдений один результат. Натисніть для переходу до нього." @@ -3141,7 +3179,7 @@ uk: text_getting_started_description: "Отримайте стислий огляд управління проєктами та командної роботи в OpenProject. Це відео можна переглянути знову в меню довідки." welcome: "Вітаємо в додатку %{app_title}" select_language: "Будь ласка, виберіть мову" - permission_add_work_package_notes: "Додати нотатки" + permission_add_work_package_notes: "Додати коментарі" permission_add_work_packages: "Додати робочі пакети" permission_add_messages: "Відправка повідомлень" permission_add_project: "Створення проєктів" @@ -3171,10 +3209,11 @@ uk: permission_delete_timelines: "Видалити графіки" permission_delete_wiki_pages: "Видалення wiki-сторінок" permission_delete_wiki_pages_attachments: "Видалення прикріплених файлів" - permission_edit_work_package_notes: "Редагувати примітки" + permission_edit_work_package_notes: "Модерувати коментарі" + permission_edit_work_package_notes_explanation: "Увага! Користувачі із цим дозволом можуть редагувати будь-чиї коментарі." permission_edit_work_packages: "Редагувати робочі пакети" permission_edit_messages: "Редагування повідомлень" - permission_edit_own_work_package_notes: "Редагувати власні нотатки" + permission_edit_own_work_package_notes: "Редагувати власні коментарі" permission_edit_own_messages: "Редагування власних повідомлень" permission_edit_own_time_entries: "Редагування власного обліку часу" permission_edit_project: "Редагувати проект" @@ -3403,6 +3442,7 @@ uk: activated: "активовано" deactivated: "деактивовано" search_input_placeholder: "Пошук ..." + setting_apiv3_cors_title: "Спільне використання ресурсів із різних джерел (CORS)" setting_apiv3_cors_enabled: "Увімкнути CORS" setting_apiv3_cors_origins: "Дозволені джерела CORS (Cross-Origin Resource Sharing) в API версії 3" setting_apiv3_cors_origins_text_html: > @@ -3628,6 +3668,27 @@ uk: new: heading: "Новий атрибут" description: "Зміни цього атрибута проєкту відобразяться в усіх проєктах, де його ввімкнено. Обов’язкові атрибути не можна вимикати для окремого проєкту." + project_life_cycle_step_definitions: + heading: "Життєвий цикл проєкту" + heading_description: "Життєвий цикл проєкту складається з етапів і контрольних точок, які структурують ваші проєкти. Вони відображатимуться на сторінці огляду проєкту й у списку проєктів. Ви можете вибирати окремі етапи й контрольні точки, але не можете перевпорядковувати їх на рівні проєкту." + label_add: "Додати" + label_add_description: "Додайте визначення життєвого циклу" + label_add_stage: "Етап" + label_add_gate: "Контрольна точка" + filter: + label: "Пошук етапу або контрольної точки проєкту" + section_header: "Етапи й контрольні точки" + non_defined: "Зараз не визначено ні етапи, ні контрольні точки." + new: + description: "Зміни цього етапу проєкту відображатимуться в усіх проєктах із цим етапом." + new_stage: + heading: "Новий етап" + new_gate: + heading: "Нова контрольна точка" + edit_stage: + heading: "Редагувати етап" + edit_gate: + heading: "Редагувати етап" projects: missing_dependencies: "Перевірено модуль проєкту %{module}, який містить залежності від %{dependencies}. Ці залежності потрібно також перевірити." section_new_projects: "Налаштування нових проєктів" @@ -3661,6 +3722,7 @@ uk: text_are_you_sure_continue: "Хочете продовжити?" text_are_you_sure_with_children: "Видалити робочий пакет і всі дочірні робочі пакети?" text_are_you_sure_with_project_custom_fields: "Видалення цього атрибута також призведе до видалення його значень у всіх проєктах. Ви впевнені?" + text_are_you_sure_with_project_life_cycle_step: "Видалення цього етапу також призведе до його видалення в усіх проєктах. Ви впевнені?" text_assign_to_project: "Призначити на проект" text_form_configuration: > Можна налаштувати, які поля будуть відображатися у формах робочих пакетів. Ви можете вільно групувати поля для відображення потреб вашого домену. @@ -3740,6 +3802,7 @@ uk: text_notice_security_badge_displayed_html: > Примітка: якщо цей параметр увімкнено, на екрані з'явиться значок із статусом інсталяції %{information_panel_label} панелі адміністрування та на головній сторінці. Він відображається лише адміністраторам.
      Значок перевірить поточну версію OpenProject на основі офіційної бази даних випуску OpenProject, щоб сповістити вас про будь-які оновлення або відомі уразливості. Щоб отримати додаткові відомості про те, що надає перевірка, які дані потрібні для надання доступних оновлень, та про те, як вимкнути цю перевірку, відвідайте сторінку конфігураційна документація. text_own_membership_delete_confirmation: "Ви збираєтесь видалити деякі або всі права, через що можуть зникнути права на редагування цього проекту.\nВи впевнені що хочете продовжити?" + text_permanent_delete_confirmation_checkbox_label: "Я розумію, що це видалення не можна відмінити" text_plugin_assets_writable: "Каталог ресурсів модулів доступний для запису" text_powered_by: "Працює на %{link}" text_project_identifier_info: "Допускаються тільки рядкові малі букви (a-z), цифри, тире та нижнє підкреслення. Початок має бути з малої літери." @@ -4109,6 +4172,8 @@ uk: builtin: Вбудований екземпляр застосунку confidential: Конфіденційний singular: "Програма OAuth" + scopes: "Області" + client_credentials: "Облікові дані клієнта" plural: "Програми OAuth" named: " Програми OAuth '%{name}'" new: "Нова програма OAuth" diff --git a/config/locales/crowdin/uz.yml b/config/locales/crowdin/uz.yml index 4964b44aa8f6..0f0b9b9a42a7 100644 --- a/config/locales/crowdin/uz.yml +++ b/config/locales/crowdin/uz.yml @@ -229,6 +229,10 @@ uz: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -249,6 +253,7 @@ uz: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -287,6 +292,7 @@ uz: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" overwritten_tabs: @@ -469,6 +475,7 @@ uz: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -646,6 +653,7 @@ uz: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -668,14 +676,15 @@ uz: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -690,6 +699,9 @@ uz: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -726,6 +738,8 @@ uz: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: delete: "Delete account" @@ -790,6 +804,7 @@ uz: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -825,6 +840,8 @@ uz: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -868,6 +885,9 @@ uz: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -877,7 +897,7 @@ uz: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1201,12 +1221,16 @@ uz: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1561,8 +1585,9 @@ uz: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1765,6 +1790,9 @@ uz: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" description_autocomplete: > @@ -1800,6 +1828,10 @@ uz: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2162,6 +2194,7 @@ uz: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2582,6 +2615,7 @@ uz: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2608,6 +2642,7 @@ uz: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3024,6 +3059,7 @@ uz: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3072,7 +3108,7 @@ uz: text_getting_started_description: "Get a quick overview of project management and team collaboration with OpenProject. You can restart this video from the help menu." welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3102,10 +3138,11 @@ uz: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3198,9 +3235,9 @@ uz: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" project_module_work_package_tracking: "Work packages" @@ -3334,6 +3371,7 @@ uz: activated: "activated" deactivated: "deactivated" search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3559,6 +3597,27 @@ uz: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3592,6 +3651,7 @@ uz: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. You can freely group the fields to reflect the needs for your domain. @@ -3671,6 +3731,7 @@ uz: text_notice_security_badge_displayed_html: > Note: if enabled, this will display a badge with your installation status in the %{information_panel_label} administration panel, and on the home page. It is displayed to administrators only.
      The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4039,6 +4100,8 @@ uz: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/crowdin/vi.yml b/config/locales/crowdin/vi.yml index a7e0abc28c05..e455bb917a84 100644 --- a/config/locales/crowdin/vi.yml +++ b/config/locales/crowdin/vi.yml @@ -231,6 +231,10 @@ vi: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -251,6 +255,7 @@ vi: confirm_destroy_option: "Xóa một tùy chọn sẽ xóa tất cả các sự kiện của nó (ví dụ như trong các gói công việc). Bạn có chắc bạn muốn xóa bỏ nó?" reorder_alphabetical: "Sắp xếp lại giá trị theo thứ tự bảng chữ cái" reorder_confirmation: "Cảnh báo: Thứ tự hiện tại của các giá trị sẽ bị mất. Tiếp tục?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Đánh dấu trường tùy chỉnh là bắt buộc. Điều này sẽ làm cho việc điền vào trường là bắt buộc khi tạo mới hoặc cập nhật tài nguyên hiện có." is_required_for_project: "Tích để bật thuộc tính này và yêu cầu nó trong tất cả các dự án. Không thể hủy kích hoạt nó cho từng dự án." @@ -289,6 +294,7 @@ vi: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Tìm kiếm trong %{app_title}" overwritten_tabs: @@ -464,6 +470,7 @@ vi: my: access_token: create_dialog: + title: Token generated header: Token %{type} đã được tạo warning: Lưu ý rằng đây là lần duy nhất bạn thấy được token này, chắc chắn phải sao chép nó ngay. errors: @@ -639,6 +646,7 @@ vi: title: "Thiếu quy trình làm việc cho việc chia sẻ gói công việc" message: "Không có quy trình làm việc nào được cấu hình cho vai trò 'Biên tập viên gói công việc'. Không có quy trình làm việc, người được chia sẻ không thể thay đổi trạng thái của gói công việc. Các quy trình làm việc có thể được sao chép. Chọn một loại nguồn (ví dụ: 'Nhiệm vụ') và vai trò nguồn (ví dụ: 'Thành viên'). Sau đó chọn các loại mục tiêu. Để bắt đầu, bạn có thể chọn tất cả các loại làm mục tiêu. Cuối cùng, chọn vai trò 'Biên tập viên gói công việc' làm mục tiêu và nhấp vào 'Sao chép'. Sau khi đã tạo ra các mặc định như vậy, tinh chỉnh các quy trình làm việc như bạn làm với mọi vai trò khác." link_message: "Cấu hình các quy trình làm việc trong quản trị." + templated_subject_hint: Automatically generated through type %{type} summary: reports: category: @@ -661,14 +669,15 @@ vi: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -683,6 +692,9 @@ vi: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -719,6 +731,8 @@ vi: required_description: "Marks this work package as being a requirement to the related one" label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Thư mời account: delete: "Xoá tài khoản" @@ -783,6 +797,7 @@ vi: is_required: "Bắt buộc" max_length: "Chiều dài tối đa" min_length: "Chiều dài tối thiểu" + content_right_to_left: "Right-to-Left content" multi_value: "Cho phép nhiều lựa chọn" possible_values: "Giá trị có thể" regexp: "Biểu thức chính quy" @@ -818,6 +833,8 @@ vi: attr_lastname: "Thuộc tính họ" attr_login: "Thuộc tính tên người dùng" attr_mail: "Thuộc tính email" + filter_string: "Filter string" + admin: "Administrator" base_dn: "DN căn bản" host: "Máy chủ" onthefly: "Tạo người dùng tự động" @@ -861,6 +878,9 @@ vi: project_custom_field: is_required: "Yêu cầu cho tất cả các dự án" custom_field_section: Mục tùy chỉnh + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Cột" relations_to_type_column: "Quan hệ với %{type}" @@ -870,7 +890,7 @@ vi: timeline_labels: "Nhãn dòng thời gian" relation: lag: "Kết quả chậm" - from: "Gói công việc" + from: "Related work package" to: "Work package liên quan" reminder: remind_at_date: "Date" @@ -1194,12 +1214,16 @@ vi: typed_dag: circular_dependency: "Mối quan hệ tạo ra một vòng tròn các mối quan hệ." attributes: - to: - error_not_found: "work package ở vị trí `đến` không tìm thấy hoặc không hiển thị" - error_readonly: "liên kết `to` của một mối quan hệ hiện có là không thay đổi được" - from: - error_not_found: "work package ở vị trí `từ` không tìm thấy hoặc không hiển thị" - error_readonly: "liên kết `from` của một mối quan hệ hiện có là không thay đổi được" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "Nhà cung cấp SCM không có sẵn" not_whitelisted: "không được cấu hình cho phép." @@ -1544,8 +1568,9 @@ vi: button_copy_and_follow: "Sao chép và làm theo" button_create: "Tạo mới" button_create_and_continue: "Tạo và tiếp tục" - button_delete: "Xoá" button_decline: "Từ chối" + button_delete: "Xoá" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Xóa watcher %{name}" button_download: "Tải" button_duplicate: "Nhân đôi" @@ -1730,6 +1755,8 @@ vi: units: hour: other: "hours" + day: + other: "days" description_active: "Đang hoạt động?" description_attachment_toggle: "Hiển thị/ẩn các đính kèm" description_autocomplete: > @@ -1765,6 +1792,10 @@ vi: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Tùy chỉnh cấu hình mẫu với các tiện ích bổ sung sau:" add_groups: "Thêm 1 nhóm thuộc tính" @@ -2127,6 +2158,7 @@ vi: label_add_subtask: "Thêm subtask" label_added: "đã thêm" label_added_by: "Thêm bởi %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Thêm bởi %{author} cách đây %{age}" label_additional_workflow_transitions_for_assignee: "Chuyển đổi bổ sung được cho phép khi người sử dụng là người được gán" label_additional_workflow_transitions_for_author: "Các chuyển đổi bổ xung được phép khi người dùng là tác giả" @@ -2547,6 +2579,7 @@ vi: label_project_new: "Dự án mới" label_project_plural: "Dự án" label_project_list_plural: "Danh sách dự án" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Các thuộc tính dự án" label_project_custom_field_plural: "Các thuộc tính dự án" label_project_settings: "Thiết lập dự án" @@ -2573,6 +2606,7 @@ vi: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Xóa quan hệ" + label_relation_edit: "Edit relation" label_relation_new: "Quan hệ mới" label_release_notes: "Ghi chú phát hành" label_remaining_work: "Công việc còn lại" @@ -2988,6 +3022,7 @@ vi: notice_bad_request: "Yêu cầu không hợp lệ." notice_not_authorized: "Bạn không được phép truy cập trang này." notice_not_authorized_archived_project: "Dự án bạn đang cố gắng truy cập đã bị lưu trữ." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Mật khẩu của bạn không chính xác. Không thể tiếp tục." notice_principals_found_multiple: "Có %{number} kết quả được tìm thấy. \n Nhấn Tab để tập trung vào kết quả đầu tiên." notice_principals_found_single: "Có một kết quả. \n Nhấn Tab để tập trung vào nó." @@ -3035,7 +3070,7 @@ vi: text_getting_started_description: "Nhận cái nhìn tổng quan nhanh về quản lý dự án và cộng tác nhóm với OpenProject. Bạn có thể khởi động lại video này từ menu trợ giúp." welcome: "Chào mừng đến với %{app_title}" select_language: "Vui lòng chọn ngôn ngữ của bạn" - permission_add_work_package_notes: "Thêm ghi chú" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Thêm mới Gói công việc" permission_add_messages: "Đăng tin nhắn" permission_add_project: "Tạo dự án" @@ -3065,10 +3100,11 @@ vi: permission_delete_timelines: "Xóa mốc thời gian" permission_delete_wiki_pages: "Xóa trang wiki" permission_delete_wiki_pages_attachments: "Xóa tệp đính kèm" - permission_edit_work_package_notes: "Chỉnh sửa ghi chú" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Chỉnh sửa gói công việc" permission_edit_messages: "Chỉnh sửa tin nhắn" - permission_edit_own_work_package_notes: "Chỉnh sửa ghi chú của riêng bạn" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Chỉnh sửa tin nhắn của riêng bạn" permission_edit_own_time_entries: "Chỉnh sửa nhật ký thời gian của riêng bạn" permission_edit_project: "Chỉnh sửa dự án" @@ -3161,9 +3197,9 @@ vi: are_you_sure: "Bạn có chắc bạn muốn lưu trữ các dự án '%{name}'?" archived: "Đã lưu" count: - zero: "0 Dự án" - one: "1 Dự án" - other: "%{count} Dự án" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Hoạt động" project_module_forums: "Diễn đàn" project_module_work_package_tracking: "Gói công việc" @@ -3297,6 +3333,7 @@ vi: activated: "đã kích hoạt" deactivated: "đã tắt" search_input_placeholder: "Tìm kiếm ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Kích hoạt CORS" setting_apiv3_cors_origins: "Các nguồn gốc được phép của API V3 Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_origins_text_html: > @@ -3522,6 +3559,27 @@ vi: new: heading: "Thuộc tính mới" description: "Những thay đổi đối với thuộc tính dự án này sẽ được phản ánh trong tất cả các dự án mà nó được bật. Các thuộc tính bắt buộc không thể bị tắt ở mức dự án." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Mô-đun dự án %{module} đã được kiểm tra và phụ thuộc vào %{dependencies}. Bạn cần kiểm tra các phụ thuộc này cũng vậy." section_new_projects: "Cài đặt cho các dự án mới" @@ -3555,6 +3613,7 @@ vi: text_are_you_sure_continue: "Bạn có chắc chắn muốn tiếp tục không?" text_are_you_sure_with_children: "Xóa gói công việc và tất cả các gói công việc con?" text_are_you_sure_with_project_custom_fields: "Xóa thuộc tính này cũng sẽ xóa các giá trị của nó trong tất cả các dự án. Bạn có chắc chắn muốn làm điều này không?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Gán cho dự án" text_form_configuration: > Bạn có thể tùy chỉnh các trường sẽ được hiển thị trong các gói công việc. Bạn có thể tự do nhóm các trường để phản ánh nhu cầu cho tên miền của bạn. @@ -3634,6 +3693,7 @@ vi: text_notice_security_badge_displayed_html: > Lưu ý: nếu được kích hoạt, một bảng thông báo về tình trạng của phần mềm sẽ được hiển thị tại trang quản trị %{information_panel_label}, và tại trang chủ. Thông tin này chỉ được thấy bởi Quản trị viên.
      Bảng thông báo sẽ kiểm tra các thông tin cập nhật từ OpenProject và thông báo về các cập nhật mới hay các lỗi được phát hiện. Để biết thêm chi tiết, vui lòng tham khảo tài liệu cấu hình. text_own_membership_delete_confirmation: "Bạn sắp xóa một số hoặc tất cả quyền của mình và có thể không còn khả năng chỉnh sửa dự án này sau đó.\nBạn có chắc chắn muốn tiếp tục không?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Thư mục tài sản plugin có thể ghi được" text_powered_by: "Được cung cấp bởi %{link}" text_project_identifier_info: "Chỉ cho phép chữ cái viết thường (a-z), số, dấu gạch ngang và gạch dưới, phải bắt đầu bằng chữ cái viết thường." @@ -4000,6 +4060,8 @@ vi: builtin: Built-in instance application confidential: Confidential singular: "Ứng dụng OAuth" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "Các ứng dụng OAuth" named: "Ứng dụng OAuth '%{name}'" new: "Ứng dụng OAuth mới" diff --git a/config/locales/crowdin/zh-CN.yml b/config/locales/crowdin/zh-CN.yml index 5126f3837075..728511be76c1 100644 --- a/config/locales/crowdin/zh-CN.yml +++ b/config/locales/crowdin/zh-CN.yml @@ -226,6 +226,10 @@ zh-CN: item: title: 该项目下面没有任何层级 description: 在此列表中添加条目，以便在另一个列表中创建子条目 + delete_dialog: + title: "删除自定义字段项" + heading: "删除自定义字段项？" + description: "此操作将不可逆转地删除该项及其所有子项。任何分配的值都将被永久删除。 如果需要此字段，删除项目可能会导致现有工作包无效。" placeholder: label: "项目标签" short: "短名" @@ -246,6 +250,7 @@ zh-CN: confirm_destroy_option: "删除某个选项将会删除其所有实例 (例如, 在工作包中)。确定要删除？" reorder_alphabetical: "按字母顺序重新排序" reorder_confirmation: "警告：可用值的当前顺序将丢失。是否继续？" + placeholder_version_select: "需要先选择工作包或项目" instructions: is_required: "将自定义字段标记为必填项。这将使在创建新资源或更新现有资源时，填写该字段成为强制要求。" is_required_for_project: "选中可启用此属性，并使其成为所有项目的必选项。单个项目不能停用该属性。" @@ -284,6 +289,7 @@ zh-CN: label: "标签" short: "简称" parent: "父级" + blueprint: "图案蓝图" global_search: placeholder: "在%{app_title}中搜索" overwritten_tabs: @@ -459,6 +465,7 @@ zh-CN: my: access_token: create_dialog: + title: 令牌已生成 header: '%{type} 令牌已生成' warning: '注意: 这将是您看到这个令牌的唯一机会, 请务必立即复制它。' errors: @@ -633,6 +640,7 @@ zh-CN: title: "工作包共享缺少工作流" message: "没有为\"工作包编辑者\"角色配置工作流。没有工作流，共享用户就无法更改工作包的状态。工作流可以复制。选择一个源类型（例如\"任务\"）和源角色（例如\"成员\"）。然后选择目标类型。一开始，您可以将所有类型都选择为目标类型。最后，选择\"工作包编辑者\"角色作为目标，然后点击\"复制\"。在创建默认设置之后，像对其他角色一样进行微调，对工作流进行详细调整。" link_message: "在管理中配置工作流。" + templated_subject_hint: 通过类型 %{type}自动生成 summary: reports: category: @@ -655,14 +663,15 @@ zh-CN: no_results_title_text: 目前没有任何关系。 blankslate_heading: "没有关系" blankslate_description: "此工作包还没有任何关系。" + label_add_child_button: "子项" label_add_x: "添加 %{x}" label_edit_x: "编辑 %{x}" label_add_description: "添加说明" lag: subject: "间隔" - title: "间隔(天数)" caption: "两个工作包之间的最低工作日数。" relations: + label_new_child_created: "创建新工作包并将其添加为子项" label_relates_singular: "关联到" label_relates_plural: "关联到" label_relates_to_singular: "关联到" @@ -677,6 +686,9 @@ zh-CN: follows_description: "相关工作包必须在本工作包启动前完成" label_child_singular: "子节点" label_child_plural: "子项" + new_child: "新建子项" + new_child_text: "创建工作包，作为当前(父)工作包的子项" + existing_child: "添加现有子项" child_description: "使相关工作包成为当前(父) 工作包的子项目" label_blocks_singular: "阻止" label_blocks_plural: "阻止" @@ -713,6 +725,8 @@ zh-CN: required_description: "将此工作包标记为相关工作包的需求" label_parent_singular: "父级" label_parent_plural: "父级" + ghost_relation_title: "相关工作包" + ghost_relation_description: "由于权限问题，您无法看到这些信息。" label_invitation: 邀请 account: delete: "删除帐户" @@ -777,6 +791,7 @@ zh-CN: is_required: "必填" max_length: "最大长度" min_length: "最小长度" + content_right_to_left: "内容从右到左" multi_value: "允许多选" possible_values: "可能的值" regexp: "正则表达式" @@ -812,6 +827,8 @@ zh-CN: attr_lastname: "姓氏属性" attr_login: "用户名属性" attr_mail: "电子邮件属性" + filter_string: "筛选字符串" + admin: "管理员" base_dn: "基本 DN" host: "主机" onthefly: "自动创建用户" @@ -855,6 +872,9 @@ zh-CN: project_custom_field: is_required: "在所有项目中应用" custom_field_section: 单元 + project/life_cycle_step_definition: + name: "名称" + color: "颜色" query: column_names: "列" relations_to_type_column: "与%{type} 的关系" @@ -864,7 +884,7 @@ zh-CN: timeline_labels: "时间线标签" relation: lag: "延迟" - from: "工作包" + from: "相关工作包" to: "相关的工作包" reminder: remind_at_date: "日期" @@ -1188,12 +1208,16 @@ zh-CN: typed_dag: circular_dependency: "关系会创建关系的循环。" attributes: - to: - error_not_found: "找不到这个工作包" - error_readonly: "关系要持久" - from: - error_not_found: "找不到这个工作包" - error_readonly: "关系要持久" + to_id: + error_not_found: "找不到或不可见。" + error_readonly: "无法针对现有关系更改。" + from_id: + error_not_found: "找不到或不可见。" + error_readonly: "无法针对现有关系更改。" + lag: + greater_than_or_equal_to: + zero: "不能为负数。" + less_than_or_equal_to: "太高。" repository: not_available: "SCM提供商不可用" not_whitelisted: "配置所不允许的。" @@ -1538,8 +1562,9 @@ zh-CN: button_copy_and_follow: "复制和跟踪" button_create: "创建" button_create_and_continue: "创建并继续" - button_delete: "删除" button_decline: "拒绝" + button_delete: "删除" + button_delete_permanently: "永久删除" button_delete_watcher: "删除关注者 %{name}" button_download: "下载" button_duplicate: "复制" @@ -1724,6 +1749,8 @@ zh-CN: units: hour: other: "小时" + day: + other: "天" description_active: "激活？" description_attachment_toggle: "显示/隐藏附件" description_autocomplete: > @@ -1759,6 +1786,10 @@ zh-CN: upsale: title: "企业附加组件" link_title: "更多信息" + automatic_subject_generation: + description: "使用引用的属性和文本自动生成主题。" + customize_life_cycle: + description: "创建和组织与 PM2 项目周期规划不同的项目阶段和关口。" form_configuration: description: "使用以下附加组件自定义表单配置：" add_groups: "添加新属性组" @@ -2121,6 +2152,7 @@ zh-CN: label_add_subtask: "添加子任务" label_added: "已添加" label_added_by: "由%{author}添加" + label_added_by_on: "由 %{author} 添加 %{date}" label_added_time_by: "由 %{author} %{age} 前添加" label_additional_workflow_transitions_for_assignee: "当用户是受理人时允许额外的转移" label_additional_workflow_transitions_for_author: "当用户是作者时允许额外转移" @@ -2541,6 +2573,7 @@ zh-CN: label_project_new: "新的项目" label_project_plural: "项目" label_project_list_plural: "项目列表" + label_project_lifecycle: "项目生命周期" label_project_attributes_plural: "项目属性" label_project_custom_field_plural: "项目属性" label_project_settings: "项目设置" @@ -2567,6 +2600,7 @@ zh-CN: label_relation: "关系" label_relation_actions: "关联操作" label_relation_delete: "删除关系" + label_relation_edit: "编辑关系" label_relation_new: "新的关系" label_release_notes: "更新日志" label_remaining_work: "剩余工时" @@ -2980,6 +3014,7 @@ zh-CN: notice_bad_request: "错误的请求。" notice_not_authorized: "您无权访问此页。" notice_not_authorized_archived_project: "您尝试访问的项目已存档。" + notice_requires_enterprise_token: "企业令牌缺失或不允许访问此页面。" notice_password_confirmation_failed: "您的密码不正确。无法继续。" notice_principals_found_multiple: "找到 %{number} 条结果。\n 点击以关注第一条结果。" notice_principals_found_single: "这有一个结果。\n点击来关注它。" @@ -3026,7 +3061,7 @@ zh-CN: text_getting_started_description: "快速了解 OpenProject 的项目管理和团队协作。您可以从帮助菜单重新启动此视频。" welcome: "欢迎使用 %{app_title}" select_language: "请选择您的语言" - permission_add_work_package_notes: "添加注释" + permission_add_work_package_notes: "添加评论" permission_add_work_packages: "添加工作包" permission_add_messages: "发布消息" permission_add_project: "创建项目" @@ -3056,10 +3091,11 @@ zh-CN: permission_delete_timelines: "删除时间线" permission_delete_wiki_pages: "删除维基页面" permission_delete_wiki_pages_attachments: "删除附件" - permission_edit_work_package_notes: "编辑注释" + permission_edit_work_package_notes: "中度评论" + permission_edit_work_package_notes_explanation: "注意：拥有此权限的用户可以编辑任何人的评论。" permission_edit_work_packages: "编辑工作包" permission_edit_messages: "编辑消息" - permission_edit_own_work_package_notes: "编辑自己的注释" + permission_edit_own_work_package_notes: "编辑自己的评论" permission_edit_own_messages: "编辑自己的消息" permission_edit_own_time_entries: "编辑自己的时间记录" permission_edit_project: "编辑项目" @@ -3286,6 +3322,7 @@ zh-CN: activated: "已激活" deactivated: "已取消激活" search_input_placeholder: "搜索" + setting_apiv3_cors_title: "跨源资源共享 (CORS)" setting_apiv3_cors_enabled: "启用 CORS" setting_apiv3_cors_origins: "API v3 跨域资源共享 (CORS) 允许的域" setting_apiv3_cors_origins_text_html: > @@ -3511,6 +3548,27 @@ zh-CN: new: heading: "新建属性" description: "对该项目属性的更改将反映在启用该属性的所有项目中。不能按项目禁用必填属性。" + project_life_cycle_step_definitions: + heading: "项目生命周期" + heading_description: "项目生命周期由阶段和关口组成，用于构建项目。它们将显示在项目的概述页面，并在项目列表中提供。可以选择单个阶段和关口来定制项目，但无法在项目级别上重新排序。" + label_add: "添加" + label_add_description: "添加生命周期定义" + label_add_stage: "阶段" + label_add_gate: "关口" + filter: + label: "搜索项目阶段或关口" + section_header: "阶段和关口" + non_defined: "目前既未定义阶段也未定关口。" + new: + description: "对该项目步骤的更改将反映在启用该步骤的所有项目中。" + new_stage: + heading: "新阶段" + new_gate: + heading: "新关口" + edit_stage: + heading: "编辑阶段" + edit_gate: + heading: "编辑阶段" projects: missing_dependencies: "已检查依赖于 %{dependencies} 的项目模块 %{module}。您也需要检查这些依赖项。" section_new_projects: "新项目的设置" @@ -3544,6 +3602,7 @@ zh-CN: text_are_you_sure_continue: "确定要继续吗？" text_are_you_sure_with_children: "删除工作包和所有子工作包吗？" text_are_you_sure_with_project_custom_fields: "删除该属性也会删除其在所有项目中的值。您确定要这样做吗？" + text_are_you_sure_with_project_life_cycle_step: "删除该步骤也会删除其在所有项目中的使用。您确定要这样做吗？" text_assign_to_project: "分配给项目" text_form_configuration: > 您可以自定义哪些字段将显示在工作包窗体中。您可以自由地对字段进行分组, 以反映您的域的需求。 @@ -3623,6 +3682,7 @@ zh-CN: text_notice_security_badge_displayed_html: > 注：如果启用，这会在 %{information_panel_label} 管理面板中和首页上显示一个包含您的安装状态的徽章。徽章仅向管理员显示。
      徽章将根据官方的 OpenProject 版本数据库检查您当前的 OpenProject 版本，提醒您是否存在任何更新或已知漏洞。如需详细了解检查可以提供哪些信息，需要哪些数据来提供可用更新，以及如何禁用此检查，请访问配置文档。 text_own_membership_delete_confirmation: "您要移除部分或全部权限，并且可能无法在此后编辑这个项目。\n您确定要继续吗？" + text_permanent_delete_confirmation_checkbox_label: "我理解这种删除不可逆转" text_plugin_assets_writable: "插件资产目录可写" text_powered_by: "Powered by %{link}" text_project_identifier_info: "只有小写字母 (a-z)、 数字、 短划线和下划线被允许，必须以小写字母开头。" @@ -3989,6 +4049,8 @@ zh-CN: builtin: 内置实例应用程序 confidential: 机密 singular: "OAuth应用程序" + scopes: "范围" + client_credentials: "客户端凭据" plural: "OAuth应用程序" named: "OAuth 应用程序“%{name}”" new: "新的 OAuth 应用程序" diff --git a/config/locales/crowdin/zh-TW.yml b/config/locales/crowdin/zh-TW.yml index 8da7a99d2e11..78acf2f1a478 100644 --- a/config/locales/crowdin/zh-TW.yml +++ b/config/locales/crowdin/zh-TW.yml @@ -228,6 +228,10 @@ zh-TW: item: title: 此項目下方沒有任何階層 description: 將項目加入此清單以在另一個清單中建立子項目 + delete_dialog: + title: "刪除自訂欄位" + heading: "刪除自訂欄位？" + description: "此動作將不可逆轉地移除項目及其所有子項目。任何指定的值都會被永久刪除。如果此欄位是必填欄位，移除項目可能會導致現有工作套件失效。" placeholder: label: "項目標籤" short: "簡稱" @@ -248,6 +252,7 @@ zh-TW: confirm_destroy_option: "刪除一個項目將會一併刪除所有出現這個項目的地方 (例如：在工作項目中)。你確定要刪除它嗎？" reorder_alphabetical: "按字母順序重新排列" reorder_confirmation: "警告：目前可用值的順序將會遺失。繼續嗎？" + placeholder_version_select: "需要先選擇工作項目或專案" instructions: is_required: "將此欄位定義成必填。\n" is_required_for_project: "勾選以啟用此屬性，並使其成為所有專案的必要屬性。個別專案無法停用。" @@ -286,6 +291,7 @@ zh-TW: label: "標籤" short: "簡稱" parent: "上層" + blueprint: "樣式藍圖" global_search: placeholder: "在 %{app_title} 搜尋" overwritten_tabs: @@ -461,6 +467,7 @@ zh-TW: my: access_token: create_dialog: + title: 權杖(Token)已產生 header: '%{type} 權杖已生成' warning: '注意: 這是您唯一可以看到此權杖的時候, 請務必立即複製它。' errors: @@ -635,6 +642,7 @@ zh-TW: title: "共用工作項目缺少工作流" message: "沒有為\"工作項目編輯者\"角色配置工作流程。沒有工作流參與，參與用戶就無法更改工作項目的狀態。工作流程可以複製。選擇一個類型(例如\"任務\")和角色(例如\"成員\")。然後選擇目標類型。一開始，您可以將所有類型都選擇為目標類型。最後，選擇\"工作項目編輯者\"角色作為目標，然後點擊\"複製\"。在建立預設設定之後，像對其他角色一樣進行微調，以其對工作流程進行詳細調整。" link_message: "在管理中配置工作流。" + templated_subject_hint: 透過類型 %{type}自動產生 summary: reports: category: @@ -657,14 +665,15 @@ zh-TW: no_results_title_text: 目前沒有相關工作項目 blankslate_heading: "沒有關聯" blankslate_description: "此工作項目尚未建立任何關係。" + label_add_child_button: "子項目" label_add_x: "新增 %{x}" label_edit_x: "編輯：%{x}" label_add_description: "新增說明" lag: subject: "延遲" - title: "延遲（天數）" caption: "兩個工作項目之間最少要相隔多少個工作天。" relations: + label_new_child_created: "建立新的工作項目，並以子項目新增" label_relates_singular: "相關於" label_relates_plural: "相關於" label_relates_to_singular: "相關於" @@ -679,6 +688,9 @@ zh-TW: follows_description: "在這個工作項目開始之前，相關的工作必須先完成" label_child_singular: "子項目" label_child_plural: "子項目" + new_child: "新增子項目" + new_child_text: "使相關工作成為目前（上層）工作項目的子項目" + existing_child: "現有子項目" child_description: "使相關工作成為目前（父）工作項目的子項目" label_blocks_singular: "區塊" label_blocks_plural: "區塊" @@ -715,6 +727,8 @@ zh-TW: required_description: "將此工作項目標示為相關工作的需求" label_parent_singular: "上層" label_parent_plural: "上層" + ghost_relation_title: "相關的工作項目" + ghost_relation_description: "由於權限的緣故，您無法看到。" label_invitation: 邀請 account: delete: "刪除帳號" @@ -779,6 +793,7 @@ zh-TW: is_required: "必填" max_length: "最大長度" min_length: "最小長度" + content_right_to_left: "從右至左的內容" multi_value: "允許多選" possible_values: "可選擇內容" regexp: "正規表示式" @@ -814,6 +829,8 @@ zh-TW: attr_lastname: "姓" attr_login: "使用者名稱屬性。" attr_mail: "Email" + filter_string: "過濾字串" + admin: "管理員" base_dn: "Base DN" host: "主機" onthefly: "自動新增用戶" @@ -857,6 +874,9 @@ zh-TW: project_custom_field: is_required: "所有專案都需要" custom_field_section: 區段 + project/life_cycle_step_definition: + name: "名稱" + color: "顏色" query: column_names: "欄" relations_to_type_column: "與 %{type} 的關連" @@ -866,7 +886,7 @@ zh-TW: timeline_labels: "時間軸標籤" relation: lag: "延遲" - from: "工作項目" + from: "相關的工作項目" to: "相關的工作項目" reminder: remind_at_date: "日期" @@ -1190,12 +1210,16 @@ zh-TW: typed_dag: circular_dependency: "無限迴圈的關聯。" attributes: - to: - error_not_found: "“結束”的工作項目不存在或無法顯示" - error_readonly: "您無法更改現有關係的“結束”連結" - from: - error_not_found: "“開始”的工作項目不存在或無法顯示" - error_readonly: "您無法更改現有關係的“開始”連結" + to_id: + error_not_found: "未找到或不可見。" + error_readonly: "無法變更現有的關係。" + from_id: + error_not_found: "未找到或不可見。" + error_readonly: "無法變更現有的關係。" + lag: + greater_than_or_equal_to: + zero: "不能為負數。" + less_than_or_equal_to: "太高。" repository: not_available: "版本控制無法使用" not_whitelisted: "不被設定所允許" @@ -1540,8 +1564,9 @@ zh-TW: button_copy_and_follow: "複製並跟隨" button_create: "建立" button_create_and_continue: "建立並繼續" - button_delete: "删除" button_decline: "拒絕" + button_delete: "删除" + button_delete_permanently: "永久刪除" button_delete_watcher: "刪除監看者 %{name}" button_download: "下載" button_duplicate: "複本" @@ -1726,6 +1751,8 @@ zh-TW: units: hour: other: "小時" + day: + other: "天" description_active: "啟用？" description_attachment_toggle: "顯示/隱藏附件" description_autocomplete: > @@ -1761,6 +1788,10 @@ zh-TW: upsale: title: "企業版附加元件" link_title: "更多資訊" + automatic_subject_generation: + description: "使用參考的屬性和文字建立自動產生的主題。" + customize_life_cycle: + description: "建立和組織不同於 PM2 專案週期規劃所提供的專案階段和關卡。" form_configuration: description: "使用以下附加組件自定義表單配置：" add_groups: "增加新的屬性群組" @@ -1953,7 +1984,7 @@ zh-TW: general_csv_decimal_separator: "." general_csv_encoding: "UTF-8" general_csv_separator: "," - general_first_day_of_week: "星期日" + general_first_day_of_week: "7" general_pdf_encoding: "ISO-8859-1" general_text_no: "否" general_text_yes: "是" @@ -2123,6 +2154,7 @@ zh-TW: label_add_subtask: "新增子任務" label_added: "已新增" label_added_by: "由 %{author} 新增" + label_added_by_on: "由 %{author} 於%{date} 新增" label_added_time_by: "由%{author}於%{age}前新增" label_additional_workflow_transitions_for_assignee: "使用者是執行者時，可用狀態" label_additional_workflow_transitions_for_author: "使用者是作者，可用狀態" @@ -2543,6 +2575,7 @@ zh-TW: label_project_new: "新增專案" label_project_plural: "專案" label_project_list_plural: "專案列表" + label_project_lifecycle: "專案生命週期" label_project_attributes_plural: "專案屬性" label_project_custom_field_plural: "專案屬性" label_project_settings: "專案設定" @@ -2569,6 +2602,7 @@ zh-TW: label_relation: "關聯" label_relation_actions: "關聯動作" label_relation_delete: "刪除關聯" + label_relation_edit: "編輯關聯" label_relation_new: "新增關聯" label_release_notes: "發行說明" label_remaining_work: "剩餘工作" @@ -2983,6 +3017,7 @@ zh-TW: notice_bad_request: "錯誤的請求" notice_not_authorized: "你沒有存取此頁面的權限" notice_not_authorized_archived_project: "你欲存取的專案已被封存" + notice_requires_enterprise_token: "企業識別碼遺失或不允許存取此頁面。" notice_password_confirmation_failed: "您的密碼不正確。無法繼續。" notice_principals_found_multiple: "找到 %{number} 條結果。\n Tab鍵以轉到第一條結果。" notice_principals_found_single: "有一個結果。 \n Tab鍵轉到該結果。" @@ -3029,7 +3064,7 @@ zh-TW: text_getting_started_description: "快速瞭解 OpenProject 的項目管理和團隊協作。您可以從幫助菜單重新啓動此視頻。" welcome: "歡迎使用 %{app_title}" select_language: "請選擇您的語言" - permission_add_work_package_notes: "增加註釋" + permission_add_work_package_notes: "增加留言" permission_add_work_packages: "新增工作項目" permission_add_messages: "張貼訊息" permission_add_project: "建立專案" @@ -3059,10 +3094,11 @@ zh-TW: permission_delete_timelines: "刪除時間軸" permission_delete_wiki_pages: "刪除維基頁面" permission_delete_wiki_pages_attachments: "刪除附件" - permission_edit_work_package_notes: "編輯註釋" + permission_edit_work_package_notes: "審閱留言" + permission_edit_work_package_notes_explanation: "注意：擁有此權限的使用者可以編輯任何人的註解。" permission_edit_work_packages: "編輯工作項目" permission_edit_messages: "編輯訊息" - permission_edit_own_work_package_notes: "編輯自己的註釋" + permission_edit_own_work_package_notes: "編輯自己的留言" permission_edit_own_messages: "編輯自己張貼的訊息" permission_edit_own_time_entries: "編輯自己的時間日誌" permission_edit_project: "編輯專案" @@ -3157,7 +3193,7 @@ zh-TW: count: zero: "0 個專案" one: "1 個專案" - other: "%{count} 專案" + other: "%{count} 個專案" project_module_activity: "活動" project_module_forums: "討論區" project_module_work_package_tracking: "工作項目" @@ -3291,6 +3327,7 @@ zh-TW: activated: "已啟用" deactivated: "已停用" search_input_placeholder: "搜尋 ..." + setting_apiv3_cors_title: "跨原始來源資源共用 (CORS, Cross-Origin Resource Sharing)" setting_apiv3_cors_enabled: "啟用 CORS" setting_apiv3_cors_origins: "CROSS-ORIGIN RESOURCE SHARING (CORS)" setting_apiv3_cors_origins_text_html: > @@ -3516,6 +3553,27 @@ zh-TW: new: heading: "新屬性" description: "專案屬性的變更將套用在已啟用該屬性專案中。 若為必要屬性，無法個別專案停用。" + project_life_cycle_step_definitions: + heading: "專案生命週期" + heading_description: "專案生命週期由結構專案的階段和關卡組成。它們會出現在專案的總覽頁面中，並可在專案清單中找到。可以選擇個別階段和關卡來自訂專案，但無法在專案層級上重新排序。" + label_add: "增加" + label_add_description: "新增生命週期定義" + label_add_stage: "階段" + label_add_gate: "關卡" + filter: + label: "搜尋專案階段或關卡" + section_header: "階段與關卡" + non_defined: "目前階段和關卡都未定義。" + new: + description: "此專案步驟的變更會反映在啟用此步驟的所有專案中。" + new_stage: + heading: "新增階段" + new_gate: + heading: "增加關卡" + edit_stage: + heading: "編輯階段" + edit_gate: + heading: "編輯關卡" projects: missing_dependencies: "已檢查依賴於 %{dependencies} 的項目模塊 %{module}。您也需要檢查這些依賴項。" section_new_projects: "新專案的設置" @@ -3549,6 +3607,7 @@ zh-TW: text_are_you_sure_continue: "你要繼續嗎?" text_are_you_sure_with_children: "刪除工作項目以及所有子工作項目?" text_are_you_sure_with_project_custom_fields: "刪除該屬性也會刪除其在所有項目中的值。您確定要這樣做嗎？" + text_are_you_sure_with_project_life_cycle_step: "刪除此步驟也會刪除其在所有專案中的使用。您確定要這麼做？" text_assign_to_project: "分配給專案" text_form_configuration: > 您可以自訂哪些欄位將會顯示在工作項目表單中。您可以自由的群組化這些欄位來符合您的需求。 @@ -3628,6 +3687,7 @@ zh-TW: text_notice_security_badge_displayed_html: > 注：如果啓用，這會在 %{information_panel_label} 管理面板中和首頁上顯示一個包含您的安裝狀態的徽章。徽章僅向管理員顯示。
      徽章將根據官方的 OpenProject 版本數據庫檢查您當前的 OpenProject 版本，提醒您是否存在任何更新或已知漏洞。如需詳細瞭解檢查可以提供哪些信息，需要哪些數據來提供可用更新，以及如何禁用此檢查，請訪問配置文檔。 text_own_membership_delete_confirmation: "您將要刪除部分或全部權限, 之後可能無法再編輯此專案。\n是否要繼續？" + text_permanent_delete_confirmation_checkbox_label: "我了解此刪除無法逆轉" text_plugin_assets_writable: "Plugin 資產目錄可寫" text_powered_by: "由 %{link} 提供" text_project_identifier_info: "僅允許小寫字母(a-z)、數字、破折號(-) 及底線(_)，且必須以小寫字母開頭。" @@ -3995,6 +4055,8 @@ zh-TW: builtin: 內建範例 confidential: 機密 singular: "Oauth 應用程式" + scopes: "範圍" + client_credentials: "客戶憑證" plural: "Oauth 應用程式" named: "OAuth 應用程式 '%{name}'" new: "新增 OAuth 應用程式" diff --git a/config/locales/en.yml b/config/locales/en.yml index ce5e3be08b3a..5e490f1b8ae3 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -49,7 +49,6 @@ en: created: "created" commented: "commented" - admin: plugins: no_results_title_text: There are currently no plugins installed. @@ -253,6 +252,10 @@ en: item: title: This item doesn't have any hierarchy level below description: Add items to this list to create sub-items inside another one + delete_dialog: + title: "Delete custom field item" + heading: "Delete custom field item?" + description: "This action will irreversibly remove the item and all its sub-items. Any assigned values will be permanently deleted. If this field is required, removing items may cause existing work packages to become invalid." placeholder: label: "Item label" short: "Short name" @@ -275,6 +278,7 @@ en: confirm_destroy_option: "Deleting an option will delete all of its occurrences (e.g. in work packages). Are you sure you want to delete it?" reorder_alphabetical: "Reorder values alphabetically" reorder_confirmation: "Warning: The current order of available values will be lost. Continue?" + placeholder_version_select: "Work package or project selection is required first" instructions: is_required: "Mark the custom field as required. This will make it mandatory to fill in the field when creating new or updating existing resources." is_required_for_project: "Check to enable this attribute and make it required in all projects. It cannot be deactived for individual projects." @@ -317,6 +321,7 @@ en: label: "Label" short: "Short name" parent: "Parent" + blueprint: "Pattern blueprint" global_search: placeholder: "Search in %{app_title}" @@ -508,6 +513,7 @@ en: my: access_token: create_dialog: + title: Token generated header: The %{type} token has been generated warning: Note that this is the only time you will see this token, make sure to copy it now. errors: @@ -716,6 +722,7 @@ en: title: "Workflow missing for work package sharing" message: "No workflow is configured for the 'Work package editor' role. Without a workflow, the shared with user cannot alter the status of the work package. Workflows can be copied. Select a source type (e.g. 'Task') and source role (e.g. 'Member'). Then select the target types. To start with, you could select all the types as targets. Finally, select the 'Work package editor' role as the target and press 'Copy'. After having thus created the defaults, fine tune the workflows as you do for every other role." link_message: "Configure the workflows in the administration." + templated_subject_hint: Automatically generated through type %{type} summary: reports: @@ -740,14 +747,15 @@ en: no_results_title_text: There are currently no relations available. blankslate_heading: "No relations" blankslate_description: "This work package does not have any relations yet." + label_add_child_button: "Child" label_add_x: "Add %{x}" label_edit_x: "Edit %{x}" label_add_description: "Add description" lag: subject: "Lag" - title: "Lag (in days)" caption: "The minimum number of working days to keep in between the two work packages." relations: + label_new_child_created: "New work package created and added as a child" label_relates_singular: "related to" label_relates_plural: "related to" label_relates_to_singular: "related to" @@ -762,6 +770,9 @@ en: follows_description: "The related work package necessarily needs to finish before this one can start" label_child_singular: "child" label_child_plural: "children" + new_child: "New child" + new_child_text: "Creates a related work package as a sub-item of the current (parent) work package" + existing_child: "Existing child" child_description: "Makes the related work package a sub-item of the current (parent) work package" label_blocks_singular: "blocks" label_blocks_plural: "blocks" @@ -799,6 +810,8 @@ en: label_parent_singular: "parent" label_parent_plural: "parent" + ghost_relation_title: "Related work package" + ghost_relation_description: "This is not visible to you due to permissions." label_invitation: Invitation account: @@ -870,6 +883,7 @@ en: is_required: "Required" max_length: "Maximum length" min_length: "Minimum length" + content_right_to_left: "Right-to-Left content" multi_value: "Allow multi-select" possible_values: "Possible values" regexp: "Regular expression" @@ -905,6 +919,8 @@ en: attr_lastname: "Lastname attribute" attr_login: "Username attribute" attr_mail: "Email attribute" + filter_string: "Filter string" + admin: "Administrator" base_dn: "Base DN" host: "Host" onthefly: "Automatic user creation" @@ -948,6 +964,9 @@ en: project_custom_field: is_required: "Required for all projects" custom_field_section: Section + project/life_cycle_step_definition: + name: "Name" + color: "Color" query: column_names: "Columns" relations_to_type_column: "Relations to %{type}" @@ -957,7 +976,7 @@ en: timeline_labels: "Timeline labels" relation: lag: "Lag" - from: "Work package" + from: "Related work package" to: "Related work package" reminder: remind_at_date: "Date" @@ -1282,12 +1301,16 @@ en: typed_dag: circular_dependency: "The relationship creates a circle of relationships." attributes: - to: - error_not_found: "work package in `to` position not found or not visible" - error_readonly: "an existing relation's `to` link is immutable" - from: - error_not_found: "work package in `from` position not found or not visible" - error_readonly: "an existing relation's `from` link is immutable" + to_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + from_id: + error_not_found: "not found or not visible." + error_readonly: "cannot be changed for existing relations." + lag: + greater_than_or_equal_to: + zero: "cannot be negative." + less_than_or_equal_to: "is too high." repository: not_available: "SCM vendor is not available" not_whitelisted: "is not allowed by the configuration." @@ -1653,8 +1676,9 @@ en: button_copy_and_follow: "Copy and follow" button_create: "Create" button_create_and_continue: "Create and continue" - button_delete: "Delete" button_decline: "Decline" + button_delete: "Delete" + button_delete_permanently: "Delete permanently" button_delete_watcher: "Delete watcher %{name}" button_download: "Download" button_duplicate: "Duplicate" @@ -1862,6 +1886,9 @@ en: hour: one: "hour" other: "hours" + day: + one: "day" + other: "days" description_active: "Active?" description_attachment_toggle: "Show/Hide attachments" @@ -1903,6 +1930,10 @@ en: upsale: title: "Enterprise add-on" link_title: "More information" + automatic_subject_generation: + description: "Create automatically generated subjects using referenced attributes and text." + customize_life_cycle: + description: "Create and organize different project stages and gates than the ones provided by PM2 project cycle planning." form_configuration: description: "Customize the form configuration with these additional add-ons:" add_groups: "Add new attribute groups" @@ -2285,6 +2316,7 @@ en: label_add_subtask: "Add subtask" label_added: "added" label_added_by: "Added by %{author}" + label_added_by_on: "Added by %{author} on %{date}" label_added_time_by: "Added by %{author} %{age} ago" label_additional_workflow_transitions_for_assignee: "Additional transitions allowed when the user is the assignee" label_additional_workflow_transitions_for_author: "Additional transitions allowed when the user is the author" @@ -2705,6 +2737,7 @@ en: label_project_new: "New project" label_project_plural: "Projects" label_project_list_plural: "Project lists" + label_project_lifecycle: "Project lifecycle" label_project_attributes_plural: "Project attributes" label_project_custom_field_plural: "Project attributes" label_project_settings: "Project settings" @@ -2731,6 +2764,7 @@ en: label_relation: "Relation" label_relation_actions: "Relation actions" label_relation_delete: "Delete relation" + label_relation_edit: "Edit relation" label_relation_new: "New relation" label_release_notes: "Release notes" label_remaining_work: "Remaining work" @@ -3158,6 +3192,7 @@ en: notice_bad_request: "Bad Request." notice_not_authorized: "You are not authorized to access this page." notice_not_authorized_archived_project: "The project you're trying to access has been archived." + notice_requires_enterprise_token: "Enterprise token missing or doesn't allow access to this page." notice_password_confirmation_failed: "Your password is not correct. Cannot continue." notice_principals_found_multiple: "There are %{number} results found. \n Tab to focus the first result." notice_principals_found_single: "There is one result. \n Tab to focus it." @@ -3210,7 +3245,7 @@ en: welcome: "Welcome to %{app_title}" select_language: "Please select your language" - permission_add_work_package_notes: "Add notes" + permission_add_work_package_notes: "Add comments" permission_add_work_packages: "Add work packages" permission_add_messages: "Post messages" permission_add_project: "Create projects" @@ -3240,10 +3275,11 @@ en: permission_delete_timelines: "Delete timelines" permission_delete_wiki_pages: "Delete wiki pages" permission_delete_wiki_pages_attachments: "Delete attachments" - permission_edit_work_package_notes: "Edit notes" + permission_edit_work_package_notes: "Moderate comments" + permission_edit_work_package_notes_explanation: "Caution: Users with this permission are able to edit anyone's comment." permission_edit_work_packages: "Edit work packages" permission_edit_messages: "Edit messages" - permission_edit_own_work_package_notes: "Edit own notes" + permission_edit_own_work_package_notes: "Edit own comments" permission_edit_own_messages: "Edit own messages" permission_edit_own_time_entries: "Edit own time logs" permission_edit_project: "Edit project" @@ -3339,9 +3375,9 @@ en: are_you_sure: "Are you sure you want to archive the project '%{name}'?" archived: "Archived" count: - zero: "0 Projects" - one: "1 Project" - other: "%{count} Projects" + zero: "0 projects" + one: "1 project" + other: "%{count} projects" project_module_activity: "Activity" project_module_forums: "Forums" @@ -3484,6 +3520,7 @@ en: search_input_placeholder: "Search ..." + setting_apiv3_cors_title: "Cross-Origin Resource Sharing (CORS)" setting_apiv3_cors_enabled: "Enable CORS" setting_apiv3_cors_origins: "API V3 Cross-Origin Resource Sharing (CORS) allowed origins" setting_apiv3_cors_origins_text_html: > @@ -3759,6 +3796,27 @@ en: new: heading: "New attribute" description: "Changes to this project attribute will be reflected in all projects where it is enabled. Required attributes cannot be disabled on a per-project basis." + project_life_cycle_step_definitions: + heading: "Project lifecycle" + heading_description: "The project lifecycle consists of stages and gates that structure your projects. They will appear in the overview page of a project and be available in the projects list. Individual stages and gates can be selected to customize a project but reordering is not possible on a project level." + label_add: "Add" + label_add_description: "Add lifecycle definition" + label_add_stage: "Stage" + label_add_gate: "Gate" + filter: + label: "Search project stage or gate" + section_header: "Stages and gates" + non_defined: "Neither stages nor gates are currently defined." + new: + description: "Changes to this project step will be reflected in all projects where it is enabled." + new_stage: + heading: "New stage" + new_gate: + heading: "New gate" + edit_stage: + heading: "Edit stage" + edit_gate: + heading: "Edit gate" projects: missing_dependencies: "Project module %{module} was checked which depends on %{dependencies}. You need to check these dependencies as well." section_new_projects: "Settings for new projects" @@ -3796,6 +3854,7 @@ en: text_are_you_sure_continue: "Are you sure you want to continue?" text_are_you_sure_with_children: "Delete work package and all child work packages?" text_are_you_sure_with_project_custom_fields: "Deleting this attribute will also delete its values in all projects. Are you sure you want to do this?" + text_are_you_sure_with_project_life_cycle_step: "Deleting this step will also delete its usages in all projects. Are you sure you want to do this?" text_assign_to_project: "Assign to the project" text_form_configuration: > You can customize which fields will be displayed in work package forms. @@ -3900,6 +3959,7 @@ en: The badge will check your current OpenProject version against the official OpenProject release database to alert you of any updates or known vulnerabilities. For more information on what the check provides, what data is needed to provide available updates, and how to disable this check, please visit the configuration documentation. text_own_membership_delete_confirmation: "You are about to remove some or all of your permissions and may no longer be able to edit this project after that.\nAre you sure you want to continue?" + text_permanent_delete_confirmation_checkbox_label: "I understand that this deletion cannot be reversed" text_plugin_assets_writable: "Plugin assets directory writable" text_powered_by: "Powered by %{link}" text_project_identifier_info: "Only lower case letters (a-z), numbers, dashes and underscores are allowed, must start with a lower case letter." @@ -4313,6 +4373,8 @@ en: builtin: Built-in instance application confidential: Confidential singular: "OAuth application" + scopes: "Scopes" + client_credentials: "Client credentials" plural: "OAuth applications" named: "OAuth application '%{name}'" new: "New OAuth application" diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml index fd80166a7665..a73a2f719f12 100644 --- a/config/locales/js-en.yml +++ b/config/locales/js-en.yml @@ -400,17 +400,16 @@ en: learn_about: "Learn more about the new features" # Include the version to invalidate outdated translations in other locales. # Otherwise, e.g. chinese might still have the translations for 10.0 in the 12.0 release. - "15_2": + "15_3": standard: new_features_html: > The release brings various features and improvements for you, e.g.
        -
      • Set reminders for work packages to generate date alert notifications.
        • -
      • Create new folders directly from the location picker for file storage.
        • -
      • Specify a required lag between work packages successors and predecessors.
        • -
      • Enable ordering and grouping for work packages on values of custom fields type hierarchy.
        • -
      • Export time entries as PDF timesheets.
        • -
      • Add a popover displaying user information when hovering.
        • +
      • Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments.
        • +
      • Create child work packages directly from the Relations tab.
        • +
      • Include total sums in timesheet PDF exports for better insights.
        • +
      • Include child work packages in cost reports for more accurate tracking.
        • +
      • See dates of previously hidden, permission-restricted relations to make informed scheduling decisions.
      ical_sharing_modal: diff --git a/config/routes.rb b/config/routes.rb index c7b9f9d1014c..d04b116b2c1a 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -129,13 +131,18 @@ get "/roles/workflow/:id/:role_id/:type_id" => "roles#workflow" - get "/types/:id/edit/:tab" => "types#edit", - as: "edit_type_tab" - match "/types/:id/update/:tab" => "types#update", - as: "update_type_tab", - via: %i[post patch] resources :types do - post "move/:id", action: "move", on: :collection + member do + get "edit/:tab" => "types#edit", as: "edit_tab" + match "update/:tab" => "types#update", as: "update_tab", via: %i[post patch] + put :subject_configuration, + controller: "work_packages/types/subject_configuration", + action: "update_subject_configuration" + end + + collection do + post "move/:id", action: "move" + end end resources :statuses, except: :show @@ -339,12 +346,19 @@ end # states managed by client-side routing on work_package#index - get "(/*state)" => "work_packages#index", on: :collection, as: "" + get "(/*state)" => "work_packages#index", on: :collection, as: "", constraints: { state: /(?!(dialog)).+/ } + get "/create_new" => "work_packages#index", on: :collection, as: "new_split" get "/new" => "work_packages#index", on: :collection, as: "new" # state for show view in project context - get "(/*state)" => "work_packages#show", on: :member, as: "" + get "(/*state)" => "work_packages#show", on: :member, as: "", constraints: { id: /\d+/, state: /(?!(dialog)).+/ } + end + + namespace :work_packages do + resource :dialog, only: %i[new create] do + post :refresh_form + end end resources :activity, :activities, only: :index, controller: "activities" do @@ -514,6 +528,19 @@ resource :progress_tracking, controller: "/admin/settings/progress_tracking", only: %i[show update] resource :projects, controller: "/admin/settings/projects_settings", only: %i[show update] resource :new_project, controller: "/admin/settings/new_project_settings", only: %i[show update] + resources :project_life_cycle_step_definitions, + path: "project_life_cycle", + controller: "/admin/settings/project_life_cycle_step_definitions", + only: %i[index create edit update destroy] do + collection do + get :new_stage + get :new_gate + end + member do + patch :move + put :drop # should be patch, but requires passing method to generic-drag-and-drop controller + end + end resources :project_custom_fields, controller: "/admin/settings/project_custom_fields" do member do delete "options/:option_id", action: "delete_option", as: :delete_option_of @@ -527,9 +554,6 @@ delete :unlink end end - # TODO: This is for now only added to be able to create a link - # There is no controller behind this. - resources :project_life_cycle_step_definitions, path: "project_life_cycles", only: %i[index] resources :project_custom_field_sections, controller: "/admin/settings/project_custom_field_sections", only: %i[create update destroy] do member do @@ -634,6 +658,9 @@ get "/split_view/update_counter" => "work_packages/split_view#update_counter", on: :member + get "/split_view/get_relations_counter" => "work_packages/split_view#get_relations_counter", + on: :member + # states managed by client-side (angular) routing on work_package#show get "/" => "work_packages#index", on: :collection, as: "index" get "/create_new" => "work_packages#index", on: :collection, as: "new_split" diff --git a/config/static_links.yml b/config/static_links.yml new file mode 100644 index 000000000000..97699a849b4f --- /dev/null +++ b/config/static_links.yml @@ -0,0 +1,174 @@ +upsale: + href: https://www.openproject.org/enterprise-edition + label: homescreen.links.upgrade_enterprise_edition +upsale_benefits_features: + href: https://www.openproject.org/enterprise-edition/#premium-features + label: noscript_learn_more +upsale_benefits_installation: + href: https://www.openproject.org/enterprise-edition/#installation + label: noscript_learn_more +upsale_benefits_security: + href: https://www.openproject.org/enterprise-edition/#security-features + label: noscript_learn_more +upsale_benefits_support: + href: https://www.openproject.org/enterprise-edition/#professional-support + label: noscript_learn_more +upsale_get_quote: + href: https://www.openproject.org/request-quote/ + label: admin.enterprise.get_quote +user_guides: + href: https://www.openproject.org/docs/user-guide/ + label: homescreen.links.user_guides +installation_guides: + href: https://www.openproject.org/docs/installation-and-operations/installation/ + label: :label_installation_guides +packager_installation: + href: https://www.openproject.org/docs/installation-and-operations/installation/packaged/ + label: Packaged installation +docker_installation: + href: https://www.openproject.org/docs/installation-and-operations/installation/docker/ + label: Docker installation +manual_installation: + href: https://www.openproject.org/docs/installation-and-operations/installation/manual/ + label: Manual installation +upgrade_guides: + href: https://www.openproject.org/docs/installation-and-operations/operation/upgrading/ + label: :label_upgrade_guides +postgres_migration: + href: https://www.openproject.org/docs/installation-and-operations/misc/packaged-postgresql-migration/ + label: :homescreen.links.postgres_migration +postgres_13_upgrade: + href: https://www.openproject.org/docs/installation-and-operations/misc/migration-to-postgresql13/ +configuration_guide: + href: https://www.openproject.org/docs/installation-and-operations/configuration/ + label: links.configuration_guide +contact: + href: https://www.openproject.org/contact/ + label: links.get_in_touch +glossary: + href: https://www.openproject.org/docs/glossary/ + label: homescreen.links.glossary +shortcuts: + href: https://www.openproject.org/docs/user-guide/keyboard-shortcuts-access-keys/ + label: homescreen.links.shortcuts +forums: + href: https://community.openproject.org/projects/openproject/forums + label: homescreen.links.forums +enterprise_support_as_community: + href: https://www.openproject.org/pricing/#support + label: :label_enterprise_support +enterprise_support: + href: https://www.openproject.org/docs/enterprise-guide/support/ + label: :label_enterprise_support +website: + href: https://www.openproject.org + label: label_openproject_website +newsletter: + href: https://www.openproject.org/newsletter + label: homescreen.links.newsletter +blog: + href: https://www.openproject.org/blog + label: homescreen.links.blog +blog_article_progress_changes: + href: https://www.openproject.org/blog/updates-to-progress-tracking-in-14-4-based-on-user-feedback/ + label: Significant changes to progress and work estimates +release_notes: + href: https://www.openproject.org/docs/release-notes/ + label: :label_release_notes +release_notes_14_0_1: + href: https://www.openproject.org/docs/release-notes/14/14-0-1/ + label: Release notes for OpenProject 14.0.1 +data_privacy: + href: https://www.openproject.org/legal/privacy/ + label: :label_privacy_policy +digital_accessibility: + href: https://www.openproject.org/de/rechtliches/erklaerung-zur-digitalen-barrierefreiheit/ + label: :label_digital_accessibility +report_bug: + href: https://www.openproject.org/docs/development/report-a-bug/ + label: :label_report_bug +roadmap: + href: https://community.openproject.org/projects/openproject/roadmap + label: :label_development_roadmap +crowdin: + href: https://www.openproject.org/docs/contributions-guide/translate-openproject/ + label: :label_add_edit_translations +api_docs: + href: https://www.openproject.org/docs/api/ + label: :label_api_doc +text_formatting: + href: https://www.openproject.org/docs/user-guide/wysiwyg/ + label: :setting_text_formatting +oauth_authorization_code_flow: + href: https://oauth.net/2/grant-types/authorization-code/ + label: oauth.flows.authorization_code +client_credentials_code_flow: + href: https://oauth.net/2/grant-types/client-credentials/ + label: oauth.flows.client_credentials +ldap_encryption_documentation: + href: https://www.rubydoc.info/gems/net-ldap/Net/LDAP#constructor_details +origin_mdn_documentation: + href: https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin +security_badge_documentation: + href: https://www.openproject.org/docs/system-admin-guide/information/#security-badge +date_format_settings_documentation: + href: https://www.openproject.org/docs/system-admin-guide/calendars-and-dates/#date-format +chargebee: + href: https://js.chargebee.com/v2/chargebee.js +webinar_videos: + href: https://www.youtube.com/watch?v=un6zCm8_FT4 +get_started_videos: + href: https://www.youtube.com/playlist?list=PLGzJ4gG7hPb8WWOWmeXqlfMfhdXReu-RJ +openproject_docs: + href: https://www.openproject.org/docs/ +contact_us: + href: https://www.openproject.org/contact/ +pricing: + href: https://www.openproject.org/pricing/ +progress_tracking_docs: + href: https://www.openproject.org/docs/user-guide/time-and-costs/progress-tracking/ +enterprise_docs: + automatic_subject_generation: + href: https://www.openproject.org/docs/system-admin-guide/manage-work-packages/work-package-types/#work-package-subject-configuration-enterprise-add-on + form_configuration: + href: https://www.openproject.org/docs/system-admin-guide/manage-work-packages/work-package-types/#work-package-form-configuration-enterprise-add-on + attribute_highlighting: + href: https://www.openproject.org/docs/user-guide/work-packages/work-package-table-configuration/#attribute-highlighting-enterprise-add-on + boards: + href: https://www.openproject.org/docs/user-guide/agile-boards/#action-boards-enterprise-add-on + custom_field_projects: + href: https://www.openproject.org/docs/system-admin-guide/custom-fields/custom-fields-projects/ + custom_field_multiselect: + href: https://www.openproject.org/docs/system-admin-guide/custom-fields/#create-a-multi-select-custom-field + status_read_only: + href: https://www.openproject.org/docs/system-admin-guide/manage-work-packages/work-package-status/#create-a-new-work-package-status + customize_life_cycle: + href: https://www.openproject.org/enterprise-edition +sysadmin_docs: + saml: + href: https://www.openproject.org/docs/system-admin-guide/authentication/saml/ + oidc: + href: https://www.openproject.org/docs/installation-and-operations/misc/custom-openid-connect-providers/ + oidc_claims: + href: https://www.openproject.org/docs/installation-and-operations/misc/custom-openid-connect-providers/#claims + oidc_acr_values: + href: https://www.openproject.org/docs/installation-and-operations/misc/custom-openid-connect-providers/#non-essential-claims +storage_docs: + nextcloud_setup: + href: https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/ + one_drive_setup: + href: https://www.openproject.org/docs/system-admin-guide/integrations/one-drive/ + one_drive_drive_id_guide: + href: https://www.openproject.org/docs/system-admin-guide/integrations/one-drive/drive-guide/ + nextcloud_oauth_application: + href: https://apps.nextcloud.com/apps/integration_openproject + one_drive_oauth_application: + href: https://portal.azure.com/ + troubleshooting: + href: https://www.openproject.org/docs/user-guide/file-management/nextcloud-integration/#possible-errors-and-troubleshooting + health_status: + href: https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/health-status/ +ical_docs: + href: https://www.openproject.org/docs/user-guide/calendar/#subscribe-to-a-calendar +integrations: + href: https://www.openproject.org/docs/system-admin-guide/integrations/ diff --git a/db/migrate/20221115082403_add_ldap_tls_options.rb b/db/migrate/20221115082403_add_ldap_tls_options.rb index 9ca761ec9526..898576e44727 100644 --- a/db/migrate/20221115082403_add_ldap_tls_options.rb +++ b/db/migrate/20221115082403_add_ldap_tls_options.rb @@ -42,7 +42,7 @@ def change # Current LDAP library default is to not verify the certificate MigratingAuthSource.reset_column_information - ldap_settings = Setting.find_by(name: "ldap_tls_options")&.value + ldap_settings = Setting.where(name: "ldap_tls_options").pick :value migrate_ldap_settings(ldap_settings) end end diff --git a/db/migrate/20241202112406_create_good_job_execution_error_backtrace.rb b/db/migrate/20241202112406_create_good_job_execution_error_backtrace.rb new file mode 100644 index 000000000000..6b054b640601 --- /dev/null +++ b/db/migrate/20241202112406_create_good_job_execution_error_backtrace.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class CreateGoodJobExecutionErrorBacktrace < ActiveRecord::Migration[7.1] + def change + reversible do |dir| + dir.up do + # Ensure this incremental update migration is idempotent + # with monolithic install migration. + return if connection.column_exists?(:good_job_executions, :error_backtrace) + end + end + + add_column :good_job_executions, :error_backtrace, :text, array: true + end +end diff --git a/db/migrate/20241202112407_create_good_job_process_lock_ids.rb b/db/migrate/20241202112407_create_good_job_process_lock_ids.rb new file mode 100644 index 000000000000..f1b70a8f2e43 --- /dev/null +++ b/db/migrate/20241202112407_create_good_job_process_lock_ids.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +class CreateGoodJobProcessLockIds < ActiveRecord::Migration[7.1] + def change + reversible do |dir| + dir.up do + # Ensure this incremental update migration is idempotent + # with monolithic install migration. + return if connection.column_exists?(:good_jobs, :locked_by_id) + end + end + + add_column :good_jobs, :locked_by_id, :uuid + add_column :good_jobs, :locked_at, :datetime + add_column :good_job_executions, :process_id, :uuid + add_column :good_job_processes, :lock_type, :integer, limit: 2 + end +end diff --git a/db/migrate/20241202112408_create_good_job_process_lock_indexes.rb b/db/migrate/20241202112408_create_good_job_process_lock_indexes.rb new file mode 100644 index 000000000000..89fbe6e00369 --- /dev/null +++ b/db/migrate/20241202112408_create_good_job_process_lock_indexes.rb @@ -0,0 +1,52 @@ +# frozen_string_literal: true + +class CreateGoodJobProcessLockIndexes < ActiveRecord::Migration[7.1] + disable_ddl_transaction! + + # rubocop:disable Metrics/AbcSize + def change + reversible do |dir| + dir.up do + unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked) + add_index :good_jobs, %i[priority scheduled_at], + order: { priority: "ASC NULLS LAST", scheduled_at: :asc }, + where: "finished_at IS NULL AND locked_by_id IS NULL", + name: :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked, + algorithm: :concurrently + end + + unless connection.index_name_exists?(:good_jobs, :index_good_jobs_on_locked_by_id) + add_index :good_jobs, :locked_by_id, + where: "locked_by_id IS NOT NULL", + name: :index_good_jobs_on_locked_by_id, + algorithm: :concurrently + end + + unless connection.index_name_exists?(:good_job_executions, :index_good_job_executions_on_process_id_and_created_at) + add_index :good_job_executions, %i[process_id created_at], + name: :index_good_job_executions_on_process_id_and_created_at, + algorithm: :concurrently + end + end + + dir.down do + if connection.index_name_exists?( + :good_jobs, :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked + ) + remove_index(:good_jobs, name: :index_good_jobs_on_priority_scheduled_at_unfinished_unlocked) + end + + if connection.index_name_exists?(:good_jobs, :index_good_jobs_on_locked_by_id) + remove_index(:good_jobs, name: :index_good_jobs_on_locked_by_id) + end + + if connection.index_name_exists?( + :good_job_executions, :index_good_job_executions_on_process_id_and_created_at + ) + remove_index(:good_job_executions, name: :index_good_job_executions_on_process_id_and_created_at) + end + end + end + end + # rubocop:enable Metrics/AbcSize +end diff --git a/db/migrate/20241202112409_create_good_job_execution_duration.rb b/db/migrate/20241202112409_create_good_job_execution_duration.rb new file mode 100644 index 000000000000..fef37f07bc1f --- /dev/null +++ b/db/migrate/20241202112409_create_good_job_execution_duration.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +class CreateGoodJobExecutionDuration < ActiveRecord::Migration[7.1] + def change + reversible do |dir| + dir.up do + # Ensure this incremental update migration is idempotent + # with monolithic install migration. + return if connection.column_exists?(:good_job_executions, :duration) + end + end + + add_column :good_job_executions, :duration, :interval + end +end diff --git a/db/migrate/20250128164217_remove_is_default_for_time_entry_activities.rb b/db/migrate/20250128164217_remove_is_default_for_time_entry_activities.rb new file mode 100644 index 000000000000..564544a085a3 --- /dev/null +++ b/db/migrate/20250128164217_remove_is_default_for_time_entry_activities.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class RemoveIsDefaultForTimeEntryActivities < ActiveRecord::Migration[7.1] + def up + execute <<~SQL.squish + UPDATE "enumerations" + SET "is_default" = false + WHERE "type" = 'TimeEntryActivity' + SQL + end +end diff --git a/db/migrate/migration_utils/permission_adder.rb b/db/migrate/migration_utils/permission_adder.rb index e0d173584552..61c35cf19551 100644 --- a/db/migrate/migration_utils/permission_adder.rb +++ b/db/migrate/migration_utils/permission_adder.rb @@ -31,18 +31,30 @@ module MigrationUtils module PermissionAdder module_function - def add(having, add) - Role + def add(having, add) # rubocop:disable Metrics/AbcSize + added_permission = OpenProject::AccessControl.permission(add) + + if added_permission.blank? + OpenProject.logger.warn("Permission #{add} is not a valid permission in use. Skipping...") + return + end + + role_scope = Role .joins(:role_permissions) .where(role_permissions: { permission: having.to_s }) .references(:role_permissions) - .find_each do |role| + + role_scope.find_each do |role| # Check if the add-permission already exists before adding - already_exists = RolePermission - .exists?(role_id: role.id, permission: add.to_s) - unless already_exists - role.add_permission! add - end + next if RolePermission.exists?(role_id: role.id, permission: add.to_s) + + # we cannot add permissions that require a member to a non-member role + next if added_permission.require_member? && role.builtin == Role::BUILTIN_NON_MEMBER + + # we cannot add permissions that require a logged in user to an anonymous role + next if added_permission.require_loggedin? && role.builtin == Role::BUILTIN_ANONYMOUS + + role.add_permission! add end end end diff --git a/docker/ci/Dockerfile b/docker/ci/Dockerfile index 18f9e7d81e24..5efbcdc03c16 100644 --- a/docker/ci/Dockerfile +++ b/docker/ci/Dockerfile @@ -3,7 +3,7 @@ ARG RUBY_VERSION FROM ruby:${RUBY_VERSION}-bookworm ENV NODE_VERSION="20.9.0" -ENV BUNDLER_VERSION="2.5.13" +ENV BUNDLER_VERSION="2.6.3" ENV DEBIAN_FRONTEND=noninteractive ENV BUNDLE_WITHOUT="development:production:docker" @@ -11,8 +11,7 @@ ENV PGVERSION=13 RUN wget --quiet -O- https://www.postgresql.org/media/keys/ACCC4CF8.asc | apt-key add - && \ echo "deb http://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" > /etc/apt/sources.list.d/pgdg.list -# Temporarily use a mirror for Chrome until the official one is not having the problems to spin up sessions with selenium any more. -ENV CHROME_SOURCE_URL="https://mirror.cs.uchicago.edu/google-chrome/pool/main/g/google-chrome-stable/google-chrome-stable_131.0.6778.85-1_amd64.deb" +ENV CHROME_SOURCE_URL="https://dl.google.com/dl/linux/direct/google-chrome-stable_current_amd64.deb" RUN --mount=type=cache,target=/var/cache/apt export f="/tmp/chrome.deb" && wget --no-verbose -O $f $CHROME_SOURCE_URL && \ apt-get update -qq && apt-get install -y "$f" postgresql-$PGVERSION postgresql-client-$PGVERSION time imagemagick default-jre-headless firefox-esr && \ rm -f "$f" && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /var/lib/postgresql && find /usr/share/locale/* -maxdepth 0 -type d ! -name 'en' -exec rm -rf {} \; diff --git a/docker/dev/backend/Dockerfile b/docker/dev/backend/Dockerfile index d1e2b2f9422f..c7d2002f1f03 100644 --- a/docker/dev/backend/Dockerfile +++ b/docker/dev/backend/Dockerfile @@ -1,4 +1,4 @@ -FROM ruby:3.3.4-bullseye AS develop +FROM ruby:3.4.1-bullseye AS develop MAINTAINER operations@openproject.com ARG DEV_UID=1000 @@ -8,7 +8,7 @@ ENV USER=dev ENV RAILS_ENV=development ENV NODE_MAJOR=20 -ENV BUNDLER_VERSION "2.5.13" +ENV BUNDLER_VERSION "2.6.3" # `--no-log-init` is required as a workaround to avoid disk exhaustion. # diff --git a/docker/dev/keycloak/docker-compose.yml b/docker/dev/keycloak/docker-compose.yml index e866e614c140..587e93744ab8 100644 --- a/docker/dev/keycloak/docker-compose.yml +++ b/docker/dev/keycloak/docker-compose.yml @@ -6,14 +6,16 @@ services: restart: unless-stopped networks: - external + volumes: + - "pgdata:/var/lib/postgresql/data" environment: - POSTGRES_DB=keycloak - POSTGRES_USER=keycloak - POSTGRES_PASSWORD=keycloak keycloak: - image: quay.io/keycloak/keycloak:21.1 - command: ["start-dev", "--proxy edge", "--spi-connections-http-client-default-disable-trust-manager=true"] + image: quay.io/keycloak/keycloak:26.1 + command: ["start-dev", "--proxy-headers", "xforwarded", "--spi-connections-http-client-default-disable-trust-manager=true"] restart: unless-stopped networks: - external @@ -44,6 +46,7 @@ services: volumes: keycloak-data: + pgdata: networks: external: diff --git a/docker/prod/Dockerfile b/docker/prod/Dockerfile index 4bb22a22851a..a49f47967f59 100755 --- a/docker/prod/Dockerfile +++ b/docker/prod/Dockerfile @@ -1,8 +1,8 @@ -ARG RUBY_VERSION="3.3.4" +ARG RUBY_VERSION="3.4.1" FROM ruby:${RUBY_VERSION}-bookworm AS base LABEL maintainer="operations@openproject.com" -ARG BUNDLER_VERSION="2.5.13" +ARG BUNDLER_VERSION="2.6.3" ARG NODE_VERSION="20.9.0" ARG BIM_SUPPORT=true ENV USE_JEMALLOC=false diff --git a/docker/prod/setup/bundle-install.sh b/docker/prod/setup/bundle-install.sh index d2c0d740ee15..b8792a7a5221 100644 --- a/docker/prod/setup/bundle-install.sh +++ b/docker/prod/setup/bundle-install.sh @@ -4,8 +4,8 @@ set -e # temporary 'seed' for working ppc64 cached vendor/bundle if [ ! -d vendor/bundle ] && [ -n "$(uname -a | grep ppc64)" ]; then - wget https://openproject-public.s3.eu-central-1.amazonaws.com/ruby/bundle/openproject-release-15.2-836aec00b1-vendor-bundle.tar.gz - tar -xf openproject-release-15.2-836aec00b1-vendor-bundle.tar.gz + wget https://openproject-public.s3.eu-central-1.amazonaws.com/ruby/bundle/openproject-release-15.3-76b61cf4-vendor-bundle.tar.gz + tar -xf openproject-*-vendor-bundle.tar.gz fi bundle config set --local path 'vendor/bundle' diff --git a/docker/prod/supervisord b/docker/prod/supervisord index 6d5cc800d3b7..086b2f44876b 100755 --- a/docker/prod/supervisord +++ b/docker/prod/supervisord @@ -96,6 +96,18 @@ configure_local_postgres() { # remove any dangling pid rm -f $PGDATA/postmaster.pid + if [ ! -d /etc/postgresql/$PGVERSION ]; then + echo "No cluster configuration found for postgres $PGVERSION. Creating configuration." + pg_createcluster $PGVERSION main + + # remove config we will set further down + sed -i '/^port =/d' /etc/postgresql/$PGVERSION/main/postgresql.conf + sed -i '/^data_directory =/d' /etc/postgresql/$PGVERSION/main/postgresql.conf + + # remove unused data directory + rm -rf /var/lib/postgresql/$PGVERSION/main + fi + # Set up pg defaults echo "host all all 0.0.0.0/0 md5" >> /etc/postgresql/$PGVERSION/main/pg_hba.conf echo "listen_addresses='0.0.0.0'" >> "$PGCONF_FILE" diff --git a/docs/api/apiv3/components/schemas/time_entry_collection_model.yml b/docs/api/apiv3/components/schemas/time_entry_collection_model.yml index ed942c2b55a4..b3d204ece0d1 100644 --- a/docs/api/apiv3/components/schemas/time_entry_collection_model.yml +++ b/docs/api/apiv3/components/schemas/time_entry_collection_model.yml @@ -2,7 +2,7 @@ --- type: object allOf: - - $ref: './collection_model.yml' + - $ref: "./collection_model.yml" - type: object required: - _links @@ -28,7 +28,7 @@ allOf: elements: type: array items: - $ref: './time_entry_model.yml' + $ref: "./time_entry_model.yml" examples: - _type: Collection @@ -44,10 +44,12 @@ examples: format: plain raw: Some comment html: "

      Some comment

      " - spentOn: '2015-03-20' + spentOn: "2015-03-20" hours: PT5H - createdAt: '2015-03-20T12:56:56.803Z' - updatedAt: '2015-03-20T12:56:56.803Z' + startTime: "2015-03-20T10:00:00.000Z" + endTime: "2015-03-20T15:00:00.000Z" + createdAt: "2015-03-20T12:56:56.803Z" + updatedAt: "2015-03-20T12:56:56.803Z" _links: self: href: "/api/v3/time_entries/1" @@ -75,10 +77,12 @@ examples: format: plain raw: Another comment html: "

      Another comment

      " - spentOn: '2015-03-21' + spentOn: "2015-03-21" hours: PT7H - createdAt: '2015-03-20T12:56:56.569Z' - updatedAt: '2015-03-20T12:56:56.371Z' + startTime: "2015-03-20T15:00:00.000Z" + endTime: "2015-03-20T22:00:00.000Z" + createdAt: "2015-03-20T12:56:56.569Z" + updatedAt: "2015-03-20T12:56:56.371Z" _links: self: href: "/api/v3/time_entries/2" diff --git a/docs/api/apiv3/components/schemas/time_entry_model.yml b/docs/api/apiv3/components/schemas/time_entry_model.yml index 77bb87788a6f..485399c94f5c 100644 --- a/docs/api/apiv3/components/schemas/time_entry_model.yml +++ b/docs/api/apiv3/components/schemas/time_entry_model.yml @@ -8,7 +8,7 @@ properties: minimum: 1 comment: allOf: - - $ref: './formattable.yml' + - $ref: "./formattable.yml" - description: A comment to the time entry spentOn: type: string @@ -25,6 +25,28 @@ properties: type: string format: date-time description: The time the time entry was created + startTime: + type: + - string + - "null" + format: date-time + description: |- + The time the time entry was started, or null if the time entry does not have a start time. + + The time is returned as UTC time, if presented to the user it should be converted to the user's timezone. + + This field is only available if the global `allow_tracking_start_and_end_times` setting is enabled. + endTime: + type: + - string + - "null" + format: date-time + description: |- + The time the time entry was ended, or null if the time entry does not have a start time. + + The time is returned as UTC time, if presented to the user it should be converted to the user's timezone. + + This field is only available if the global `allow_tracking_start_and_end_times` setting is enabled. updatedAt: type: string format: date-time @@ -39,14 +61,14 @@ properties: properties: self: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- This time entry **Resource**: TimeEntry updateImmediately: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- Directly perform edits on this time entry @@ -55,7 +77,7 @@ properties: **Permission**: 'edit time entries' or 'edit own time entries' if the time entry belongs to the user update: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- Form endpoint that aids in preparing and performing edits on a TimeEntry @@ -64,7 +86,7 @@ properties: **Permission**: 'edit time entries' or 'edit own time entries' if the time entry belongs to the user delete: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- Delete this time entry @@ -73,35 +95,35 @@ properties: **Permission**: 'edit time entries' or 'edit own time entries' if the time entry belongs to the user schema: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- The time entry schema **Resource**: Schema project: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- The project the time entry is bundled in. The project might be different from the work package's project once the workPackage is moved. **Resource**: Project workPackage: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- The work package the time entry is created on **Resource**: WorkPackage user: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- The user the time entry tracks expenditures for **Resource**: User activity: allOf: - - "$ref": './link.yml' + - "$ref": "./link.yml" - description: |- The time entry activity the time entry is categorized as @@ -114,33 +136,35 @@ examples: format: plain raw: "The force shall set me free." html: "

      The force shall set me free.

      " - spentOn: '2023-01-11' - hours: 'PT4H' - createdAt: '2023-01-11T13:58:24.927Z' - updatedAt: '2023-01-11T13:58:24.927Z' + spentOn: "2023-01-11" + hours: "PT4H" + startTime: "2023-01-11T09:58:00.000Z" + endTime: "2023-01-11T13:58:00.000Z" + createdAt: "2023-01-11T13:58:24.927Z" + updatedAt: "2023-01-11T13:58:24.927Z" _links: self: - href: '/api/v3/time_entries/42' + href: "/api/v3/time_entries/42" updateImmediately: - href: '/api/v3/time_entries/42' + href: "/api/v3/time_entries/42" method: patch update: - href: '/api/v3/time_entries/42/form' + href: "/api/v3/time_entries/42/form" method: post delete: - href: '/api/v3/time_entries/42' + href: "/api/v3/time_entries/42" method: delete schema: - href: '/api/v3/time_entries/schema' + href: "/api/v3/time_entries/schema" project: - href: '/api/v3/projects/11' + href: "/api/v3/projects/11" title: DeathStarV2 workPackage: - href: '/api/v3/work_packages/77' + href: "/api/v3/work_packages/77" title: Build new hangar user: - href: '/api/v3/users/3' + href: "/api/v3/users/3" title: Darth Vader activity: - href: '/api/v3/time_entries/activities/1' + href: "/api/v3/time_entries/activities/1" title: Management diff --git a/docs/contributions-guide/give-back-to-community/openproject-user-guide-create-project-plan.gif b/docs/contributions-guide/give-back-to-community/openproject-user-guide-create-project-plan.gif deleted file mode 100644 index 86bdb3c00e5b..000000000000 Binary files a/docs/contributions-guide/give-back-to-community/openproject-user-guide-create-project-plan.gif and /dev/null differ diff --git a/docs/contributions-guide/give-back-to-community/openproject-user-guide-edit-project-plan.gif b/docs/contributions-guide/give-back-to-community/openproject-user-guide-edit-project-plan.gif deleted file mode 100644 index 1e3e21b26a77..000000000000 Binary files a/docs/contributions-guide/give-back-to-community/openproject-user-guide-edit-project-plan.gif and /dev/null differ diff --git a/docs/contributions-guide/give-back-to-community/openproject-user-guide-select-gantt-charts-module.png b/docs/contributions-guide/give-back-to-community/openproject-user-guide-select-gantt-charts-module.png deleted file mode 100644 index 466e10d66b95..000000000000 Binary files a/docs/contributions-guide/give-back-to-community/openproject-user-guide-select-gantt-charts-module.png and /dev/null differ diff --git a/docs/development/development-environment/linux/README.md b/docs/development/development-environment/linux/README.md index 94e719700759..f42ab24c667e 100644 --- a/docs/development/development-environment/linux/README.md +++ b/docs/development/development-environment/linux/README.md @@ -40,10 +40,10 @@ sudo apt-get install git curl build-essential zlib1g-dev libyaml-dev libssl-dev Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby. You can check available ruby versions with `rbenv install --list`. -At the time of this writing, the latest stable version is `3.3.4`, which we also require. +At the time of this writing, the latest stable version is `3.4.1`, which we also require. We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.3.4` and install that version. +Read the first line e.g. `3.4.1` and install that version. #### Install rbenv and ruby-build @@ -76,22 +76,22 @@ git clone https://github.com/rbenv/ruby-build.git ~/.rbenv/plugins/ruby-build #### Installing ruby -With both installed, we can now install ruby. +With both installed, we can now install ruby. You can check available ruby versions with `rbenv install --list`. We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.3.4` and install that version. +Read the first line e.g. `3.4.1` and install that version. ```shell # Install the required version as read from the .ruby-version file -rbenv install 3.3.4 +rbenv install 3.4.1 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```shell -rbenv global 3.3.4 +rbenv global 3.4.1 rbenv rehash ``` @@ -181,10 +181,10 @@ You should now have an active ruby and node installation. Verify that it works w ```shell ruby --version -ruby 3.3.4 (2024-07-09 revision be1089c8ec) [arm64-darwin23] +ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] bundler --version -Bundler version 2.5.13 +Bundler version 2.6.3 node --version v20.9.0 diff --git a/docs/development/development-environment/macos/README.md b/docs/development/development-environment/macos/README.md index 279b6b71aa87..606a40284884 100644 --- a/docs/development/development-environment/macos/README.md +++ b/docs/development/development-environment/macos/README.md @@ -28,7 +28,7 @@ their homepage. Use [rbenv](https://github.com/rbenv/rbenv) and [ruby-build](https://github.com/rbenv/ruby-build#readme) to install Ruby. We always require the latest ruby versions, and you can check which version is required by [checking the Gemfile](https://github.com/opf/openproject/blob/dev/Gemfile#L31) for the `ruby "~> X.Y"` statement. At -the time of writing, this version is "3.3.4" +the time of writing, this version is "3.4.1" #### Install rbenv and ruby-build @@ -48,18 +48,18 @@ With both installed, we can now install the actual ruby version. You can check available ruby versions with `rbenv install --list`. We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.3.4` and install that version. +Read the first line e.g. `3.4.1` and install that version. ```shell # Install the required version as read from the .ruby-version file -rbenv install 3.3.4 +rbenv install 3.4.1 ``` This might take a while depending on whether ruby is built from source. After it is complete, you need to tell rbenv to globally activate this version ```shell -rbenv global 3.3.4 +rbenv global 3.4.1 ``` You also need to install [bundler](https://github.com/bundler/bundler/), the ruby gem bundler. @@ -134,10 +134,10 @@ You should now have an active ruby and node installation. Verify that it works w ```shell $ ruby --version -ruby 3.3.4 (2024-07-09 revision be1089c8ec) [arm64-darwin23] +ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] $ bundler --version -Bundler version 2.5.13 +Bundler version 2.6.3 node --version v20.9.0 diff --git a/docs/getting-started/account-settings/openproject_open_account_settings.png b/docs/getting-started/account-settings/openproject_open_account_settings.png index 787f1b84367a..9d1b3dbc4547 100644 Binary files a/docs/getting-started/account-settings/openproject_open_account_settings.png and b/docs/getting-started/account-settings/openproject_open_account_settings.png differ diff --git a/docs/getting-started/projects/create-a-new-project-landing-page.png b/docs/getting-started/projects/create-a-new-project-landing-page.png index 2c514cb6becc..32f09a617093 100644 Binary files a/docs/getting-started/projects/create-a-new-project-landing-page.png and b/docs/getting-started/projects/create-a-new-project-landing-page.png differ diff --git a/docs/getting-started/projects/create-project-header.png b/docs/getting-started/projects/create-project-header.png index 756cf00e5abd..fc42828efae7 100644 Binary files a/docs/getting-started/projects/create-project-header.png and b/docs/getting-started/projects/create-project-header.png differ diff --git a/docs/getting-started/projects/filter_project_header_menu.png b/docs/getting-started/projects/filter_project_header_menu.png index cf740fa4abeb..2140d505ffe2 100644 Binary files a/docs/getting-started/projects/filter_project_header_menu.png and b/docs/getting-started/projects/filter_project_header_menu.png differ diff --git a/docs/getting-started/projects/name-your-project.png b/docs/getting-started/projects/name-your-project.png index 14e75350013d..08c3f7c609e5 100644 Binary files a/docs/getting-started/projects/name-your-project.png and b/docs/getting-started/projects/name-your-project.png differ diff --git a/docs/getting-started/projects/openproject-landing-page.png b/docs/getting-started/projects/openproject-landing-page.png index 317c7239b461..40564f8bc7b4 100644 Binary files a/docs/getting-started/projects/openproject-landing-page.png and b/docs/getting-started/projects/openproject-landing-page.png differ diff --git a/docs/getting-started/projects/project_hierarchy-8178054.png b/docs/getting-started/projects/project_hierarchy-8178054.png index af2dde7a0a52..6489f9b8c303 100644 Binary files a/docs/getting-started/projects/project_hierarchy-8178054.png and b/docs/getting-started/projects/project_hierarchy-8178054.png differ diff --git a/docs/getting-started/projects/view_all_projects.png b/docs/getting-started/projects/view_all_projects.png index 85bc734c1050..960e5b2c0b9a 100644 Binary files a/docs/getting-started/projects/view_all_projects.png and b/docs/getting-started/projects/view_all_projects.png differ diff --git a/docs/getting-started/work-packages-introduction/README.md b/docs/getting-started/work-packages-introduction/README.md index 34f7cce06e08..6603448fad24 100644 --- a/docs/getting-started/work-packages-introduction/README.md +++ b/docs/getting-started/work-packages-introduction/README.md @@ -75,7 +75,7 @@ To **update the status**, click on the highlighted displayed status on top of th ## Activity of work packages -To keep informed about all changes to a work package, open the **ACTIVITY** tab in the details view. +To keep informed about all changes to a work package, open the *Activity* tab in the details view. Here you will see all changes which have been made to this work package. diff --git a/docs/glossary/README.md b/docs/glossary/README.md index 9c506c4a79e9..e40aa2b343ce 100644 --- a/docs/glossary/README.md +++ b/docs/glossary/README.md @@ -228,11 +228,11 @@ Macros in OpenProject are dynamic shortcuts that help automate repetitive tasks. ### Meetings -In OpenProject Software, Meetings is defined as a [module](#module) that allows the organization of meetings. The module has to be activated in the [project settings](#project-settings) by a project admin in order to be displayed in the side navigation. You can choose between classic meetings and dynamic meetings. Please note that only dynamic meetings will remain available in the long term. [See our user guide for more information on Meeting management in OpenProject](../user-guide/meetings/). +OpenProject offers a Meetings [module](#module) that allows project members to organise and facilitate meetings. The module has to be activated in the [project settings](#project-settings) by a project admin in order to be displayed in the side navigation. You can choose between classic meetings, one-time meetings and recurring meetings. Please note that classic meetings will be deprecated in the long term. [See our user guide for more information on Meeting management in OpenProject](../user-guide/meetings/). ### Member -In OpenProject Software, a member is defined as a single person in a project. Project members are added in the Members [module](#module) in the project menu. +In OpenProject, a member is defined as a single person in a project. Project members are added in the Members [module](#module) in the project menu. ### Module diff --git a/docs/glossary/glossary-openproject-custom-field.png b/docs/glossary/glossary-openproject-custom-field.png deleted file mode 100644 index b14d2d28b27b..000000000000 Binary files a/docs/glossary/glossary-openproject-custom-field.png and /dev/null differ diff --git a/docs/installation-and-operations/configuration/README.md b/docs/installation-and-operations/configuration/README.md index 7c30eb8c10ff..f75a03f10f28 100644 --- a/docs/installation-and-operations/configuration/README.md +++ b/docs/installation-and-operations/configuration/README.md @@ -8,9 +8,11 @@ sidebar_navigation: OpenProject can be configured via environment variables. These are often helpful for automatically deploying production systems. -> **NOTE:** This documentation is for OpenProject on-premises Installations only, if you would like to setup similar in your OpenProject cloud instance, please contact us at support@openproject.com +> [!NOTE] +> This documentation is for OpenProject on-premises Installations only, if you would like to setup similar in your OpenProject cloud instance, please contact us at support@openproject.com -> **NOTE:** Using the configuration file `config/configuration.yml` is deprecated and is **NOT** recommended anymore +> [!IMPORTANT] +> Using the configuration file `config/configuration.yml` is deprecated and is **NOT** recommended anymore ## Packaged installation @@ -34,7 +36,7 @@ Configuring OpenProject through environment variables is described in detail [in ## Docker -### one container per process installation +### One container per process installation Create a file `docker-compose.override.yml` next to `docker-compose.yml` file. Docker Compose will automatically merge those files, for more information, see https://docs.docker.com/compose/multiple-compose-files/merge/. Add your custom configuration to `docker-compose.override.yml`. @@ -160,7 +162,8 @@ OpenProject allows some resources to be seeded/created initially through configu ### Initial admin user creation -**Note:** These variables are only applicable during the first initial setup of your OpenProject setup. Changing or setting them later will have no effect, as the admin user will already have been created. +> [!NOTE] +> These variables are only applicable during the first initial setup of your OpenProject setup. Changing or setting them later will have no effect, as the admin user will already have been created. By default, an admin user will be created with the login and password set to `admin`. You will be required to change this password on first login. @@ -187,7 +190,8 @@ OPENPROJECT_SEED_ADMIN_USER_LOCKED="true" OpenProject allows you to create and maintain an LDAP connection with optional synchronized group filters. This is relevant for e.g., automated deployments, where you want to trigger the synchronization right at the start. -**Note:** These variables are applied whenever `db:seed` rake task is being executed. This happens on every packaged `configure` call or when the seeder container job is being run, so be aware that these changes might happen repeatedly. +> [!NOTE] +> These variables are applied whenever `db:seed` rake task is being executed. This happens on every packaged `configure` call or when the seeder container job is being run, so be aware that these changes might happen repeatedly. The connection can be set with the following options. Please note that "EXAMPLE" stands for an arbitrary name (expressible in ENV keys) which will become the name of the connection. In this case, "example" and "examplefilter" for the synchronized filter. @@ -249,6 +253,41 @@ OPENPROJECT_SEED_LDAP_EXAMPLE_GROUPFILTER_EXAMPLEFILTER_GROUP__ATTRIBUTE="cn" When a filter is defined, synchronization happens directly during seeding for enterprise editions. Be aware of that when you create the connection that e.g., the LDAP connection needs to be reachable. +### Seeding custom theme and design (Enterprise add-on) + +In an automated deployment setup, such as installing OpenProject using our Helm chart, you might want to provide the custom design through environment variables. + +> [!NOTE] +> Setting these variables will not have an effect on the Community Edition. + +**Setting design colors** + +```shell +OPENPROJECT_SEED_DESIGN_PRIMARY__BUTTON__COLOR="#1F883D" +OPENPROJECT_SEED_DESIGN_ACCENT__COLOR="#1F883D" +OPENPROJECT_SEED_DESIGN_HEADER__BG__COLOR="#1A67A3" +OPENPROJECT_SEED_DESIGN_HEADER__ITEM__BG__HOVER__COLOR="#E5E5E5" +OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__COLOR="#FFFFFF" +OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__SELECTED__BACKGROUND="#1F883D" +OPENPROJECT_SEED_DESIGN_MAIN__MENU__BG__HOVER__BACKGROUND="#E5E5E5" +OPENPROJECT_SEED_DESIGN_EXPORT__COVER__TEXT__COLOR="#333333" +``` + +**Setting logos and icons through environment variables** + +You can also provide the logo used in the main app header, as well as favicons or touchicons through these variables. OpenProject supports downloading images during seed from a reachable URL, or as base64-encoded data URLs. + +```shell +# Main logo of the application +OPENPROJECT_SEED_DESIGN_LOGO="https://my.example.com/logo.png" +# Favicon and touch icons for ios +OPENPROJECT_SEED_DESIGN_FAVICON="data:image/png;base64,iVBO....." +OPENPROJECT_SEED_DESIGN_TOUCH__ICON="data:image/png;base64,foo..." +OPENPROJECT_SEED_DESIGN_EXPORT__LOGO="..." +OPENPROJECT_SEED_DESIGN_EXPORT__COVER="..." +``` + + ## Examples for common use cases * `attachments_storage_path` @@ -319,7 +358,7 @@ You can modify the folder where attachments are stored locally. Use the `attachm To update the path, use `openproject config:set OPENPROJECT_ATTACHMENTS__STORAGE__PATH="/path/to/new/folder"`. Ensure that this is writable by the `openproject` user. Afterwards issue a restart by `sudo openproject configure` -#### attachment storage type +#### Attachment storage type Attachments can be stored using e.g. Amazon S3, In order to set these values through ENV variables, add to the file : @@ -405,7 +444,7 @@ OPENPROJECT_OVERRIDE__BCRYPT__COST__FACTOR="16" Please see [this separate guide](./database/) on how to set a custom database connection string and optionally, require SSL/TTLS verification. -### disable password login +### Disable password login If you enable this option you have to configure at least one omniauth authentication provider to take care of authentication instead of the password login. @@ -419,7 +458,7 @@ presented to the users. OPENPROJECT_DISABLE__PASSWORD__LOGIN="true" ``` -### omniauth direct login provider +### Omniauth direct login provider Per default the user may choose the usual password login as well as several omniauth providers on the login page and in the login drop down menu. With this configuration option you can set a specific omniauth provider to be used for direct login. Meaning that the login provider selection is skipped and the configured provider is used directly (non-interactive) instead. @@ -428,7 +467,8 @@ If this option is active, a login will lead directly to the configured omniauth To still reach the internal login route for e.g., an internal administrative user, you can manually navigate to `/login/internal`. This route is only available when the direct login provider is set. -> **NOTE:** This does not stop a user from manually navigating to any other omniauth provider if additional ones are configured. +> [!NOTE] +> This does not stop a user from manually navigating to any other omniauth provider if additional ones are configured. *default: nil* @@ -436,7 +476,7 @@ This route is only available when the direct login provider is set. OPENPROJECT_OMNIAUTH__DIRECT__LOGIN__PROVIDER="google" ``` -### prevent omniauth remapping of existing users +### Prevent omniauth remapping of existing users Per default external authentication providers through OmniAuth (such as SAML or OpenID connect providers) are allowed to take over existing accounts if the mapped login is already taken. This is usually desirable, if you have e.g., accounts created through LDAP and want these @@ -478,11 +518,13 @@ It works the other way around too: rake attachments:copy_to[file] ``` -> **NOTE:** that you have to configure the respective storage (i.e. fog) beforehand as described in the previous section. In the case of fog you only have to configure everything under `fog`, however. Don't change `attachments_storage` to `fog` just yet. Instead leave it as `file`. This is because the current attachments storage is used as the source for the migration. +> [!NOTE] +> Please note that you have to configure the respective storage (i.e. fog) beforehand as described in the previous section. In the case of fog you only have to configure everything under `fog`, however. Don't change `attachments_storage` to `fog` just yet. Instead leave it as `file`. This is because the current attachments storage is used as the source for the migration. -### direct uploads +### Direct uploads -> **NOTE**: This only works for AWS S3 or S3-compatible storages\*. When using fog with another provider this configuration will be `false`. The same goes for when no fog storage is configured, or when the `use_iam_profile` option is used in the fog credentials when using S3. +> [!NOTE] +> This only works for AWS S3 or S3-compatible storages\*. When using fog with another provider this configuration will be `false`. The same goes for when no fog storage is configured, or when the `use_iam_profile` option is used in the fog credentials when using S3. When using fog attachments uploaded in the frontend will be posted directly to the cloud rather than going through the OpenProject servers. This allows large attachments to be uploaded without the need to increase the `client_max_body_size` for the proxy in front of OpenProject. Also it prevents web processes from being blocked through long uploads. @@ -503,7 +545,7 @@ OPENPROJECT_REMOTE__STORAGE__UPLOAD__HOST=mybucket.s3.amazonaws.com OPENPROJECT_REMOTE__STORAGE__DOWNLOAD__HOST=mybucket.s3.eu-west.amazonaws.com" ``` -#### fog download url expires in +#### Fog download url expires in When using remote storage for attachments via fog - usually S3 (see [`attachments_storage`](#attachments-storage) option) - each attachment download will generate a temporary URL. This option determines how long these links will be valid. @@ -578,7 +620,7 @@ The following example forbid all routes for the second example at the 'hidden me OPENPROJECT_BLACKLISTED__ROUTES="admin/info admin/plugins project_types colors settings admin/enumerations workflows/* statuses types admin/roles" ``` -### disabled modules +### Disabled modules Modules may be disabled through the configuration. Just give a list of the module names either as an array or as a string with values separated by spaces. @@ -589,7 +631,7 @@ Just give a list of the module names either as an array or as a string with valu OPENPROJECT_DISABLED__MODULES="backlogs meetings" ``` -### local checkout path +### Local checkout path *default: "repositories"* @@ -609,7 +651,7 @@ You can control basic auth access to the APIv3 with the following configuration OPENPROJECT_APIV3__ENABLE__BASIC__AUTH="false" ``` -### global basic auth +### Global basic auth *default: none* @@ -629,7 +671,7 @@ default: password: adminpw ``` -### Security Upgrade Badge +### Security upgrade badge OpenProject provides a release indicator (security badge) that will inform administrators of an OpenProject installation on whether new releases or security updates are available for your platform. If enabled, this option will display a badge with your installation status at Administration > Information right next to the release version, and on the home screen. It is only displayed to administrators. @@ -655,17 +697,17 @@ OPENPROJECT_SECURITY__BADGE__DISPLAYED="false" * `cache_expires_in`: Expiration time for memcache entries (default: `nil`, no expiry) * `cache_namespace`: Namespace for cache keys, useful when multiple applications use a single memcache server (default: `nil`) -### rails asset host +### Rails asset host `rails_asset_host`: A custom host to use to serve static assets such as javascript, CSS, images, etc. (default: `nil`) -### onboarding video url +### Onboarding video url `onboarding_video_url`: An URL for the video displayed on the onboarding modal. This is only shown when the user logs in for the first time. *default="[https://player.vimeo.com/video/163426858?autoplay=1](https://player.vimeo.com/video/163426858?autoplay=1)"* -### enterprise fail fast +### Enterprise fail fast If using an Enterprise token there are certain limits that apply. You can configure how these limits are enforced. @@ -714,7 +756,8 @@ OPENPROJECT_WEB_MIN__THREADS="4" OPENPROJECT_WEB_MAX__THREADS="16" ``` -> **NOTE:** Timeouts only are supported when using at least 2 workers. +> [!NOTE] +> Timeouts only are supported when using at least 2 workers. ### Two-factor authentication @@ -758,7 +801,7 @@ OPENPROJECT_2FA_DISABLED="true" OPENPROJECT_2FA_ACTIVE__STRATEGIES="[]" ``` -#### statsd +#### StatsD *default: { host: nil, port: 8125 }* diff --git a/docs/installation-and-operations/configuration/database/README.md b/docs/installation-and-operations/configuration/database/README.md index f16d5c012c15..bbf743f82a1c 100644 --- a/docs/installation-and-operations/configuration/database/README.md +++ b/docs/installation-and-operations/configuration/database/README.md @@ -44,15 +44,35 @@ In both cases the seeder will be run when you (re)launch OpenProject to make sur OpenProject will merge the settings from `DATABASE_URL` with manually specified environment options. Here are the supported options: -| Environment variable | Default | Description | Documentation | -|------------------------------------|-------------|-----------------------------------------------------------------------|------------------------------------------------------------------------------------------| -| DATABASE_URL
      OPENPROJECT_DB_URL | *none* | URL style passing of database options | https://guides.rubyonrails.org/configuring.html#configuring-a-database | -| OPENPROJECT_DB_ENCODING | unicode | Encoding of the database | Should be left at unicode unless you really know what you're doing. | -| OPENPROJECT_DB_POOL | *none* | Connection pool count | https://guides.rubyonrails.org/configuring.html#database-pooling | -| OPENPROJECT_DB_USERNAME | *none* | Database username, if not presented in URL above | https://guides.rubyonrails.org/configuring.html#configuring-a-database | -| OPENPROJECT_DB_PASSWORD | *none* | Database password, if not presented in URL above | https://guides.rubyonrails.org/configuring.html#configuring-a-database | -| OPENPROJECT_DB_APPLICATION_NAME | openproject | PostgreSQL application name option | https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-APPLICATION-NAME | -| OPENPROJECT_DB_STATEMENT_TIMEOUT | 90s | Default statement timeout before connection statements are terminated | https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-STATEMENT-TIMEOUT | +| Environment variable | Default | Description | Documentation | +| --------------------------------------- | ------------------ | ------------------------------------------------------------ | ------------------------------------------------------------ | +| DATABASE_URL
      OPENPROJECT_DB_URL | | URL style passing of database options | https://guides.rubyonrails.org/configuring.html#configuring-a-database | +| OPENPROJECT_DB_ENCODING | unicode | Encoding of the database | Should be left at unicode unless you really know what you're doing. | +| OPENPROJECT_DB_POOL | | Connection pool count | https://guides.rubyonrails.org/configuring.html#database-pooling | +| OPENPROJECT_DB_USERNAME | | Database username, if not presented in URL above | https://guides.rubyonrails.org/configuring.html#configuring-a-database | +| OPENPROJECT_DB_PASSWORD | | Database password, if not presented in URL above | https://guides.rubyonrails.org/configuring.html#configuring-a-database | +| OPENPROJECT_DB_APPLICATION_NAME | openproject | PostgreSQL application name option | https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-APPLICATION-NAME | +| OPENPROJECT_DB_STATEMENT_TIMEOUT | 90s | Default statement timeout before connection statements are terminated | https://www.postgresql.org/docs/current/runtime-config-client.html#GUC-STATEMENT-TIMEOUT | +| OPENPROJECT_DB_REQUIRE_AUTH | Uses libpq default | Specifies the authentication method that the client requires from the server. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-REQUIRE-AUTH | +| OPENPROJECT_DB_CHANNEL_BINDING | Uses libpq default | This option controls the client's use of channel binding. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-CHANNEL-BINDING | +| OPENPROJECT_DB_CONNECT_TIMEOUT | Uses libpq default | Maximum time to wait while connecting, in seconds (write as a decimal integer, e.g., `10`). | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-CONNECT-TIMEOUT | +| OPENPROJECT_DB_CLIENT_ENCODING | Uses libpq default | This sets the `client_encoding` configuration parameter for this connection. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-CLIENT-ENCODING | +| OPENPROJECT_DB_KEEPALIVES | Uses libpq default | Controls whether client-side TCP keepalives are used. The default value is 1, meaning on, but you can change this to 0, meaning off, if keepalives are not wanted. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-KEEPALIVES | +| OPENPROJECT_DB_KEEPALIVES_IDLE | Uses libpq default | Controls the number of seconds of inactivity after which TCP should send a keepalive message to the server. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-KEEPALIVES-IDLE | +| OPENPROJECT_DB_KEEPALIVES_INTERVAL | Uses libpq default | Controls the number of seconds after which a TCP keepalive message that is not acknowledged by the server should be retransmitted. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-KEEPALIVES-INTERVAL | +| OPENPROJECT_DB_KEEPALIVES_COUNT | Uses libpq default | Controls the number of TCP keepalives that can be lost before the client's connection to the server is considered dead. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-KEEPALIVES-COUNT | +| OPENPROJECT_DB_REPLICATION | Uses libpq default | This option determines whether the connection should use the replication protocol instead of the normal protocol. | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-REPLICATION | +| OPENPROJECT_DB_GSSENCMODE | Uses libpq default | This option determines whether or with what priority a secure GSS TCP/IP connection will be negotiated with the server. (prefer) | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-GSSENCMODE | +| OPENPROJECT_DB_SSLMODE | Uses libpq default | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLMODE | | +| OPENPROJECT_DB_SSLCOMPRESSION | Uses libpq default | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSLCOMPRESSION | | +| OPENPROJECT_DB_SSL_MIN_PROTOCOL_VERSION | Uses libpq default | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSL-MIN-PROTOCOL-VERSION | | +| | | | | +| | | | | +| | | | | +| | | | | +| | | | | + + ## Using SSL/TLS with a PostgreSQL database @@ -66,15 +86,16 @@ DATABASE_URL=postgres://user:pass@host:port/dbname?sslmode=require-full&sslcert= Alternatively, for better readability, you can set these parameters with separate environment variables: -| Environment variable | Default | Description | PostgreSQL documentation | -| ----------------------------- | ---------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------ | -| OPENPROJECT_DB_SSLMODE | prefer | connection mode for SSL. See | [sslmode](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLMODE) | -| OPENPROJECT_DB_SSLCOMPRESSION | 0 | If set to 1, data sent over SSL connections will be compressed | [sslcompression](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLCOMPRESSION) | -| OPENPROJECT_DB_SSLCERT | ~/.postgresql/postgresql.crt | Path to certificate | [sslcert](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLCERT) | -| OPENPROJECT_DB_SSLKEY | ~/.postgresql/postgresql.key | Path to certificate key | [sslkey](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLKEY) | -| OPENPROJECT_DB_SSLPASSWORD | | Password to certificate key | [sslpassword](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLPASSWORD) | -| OPENPROJECT_DB_SSLROOTCERT | ~/.postgresql/root.crt | Path to CA | [sslrootcert](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT) | -| OPENPROJECT_DB_SSLCRL | ~/.postgresql/root.crl | Path to revocation list | [sslcrl](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLCRL) | +| Environment variable | Default | Description | PostgreSQL documentation | +| --------------------------------------- | ---------------------------- | ------------------------------------------------------------ | ------------------------------------------------------------ | +| OPENPROJECT_DB_SSLMODE | prefer | connection mode for SSL. See | [sslmode](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLMODE) | +| OPENPROJECT_DB_SSLCOMPRESSION | 0 | If set to 1, data sent over SSL connections will be compressed | [sslcompression](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLCOMPRESSION) | +| OPENPROJECT_DB_SSLCERT | ~/.postgresql/postgresql.crt | Path to certificate | [sslcert](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLCERT) | +| OPENPROJECT_DB_SSLKEY | ~/.postgresql/postgresql.key | Path to certificate key | [sslkey](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLKEY) | +| OPENPROJECT_DB_SSLPASSWORD | | Password to certificate key | [sslpassword](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLPASSWORD) | +| OPENPROJECT_DB_SSLROOTCERT | ~/.postgresql/root.crt | Path to CA | [sslrootcert](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLROOTCERT) | +| OPENPROJECT_DB_SSLCRL | ~/.postgresql/root.crl | Path to revocation list | [sslcrl](https://www.postgresql.org/docs/13/libpq-connect.html#LIBPQ-CONNECT-SSLCRL) | +| OPENPROJECT_DB_SSL_MIN_PROTOCOL_VERSION | Uses libpq default | https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNECT-SSL-MIN-PROTOCOL-VERSION | | ```text ="prefer" # disable, allow, prefer, require, verify-ca, verify-full diff --git a/docs/installation-and-operations/installation/README.md b/docs/installation-and-operations/installation/README.md index b446ad3df95b..af42373b47f1 100644 --- a/docs/installation-and-operations/installation/README.md +++ b/docs/installation-and-operations/installation/README.md @@ -10,8 +10,8 @@ OpenProject can be setup in these different ways: | Topic | Content | | ---------------------------------------------------- | ------------------------------------------------------------------------------------- | -| [Installation with DEB/RPM packages](./packaged) | This is the recommended way to install OpenProject | -| [Installation with Docker Compose](./docker-compose) | This allows to setup OpenProject in an isolated manner using Docker Compose | +| [Installation with Docker Compose](./docker-compose) | Recommended setup for OpenProject in an isolated manner using Docker Compose | +| [Installation with DEB/RPM packages](./packaged) | Install OpenProject using your package manager (limited supported distributions) | | [Installation with single Docker container](./docker)| This allows to setup OpenProject in a single Docker container | | [Installation with Helm charts](./helm-chart) | This allows to setup OpenProject using Helm charts | | [Other](misc/) | Extra information on installing OpenProject on specific platforms such as Kubernetes. | diff --git a/docs/installation-and-operations/installation/manual/README.md b/docs/installation-and-operations/installation/manual/README.md index ca8887e63dff..075cb69d2eb8 100644 --- a/docs/installation-and-operations/installation/manual/README.md +++ b/docs/installation-and-operations/installation/manual/README.md @@ -110,19 +110,19 @@ Please be aware that the actual installation of a specific Ruby version takes so ``` We suggest you install the version we require in [.ruby-version](https://github.com/opf/openproject/blob/dev/.ruby-version). -Read the first line e.g. `3.3.4` and install that version. +Read the first line e.g. `3.4.1` and install that version. ```shell -[openproject@host] rbenv install 3.3.4 +[openproject@host] rbenv install 3.4.1 [openproject@host] rbenv rehash -[openproject@host] rbenv global 3.3.4 +[openproject@host] rbenv global 3.4.1 ``` To check our Ruby installation we run `ruby --version`. It should output something very similar to: ```text -ruby 3.3.4 (2024-07-09 revision be1089c8ec) [arm64-darwin23] +ruby 3.4.1 (2024-12-25 revision 48d4efcb85) +PRISM [arm64-darwin23] ``` ## Installation of Node diff --git a/docs/installation-and-operations/installation/packaged/README.md b/docs/installation-and-operations/installation/packaged/README.md index 4666d70404fb..2287092c6539 100644 --- a/docs/installation-and-operations/installation/packaged/README.md +++ b/docs/installation-and-operations/installation/packaged/README.md @@ -38,7 +38,6 @@ The package is available for the following Linux distributions: | [Debian 12 Bookworm](#debian-12) | | [Debian 11 Bullseye](#debian-11) | | [CentOS/RHEL 9.x](#centos-9--rhel-9) | -| [CentOS/RHEL 8.x](#centos-8--rhel-8) | | [Suse Linux Enterprise Server 15](#sles-15) | Please ensure that you are running on a 64bit system before proceeding with the installation. You can check by running the `uname -i` command on the target server and verifying that it outputs `x86_64`: @@ -217,47 +216,6 @@ Then finish the installation by reading the [*Initial configuration*](#initial-c > On this distribution full-text extraction for attachments [*is not supported*](#full-text-extraction-not-supported) by default. > -### CentOS 8 / RHEL 8 - -Add the OpenProject package source: - -```shell -sudo wget -O /etc/yum.repos.d/openproject.repo \ - https://dl.packager.io/srv/opf/openproject/stable/15/installer/el/8.repo -``` - -If it is not already enabled, make sure to enable [Extra Packages for Enterprise Linux](https://fedoraproject.org/wiki/EPEL) (EPEL). - -```shell -sudo dnf install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm -y -``` - -Download the OpenProject package: - -```shell -sudo yum install openproject -``` - -Then finish the installation by reading the [*Initial configuration*](#initial-configuration) section. - -> [!NOTE] -> On this distribution full-text extraction for attachments [*is not supported*](#full-text-extraction-not-supported) by default. -> - -**Workaround for outdated PostgreSQL library package** - -Depending on your version and installation variant, you might receive errors like `symbol lookup error: /opt/openproject/vendor/bundle/ruby/3.1.0/gems/pg-1.4.3/lib/pg_ext.so: undefined symbol: PQconninfo`. - -This happens when your local postgresql-libs package is outdated. You'll have to install a newer version manually like so: - -1. Add the package source for PostgreSQL (the exact URL might differ, double check https://www.postgresql.org/download/linux/redhat/) - -`yum install -y https://download.postgresql.org/pub/repos/yum/reporpms/EL-7-x86_64/pgdg-redhat-repo-latest.noarch.rpm` - -2. Install postgresql13-libs - -`yum install postgresql13-libs` - ## SUSE Linux Enterprise Server (SLES) Installation > [!NOTE] @@ -329,7 +287,7 @@ You can find more about the BIM edition on [this page](https://www.openproject.o > This wizard step is only available on the following distributions: > -> * RHEL/CentOS 8 +> * RHEL/CentOS 9 > * Ubuntu 22.04 > * Ubuntu 20.04 > * Debian 11 diff --git a/docs/installation-and-operations/operation/upgrading/README.md b/docs/installation-and-operations/operation/upgrading/README.md index 0eb711f2da40..b50f27bb1794 100644 --- a/docs/installation-and-operations/operation/upgrading/README.md +++ b/docs/installation-and-operations/operation/upgrading/README.md @@ -80,7 +80,6 @@ The necessary steps are the same as setting up the package source for the first | [Debian 12 Bookworm](../../installation/packaged/#debian-12) | | [Debian 11 Bullseye](../../installation/packaged/#debian-11) | | [CentOS/RHEL 9.x](../../installation/packaged/#centos-9--rhel-9) | -| [CentOS/RHEL 8.x](../../installation/packaged/#centos-8--rhel-8) | | [Suse Linux Enterprise Server 15](../../installation/packaged/#sles-15) | After following the steps to update the package source, updating the openproject package and running `openproject configure`, your system will be up to date. diff --git a/docs/release-notes/13/13-1-0/README.md b/docs/release-notes/13/13-1-0/README.md index 1f072c2110c0..ad378cefe2b6 100644 --- a/docs/release-notes/13/13-1-0/README.md +++ b/docs/release-notes/13/13-1-0/README.md @@ -28,7 +28,7 @@ This feature, designed with the latest Primer UI components and UX patterns, is > Please note: The already existing classic meetings will be removed with one of the upcoming releases and only the new dynamic meetings will remain. Migrations will be provided. -See our user guide to learn more about the [updated meetings module and how to use it](../../../user-guide/meetings/dynamic-meetings/). +See our user guide to learn more about the [updated meetings module and how to use it](../../../user-guide/meetings/). ## OneDrive/SharePoint integration (Enterprise add-on) diff --git a/docs/release-notes/13/13-4-0/openproject-13-4-intermediate-modal-nudging.jpg b/docs/release-notes/13/13-4-0/openproject-13-4-intermediate-modal-nudging.jpg index 8af812a1a3d4..fef763895545 100644 Binary files a/docs/release-notes/13/13-4-0/openproject-13-4-intermediate-modal-nudging.jpg and b/docs/release-notes/13/13-4-0/openproject-13-4-intermediate-modal-nudging.jpg differ diff --git a/docs/release-notes/14/14-0-0/README.md b/docs/release-notes/14/14-0-0/README.md index 4b9b73ac744b..a8b08cde9ee5 100644 --- a/docs/release-notes/14/14-0-0/README.md +++ b/docs/release-notes/14/14-0-0/README.md @@ -113,7 +113,7 @@ As described above, *project* custom fields are now called 'Project attributes' ### Enhanced Meetings module with new features -OpenProject's [(Dynamic) Meetings](../../../user-guide/meetings/dynamic-meetings/) have been updated with the following new features: +OpenProject's [(Dynamic) Meetings](../../../user-guide/meetings/) have been updated with the following new features: * [Meetings attachments](https://www.openproject.com/docs/user-guide/meetings/dynamic-meetings/#meeting-attachments) are now shown in the bottom section of the right-hand sidebar. You can add them directly to the meeting there and drag and drop them from this section to the Notes section of the agenda items. * When [copying a meeting](https://www.openproject.com/docs/user-guide/meetings/dynamic-meetings/#copy-a-meeting), you can now check a box to choose whether you want to include attachments. diff --git a/docs/release-notes/14/14-0-0/progress-work-estimates-excludedFromParent.jpg b/docs/release-notes/14/14-0-0/progress-work-estimates-excludedFromParent.jpg index 02c9e640c73e..76be926e612b 100644 Binary files a/docs/release-notes/14/14-0-0/progress-work-estimates-excludedFromParent.jpg and b/docs/release-notes/14/14-0-0/progress-work-estimates-excludedFromParent.jpg differ diff --git a/docs/release-notes/14/14-0-0/progress-work-estimates-statusMode.jpg b/docs/release-notes/14/14-0-0/progress-work-estimates-statusMode.jpg index 720791b9ad5f..b8b03cee921e 100644 Binary files a/docs/release-notes/14/14-0-0/progress-work-estimates-statusMode.jpg and b/docs/release-notes/14/14-0-0/progress-work-estimates-statusMode.jpg differ diff --git a/docs/release-notes/14/14-0-0/progress-work-estimates-workMode.jpg b/docs/release-notes/14/14-0-0/progress-work-estimates-workMode.jpg index 65392874ead2..db6bf8545950 100644 Binary files a/docs/release-notes/14/14-0-0/progress-work-estimates-workMode.jpg and b/docs/release-notes/14/14-0-0/progress-work-estimates-workMode.jpg differ diff --git a/docs/release-notes/14/14-1-0/README.md b/docs/release-notes/14/14-1-0/README.md index f6a8e6d8d4ac..2f4985ac939a 100644 --- a/docs/release-notes/14/14-1-0/README.md +++ b/docs/release-notes/14/14-1-0/README.md @@ -74,7 +74,7 @@ Apart from these features that apply the Meetings module directly, the following **Please note**: On the project overview page and on the My page, the "+" button on the top right has been removed. However, new widgets can be added by project admins as usual if you hover at the border of an existing widget and click on the “+” there. -Read more about [dynamic meetings in OpenProject](../../../user-guide/meetings/dynamic-meetings/). +Read more about [dynamic meetings in OpenProject](../../../user-guide/meetings/). ### Possibility to hide attachments in the Files tab diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-favorite-project-lists-highlighted.png b/docs/release-notes/14/14-3-0/openproject-14-3-favorite-project-lists-highlighted.png index eef79bd7f305..a9ea5d63596d 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-favorite-project-lists-highlighted.png and b/docs/release-notes/14/14-3-0/openproject-14-3-favorite-project-lists-highlighted.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-gantt-chart-pdf-export.png b/docs/release-notes/14/14-3-0/openproject-14-3-gantt-chart-pdf-export.png index be31e61626c8..ae572b86a7ac 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-gantt-chart-pdf-export.png and b/docs/release-notes/14/14-3-0/openproject-14-3-gantt-chart-pdf-export.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-profile-page-primer-highlighted.png b/docs/release-notes/14/14-3-0/openproject-14-3-profile-page-primer-highlighted.png index 2953c58a43f5..c7b044d5226f 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-profile-page-primer-highlighted.png and b/docs/release-notes/14/14-3-0/openproject-14-3-profile-page-primer-highlighted.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-progress-reporting-hours-only.png b/docs/release-notes/14/14-3-0/openproject-14-3-progress-reporting-hours-only.png index 6bcaea0f2039..62b72f4e4613 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-progress-reporting-hours-only.png and b/docs/release-notes/14/14-3-0/openproject-14-3-progress-reporting-hours-only.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-share-project-list-highlighted.png b/docs/release-notes/14/14-3-0/openproject-14-3-share-project-list-highlighted.png index 500c549c5af5..1fd6ae9bfeb0 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-share-project-list-highlighted.png and b/docs/release-notes/14/14-3-0/openproject-14-3-share-project-list-highlighted.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-storages-connection-validation-highlighted.png b/docs/release-notes/14/14-3-0/openproject-14-3-storages-connection-validation-highlighted.png index 560c8b6f39f6..af024a9ae36b 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-storages-connection-validation-highlighted.png and b/docs/release-notes/14/14-3-0/openproject-14-3-storages-connection-validation-highlighted.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-submenu-search-bar.png b/docs/release-notes/14/14-3-0/openproject-14-3-submenu-search-bar.png index 2038010c9677..51c53077f3d3 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-submenu-search-bar.png and b/docs/release-notes/14/14-3-0/openproject-14-3-submenu-search-bar.png differ diff --git a/docs/release-notes/14/14-3-0/openproject-14-3-unselect-projects-highlighted.png b/docs/release-notes/14/14-3-0/openproject-14-3-unselect-projects-highlighted.png index dea883cc7892..98f9fcdb4734 100644 Binary files a/docs/release-notes/14/14-3-0/openproject-14-3-unselect-projects-highlighted.png and b/docs/release-notes/14/14-3-0/openproject-14-3-unselect-projects-highlighted.png differ diff --git a/docs/release-notes/14/14-4-0/Custom_field__long_text__changed.png b/docs/release-notes/14/14-4-0/Custom_field__long_text__changed.png index 86a19e8a1665..985cfe1e01a4 100644 Binary files a/docs/release-notes/14/14-4-0/Custom_field__long_text__changed.png and b/docs/release-notes/14/14-4-0/Custom_field__long_text__changed.png differ diff --git a/docs/release-notes/14/14-4-0/openproject-14-4-copy-link.png b/docs/release-notes/14/14-4-0/openproject-14-4-copy-link.png index 176c68c33d59..c77b5764bc4b 100644 Binary files a/docs/release-notes/14/14-4-0/openproject-14-4-copy-link.png and b/docs/release-notes/14/14-4-0/openproject-14-4-copy-link.png differ diff --git a/docs/release-notes/14/14-4-0/openproject-14-4-dark-mode.png b/docs/release-notes/14/14-4-0/openproject-14-4-dark-mode.png index 09ed705f5c8e..477c98dea6f3 100644 Binary files a/docs/release-notes/14/14-4-0/openproject-14-4-dark-mode.png and b/docs/release-notes/14/14-4-0/openproject-14-4-dark-mode.png differ diff --git a/docs/release-notes/14/14-4-0/openproject-14-4-project-attributes-permissions-highlighted.png b/docs/release-notes/14/14-4-0/openproject-14-4-project-attributes-permissions-highlighted.png index 8c86c0960fb3..39ee4b6450c3 100644 Binary files a/docs/release-notes/14/14-4-0/openproject-14-4-project-attributes-permissions-highlighted.png and b/docs/release-notes/14/14-4-0/openproject-14-4-project-attributes-permissions-highlighted.png differ diff --git a/docs/release-notes/14/14-4-0/openproject-14-4-project-lists-filter.png b/docs/release-notes/14/14-4-0/openproject-14-4-project-lists-filter.png index 3fcea0a5d67e..e8b0126a712b 100644 Binary files a/docs/release-notes/14/14-4-0/openproject-14-4-project-lists-filter.png and b/docs/release-notes/14/14-4-0/openproject-14-4-project-lists-filter.png differ diff --git a/docs/release-notes/14/14-4-0/openproject-14-4-status-percentage-complete.png b/docs/release-notes/14/14-4-0/openproject-14-4-status-percentage-complete.png index f5e337a94c02..83a715ce4cea 100644 Binary files a/docs/release-notes/14/14-4-0/openproject-14-4-status-percentage-complete.png and b/docs/release-notes/14/14-4-0/openproject-14-4-status-percentage-complete.png differ diff --git a/docs/release-notes/14/14-4-0/openproject_file_storages_recheck_connection_nextcloud.png b/docs/release-notes/14/14-4-0/openproject_file_storages_recheck_connection_nextcloud.png index 66b07a52f3a6..af653a897ce7 100644 Binary files a/docs/release-notes/14/14-4-0/openproject_file_storages_recheck_connection_nextcloud.png and b/docs/release-notes/14/14-4-0/openproject_file_storages_recheck_connection_nextcloud.png differ diff --git a/docs/release-notes/14/14-5-0/openproject-14-5-export-work-packages-modal.png b/docs/release-notes/14/14-5-0/openproject-14-5-export-work-packages-modal.png index 3ba6b354a04b..86a2e31f54bc 100644 Binary files a/docs/release-notes/14/14-5-0/openproject-14-5-export-work-packages-modal.png and b/docs/release-notes/14/14-5-0/openproject-14-5-export-work-packages-modal.png differ diff --git a/docs/release-notes/14/14-5-0/openproject-14-5-multiple-projects-to-storage.png b/docs/release-notes/14/14-5-0/openproject-14-5-multiple-projects-to-storage.png index a5254c88d70c..7fd5cffb6b5e 100644 Binary files a/docs/release-notes/14/14-5-0/openproject-14-5-multiple-projects-to-storage.png and b/docs/release-notes/14/14-5-0/openproject-14-5-multiple-projects-to-storage.png differ diff --git a/docs/release-notes/14/14-5-0/openproject-14-5-notification-center.png b/docs/release-notes/14/14-5-0/openproject-14-5-notification-center.png index 0c03cc990da1..769c35904aa3 100644 Binary files a/docs/release-notes/14/14-5-0/openproject-14-5-notification-center.png and b/docs/release-notes/14/14-5-0/openproject-14-5-notification-center.png differ diff --git a/docs/release-notes/14/14-5-0/openproject-14-5-recaptcha-turnstile.png b/docs/release-notes/14/14-5-0/openproject-14-5-recaptcha-turnstile.png index c4e5fa5b60b8..4ad9b904a11c 100644 Binary files a/docs/release-notes/14/14-5-0/openproject-14-5-recaptcha-turnstile.png and b/docs/release-notes/14/14-5-0/openproject-14-5-recaptcha-turnstile.png differ diff --git a/docs/release-notes/14/14-5-0/openproject-14-5-wysiwyg-editor.png b/docs/release-notes/14/14-5-0/openproject-14-5-wysiwyg-editor.png index e067ec3d492b..505074e7dbcc 100644 Binary files a/docs/release-notes/14/14-5-0/openproject-14-5-wysiwyg-editor.png and b/docs/release-notes/14/14-5-0/openproject-14-5-wysiwyg-editor.png differ diff --git a/docs/release-notes/14/14-5-0/openproject_user_guide_copy_move_delete_detailed_view-570939f2.png b/docs/release-notes/14/14-5-0/openproject_user_guide_copy_move_delete_detailed_view-570939f2.png index 2baab5f94a0e..42f9b5d76c8b 100644 Binary files a/docs/release-notes/14/14-5-0/openproject_user_guide_copy_move_delete_detailed_view-570939f2.png and b/docs/release-notes/14/14-5-0/openproject_user_guide_copy_move_delete_detailed_view-570939f2.png differ diff --git a/docs/release-notes/14/14-6-0/open-project-14-6-custom-fields-new-highlighted.png b/docs/release-notes/14/14-6-0/open-project-14-6-custom-fields-new-highlighted.png index d84d33e71146..237a58c552f8 100644 Binary files a/docs/release-notes/14/14-6-0/open-project-14-6-custom-fields-new-highlighted.png and b/docs/release-notes/14/14-6-0/open-project-14-6-custom-fields-new-highlighted.png differ diff --git a/docs/release-notes/14/14-6-0/openproject-14-6-macros.png b/docs/release-notes/14/14-6-0/openproject-14-6-macros.png index b1dffcc7e178..cceec4dd9933 100644 Binary files a/docs/release-notes/14/14-6-0/openproject-14-6-macros.png and b/docs/release-notes/14/14-6-0/openproject-14-6-macros.png differ diff --git a/docs/release-notes/14/14-6-0/openproject-14-6-meetings-reload.png b/docs/release-notes/14/14-6-0/openproject-14-6-meetings-reload.png index dff22e512623..4d40e0763a08 100644 Binary files a/docs/release-notes/14/14-6-0/openproject-14-6-meetings-reload.png and b/docs/release-notes/14/14-6-0/openproject-14-6-meetings-reload.png differ diff --git a/docs/release-notes/14/14-6-0/progress-tracking-admin-options.png b/docs/release-notes/14/14-6-0/progress-tracking-admin-options.png index 660ed65be2a4..cc9334346302 100644 Binary files a/docs/release-notes/14/14-6-0/progress-tracking-admin-options.png and b/docs/release-notes/14/14-6-0/progress-tracking-admin-options.png differ diff --git a/docs/release-notes/15-0-0/OpenProject_SSO_SAML_OpenID-highlighted.png b/docs/release-notes/15-0-0/OpenProject_SSO_SAML_OpenID-highlighted.png index 52bd618848ee..a0ae062a494c 100644 Binary files a/docs/release-notes/15-0-0/OpenProject_SSO_SAML_OpenID-highlighted.png and b/docs/release-notes/15-0-0/OpenProject_SSO_SAML_OpenID-highlighted.png differ diff --git a/docs/release-notes/15-0-0/openproject-15-0-activity-tab-highlighted-all.png b/docs/release-notes/15-0-0/openproject-15-0-activity-tab-highlighted-all.png index 5f81cc3950b7..cc8cfef058cc 100644 Binary files a/docs/release-notes/15-0-0/openproject-15-0-activity-tab-highlighted-all.png and b/docs/release-notes/15-0-0/openproject-15-0-activity-tab-highlighted-all.png differ diff --git a/docs/release-notes/15-0-0/openproject-15-0-hovercard.png b/docs/release-notes/15-0-0/openproject-15-0-hovercard.png index 1f5ac2b8c9c4..8bbc598092e0 100644 Binary files a/docs/release-notes/15-0-0/openproject-15-0-hovercard.png and b/docs/release-notes/15-0-0/openproject-15-0-hovercard.png differ diff --git a/docs/release-notes/15-0-0/openproject-15-0-project-lists.png b/docs/release-notes/15-0-0/openproject-15-0-project-lists.png deleted file mode 100644 index a1cfc9399341..000000000000 Binary files a/docs/release-notes/15-0-0/openproject-15-0-project-lists.png and /dev/null differ diff --git a/docs/release-notes/15-0-0/openproject-15-0-sso-administration-dropdown.png b/docs/release-notes/15-0-0/openproject-15-0-sso-administration-dropdown.png index 74e180e88609..22e1551c2802 100644 Binary files a/docs/release-notes/15-0-0/openproject-15-0-sso-administration-dropdown.png and b/docs/release-notes/15-0-0/openproject-15-0-sso-administration-dropdown.png differ diff --git a/docs/release-notes/15-0-0/openproject-15-0-sso-administration-highlighted.png b/docs/release-notes/15-0-0/openproject-15-0-sso-administration-highlighted.png deleted file mode 100644 index 0e61e943283c..000000000000 Binary files a/docs/release-notes/15-0-0/openproject-15-0-sso-administration-highlighted.png and /dev/null differ diff --git a/docs/release-notes/15-0-0/openproject-15-0-standard-global-role.png b/docs/release-notes/15-0-0/openproject-15-0-standard-global-role.png index 57d377c18652..d8b2d7283d68 100644 Binary files a/docs/release-notes/15-0-0/openproject-15-0-standard-global-role.png and b/docs/release-notes/15-0-0/openproject-15-0-standard-global-role.png differ diff --git a/docs/release-notes/15-0-0/openproject-emoji-overview.png b/docs/release-notes/15-0-0/openproject-emoji-overview.png index 397312bfd2b5..3ef56a4b760b 100644 Binary files a/docs/release-notes/15-0-0/openproject-emoji-overview.png and b/docs/release-notes/15-0-0/openproject-emoji-overview.png differ diff --git a/docs/release-notes/15-1-0/README.md b/docs/release-notes/15-1-0/README.md index b09238ecef6f..ebffc140bb41 100644 --- a/docs/release-notes/15-1-0/README.md +++ b/docs/release-notes/15-1-0/README.md @@ -53,7 +53,7 @@ Here's an example screenshot of the redesigned Meetings index page: ![Example screenshot of the redesigned Meetings index page](openproject-15-1-meetings.png) -[Learn what is possible with OpenProject's Dynamic Meetings to improve collaboration with your colleagues](../../user-guide/meetings/dynamic-meetings/). +[Learn what is possible with OpenProject's dynamic meetings to improve collaboration with your colleagues](../../user-guide/meetings/). ### Manual page breaks in PDF work package exports diff --git a/docs/release-notes/15-1-0/open_project_admin_related_wp_table.png b/docs/release-notes/15-1-0/open_project_admin_related_wp_table.png index ec45fbf9539f..9ba5f7f423fa 100644 Binary files a/docs/release-notes/15-1-0/open_project_admin_related_wp_table.png and b/docs/release-notes/15-1-0/open_project_admin_related_wp_table.png differ diff --git a/docs/release-notes/15-1-0/openproject-15-1-custom-field-hierarchy.jpg b/docs/release-notes/15-1-0/openproject-15-1-custom-field-hierarchy.jpg index d664b23c5305..d92d43c3fc05 100644 Binary files a/docs/release-notes/15-1-0/openproject-15-1-custom-field-hierarchy.jpg and b/docs/release-notes/15-1-0/openproject-15-1-custom-field-hierarchy.jpg differ diff --git a/docs/release-notes/15-1-0/openproject-15-1-meetings.png b/docs/release-notes/15-1-0/openproject-15-1-meetings.png index 2cfd649e6133..6e5025d5a111 100644 Binary files a/docs/release-notes/15-1-0/openproject-15-1-meetings.png and b/docs/release-notes/15-1-0/openproject-15-1-meetings.png differ diff --git a/docs/release-notes/15-1-0/openproject-15-1-page-break-contract-highlighted.png b/docs/release-notes/15-1-0/openproject-15-1-page-break-contract-highlighted.png index 0217b2eb9cd6..8d76545fd114 100644 Binary files a/docs/release-notes/15-1-0/openproject-15-1-page-break-contract-highlighted.png and b/docs/release-notes/15-1-0/openproject-15-1-page-break-contract-highlighted.png differ diff --git a/docs/release-notes/15-1-0/openproject-15-1-relations.png b/docs/release-notes/15-1-0/openproject-15-1-relations.png index 405e60dbfa8b..5de222f73a7a 100644 Binary files a/docs/release-notes/15-1-0/openproject-15-1-relations.png and b/docs/release-notes/15-1-0/openproject-15-1-relations.png differ diff --git a/docs/release-notes/15-1-0/openproject-15-1-zen-mode-highlighted.png b/docs/release-notes/15-1-0/openproject-15-1-zen-mode-highlighted.png index ea7495f3ad77..7cb6046a5dff 100644 Binary files a/docs/release-notes/15-1-0/openproject-15-1-zen-mode-highlighted.png and b/docs/release-notes/15-1-0/openproject-15-1-zen-mode-highlighted.png differ diff --git a/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png b/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png index 51747277da64..7904aa902406 100644 Binary files a/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png and b/docs/release-notes/15-2-0/openproject-file-storage-new-folder.png differ diff --git a/docs/release-notes/15-2-0/openproject_avatar_hover.png b/docs/release-notes/15-2-0/openproject_avatar_hover.png index 67ac4a241862..79f46b63caa1 100644 Binary files a/docs/release-notes/15-2-0/openproject_avatar_hover.png and b/docs/release-notes/15-2-0/openproject_avatar_hover.png differ diff --git a/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png b/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png index e0a8e66d9edd..542dd4f6c517 100644 Binary files a/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png and b/docs/release-notes/15-2-0/openproject_cf_hierarchy_grouping.png differ diff --git a/docs/release-notes/15-2-0/openproject_set_wp_reminders.png b/docs/release-notes/15-2-0/openproject_set_wp_reminders.png index 85694a95948a..0a242e37ec77 100644 Binary files a/docs/release-notes/15-2-0/openproject_set_wp_reminders.png and b/docs/release-notes/15-2-0/openproject_set_wp_reminders.png differ diff --git a/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png b/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png index c3f4aa997153..1ba3d1372933 100644 Binary files a/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png and b/docs/release-notes/15-2-0/openproject_user_guide_relations_tab_edit_lag.png differ diff --git a/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png b/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png index 46be521140fd..5d017595f6a0 100644 Binary files a/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png and b/docs/release-notes/15-2-0/openproject_user_guide_wp_reminder_icon.png differ diff --git a/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png b/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png index adf8e839cc5c..cc6ad95cdf71 100644 Binary files a/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png and b/docs/release-notes/15-2-0/openproject_user_timesheet_pdf_export.png differ diff --git a/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png b/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png index 80745f0401f4..531ba75b2cae 100644 Binary files a/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png and b/docs/release-notes/15-2-0/openproject_userguide_timesheet_pdf_export_file.png differ diff --git a/docs/release-notes/15-2-1/README.md b/docs/release-notes/15-2-1/README.md index 246e473a03f1..070c0d2db5d5 100644 --- a/docs/release-notes/15-2-1/README.md +++ b/docs/release-notes/15-2-1/README.md @@ -11,7 +11,7 @@ release_date: 2025-02-05 Release date: 2025-02-05 We released OpenProject [OpenProject 15.2.1](https://community.openproject.org/versions/2170). -The release contains several bug fixes and we recommend updating to the newest version. +The release contains several bug fixes and a security related fix and we recommend updating to the newest version. In these Release Notes, we will give an overview of important feature changes. At the end, you will find a complete list of all changes and bug fixes. @@ -41,3 +41,5 @@ At the end, you will find a complete list of all changes and bug fixes. ## Contributions A big thanks to our Community members for reporting bugs and helping us identify and provide fixes. This release, special thanks for reporting and finding bugs go to Boris Lukashev, Serg Baranov, Lars Briem, Andrey Dermeyko. + +A special thanks goes out to [Kanitin Pholngam](https://github.com/meanknt) for responsible disclosure of a potential security vulnerability. Thank you for reaching out to us and your help in identifying this issue. If you have a security vulnerability you would like to disclose, please see our [statement on security](../../security-and-privacy/statement-on-security/). diff --git a/docs/release-notes/15-3-0/README.md b/docs/release-notes/15-3-0/README.md new file mode 100644 index 000000000000..ad271fbb8f3f --- /dev/null +++ b/docs/release-notes/15-3-0/README.md @@ -0,0 +1,262 @@ +--- +title: OpenProject 15.3.0 +sidebar_navigation: + title: 15.3.0 +release_version: 15.3.0 +release_date: 2025-02-19 +--- + +# OpenProject 15.3.0 + +Release date: 2025-02-19 + +We released [OpenProject 15.3.0](https://community.openproject.org/versions/2163). This release includes several bug fixes, and we recommend updating to the latest version. It introduces over 40 new features, including a major update to the Meetings module. + +In these Release Notes, we will give an overview of important feature changes. At the end, you will find a complete list of all changes and bug fixes. + +## Important feature changes + +### Schedule recurring meetings to streamline your weekly, biweekly, or custom appointments + +Organizing meetings just became much easier with **Recurring Meetings** in OpenProject 15.3. Instead of manually setting up repeated meetings, you can now create a Recurring Meeting series with flexible scheduling options. + +- **Set up meeting series**: Schedule meetings to recur on a weekly, biweekly, or custom basis. +- **Manage occurrences**: Each meeting in a series is an individual occurrence, allowing adjustments without affecting the entire series. +- **Flexible modifications**: Adjust single occurrences within a recurring meeting series without disrupting the entire schedule. +- **Improved meeting index page**: Recurring meetings are clearly displayed in the meetings index, helping users track their schedules efficiently. +- **ICS file support**: Download and integrate recurring meetings into external calendar applications. +- **Custom meeting templates**: Define standard templates for recurring meetings to ensure consistency. +- **Invitation emails for meeting series**: Participants receive automated notifications for scheduled recurring meetings. + +> [!NOTE] +> **Consistent terminology**: To improve clarity, OpenProject now categorizes meetings as **Classic**, **Recurring**, and **One-time**, replacing the previous Dynamic vs. Classic terminology. + +This major feature introduces multiple improvements, with several underlying enhancements that refine scheduling, management, and handling of meeting series. All individual changes related to Recurring Meetings are listed in the full changelog at the end of these release notes. + +The following screenshot shows an example Meetings overview page, highlighting some of the changes for version 15.3: + +![Example screenshot of new Meetings overview page with OpenProject 15.3, including Recurring meetings, Meeting series](openproject-15-3-recurring-meetings-highlighted.png) + +Please particularly note that filtering between upcoming and past meetings now happens on top of the page instead of the sidebar on the left. The sidebar now distinguishes between **My meetings**, **Recurring meetings** and **All meetings**, with separate sections for Meeting series and Involvement. + +[Learn more about the updated Meetings module and how to use it](../../user-guide/meetings/). + +### Create child work packages directly from the Relations tab + +With OpenProject 15.3, you can now again create child work packages directly from the Relations tab, making it faster and more intuitive to build structured work breakdowns. + +A new option, **New child**, has been added to the **+ Relation** dropdown. Selecting it opens a dialog where you can immediately enter essential details like type, subject, description, and other mandatory fields. Once created, the child work package is added to the list, and a confirmation message appears. + +![Screenshot showing the +Child actions in the dropdown list of the Relations tab](openproject-15-3-child-relation-highlighted.png) + +Additionally, if child work packages already exist, a **+ Child** button appears in the header of the child work packages section and allows you to quickly add another child to the active work package: + +![Screenshot showing the +Child button in the Relations tab of work packages](openproject-15-3-add-new-child-button-highlighted.png) + +[Learn more about work package relations and hierarchies in OpenProject](../../user-guide/work-packages/work-package-relations-hierarchies/). + +### Include total sums in timesheet PDF exports for better insights + +Tracking logged time is now more transparent with total sum calculations in timesheet PDF exports. Previously, users had to manually sum up hours across multiple users. With OpenProject 15.3, the PDF export now includes: + +- A summary table on a separate page when exporting timesheets for multiple users, showing total hours per user and a final sum. +- A sum row under each user's timesheet table, ensuring quick insights into individual and team-wide logged hours. + +This enhancement simplifies reporting, making it easier to review and analyze tracked time across teams. + +![Screenshot showing a timesheet overview page, including a sum](openproject-15-3-sums-pdf-timesheet-overview.png) + +[Learn more about time and cost reporting with OpenProject](../../user-guide/time-and-costs/reporting/). + +### Include child work packages in cost reports for more accurate tracking + +Cost reports in OpenProject now allow to easier include child work packages, ensuring more comprehensive cost tracking. Previously, users managing hierarchical work packages (such as epics, features, or sub-tasks) had to manually select each work package to ensure full cost visibility. + +OpenProject 15.3 introduces a new filter option for cost reports: **is (includes descendants)**, in addition to **is**. This allows users to automatically include all related child work packages (grandchildren, great-grandchildren, etc.) in their cost reports, improving accuracy and efficiency. This eliminates the need for cumbersome manual selection and ensures that all relevant costs are accounted for in reports. + +![Screenshot showing the dropdown in a cost report filter, highlighting the new 'is (includes descendents)' option](openproject-15-3-cost-report-children.png) + +[Learn more about tracking progress with OpenProject](../../user-guide/time-and-costs/progress-tracking/). + +### See dates of previously hidden, permission-restricted relations to make informed scheduling decisions + +OpenProject now provides better visibility into dependencies by displaying relation dates for work packages that users do not have permission to view. Previously, restricted relations were completely invisible, making it difficult to understand scheduling dependencies. + +OpenProject 15.3 improves transparency by displaying all relations in the Relations tab. While restricted work packages remain inaccessible, their **start and finish dates will now be visible**, along with lag time for applicable relations. This way, users still cannot interact with restricted work packages but will now understand why a task is scheduled at a specific time. + +Please note that currently, **only the following relations are displayed with a date** – not dependent on permissions: +- Successors (after) +- Predecessors (before) +- Children + +> [!NOTE] +> If a related work package has the same start and finish date, a single date is displayed instead of a range. This is [another feature of OpenProject 15.3 and applies to all Relations on the Relations tab](https://community.openproject.org/wp/61044), independent of the user's permissions. + +These improvements help teams make informed scheduling decisions while maintaining appropriate permission controls. Here is an example, showing two relations – one with full visibility and one with restricted visibility. + +![Mockup showing two relations in a work package, one is displayed in grey with restricted details, only date and lag](openproject-15-3-hidden-relation.png) + +[See our user guide to learn more about work package hierarchies in OpenProject](../../user-guide/work-packages/work-package-relations-hierarchies/#display-work-package-hierarchies). + +### Display a deletion dialog with danger zone for deleting items in a hierarchy + +Accidentally deleting hierarchical work packages can lead to irreversible data loss. To prevent this, OpenProject 15.3 introduces a danger dialog that requires user consent before proceeding with deletion. + +If a user attempts to delete a hierarchy item, a confirmation dialog appears, styled according to the Primer design system. Users must explicitly confirm their intent before deletion can proceed, ensuring greater safety for critical data. + +This confirmation dialog is also now available in the Meetings module for deleting meetings. Over the next releases, OpenProject will expand this feature to additional critical areas, such as project deletions, ensuring safer data management. + +### Show user popover everywhere and also when hovering on the name + +User popovers now appear when hovering over both names and avatars, ensuring a more consistent experience across OpenProject. This improvement enhances usability and makes user details more accessible in different areas of the application. + +Additionally, OpenProject 15.3 improves how popovers are displayed within modals, including the work package share dialog, global search, and global invitation modal. + +### Enable autocomplete for user custom field filter values on the project list + +Filtering user custom fields is now faster with autocompleters in the project list. Users can quickly search and select values from a dropdown, improving usability and performance. + +## Important technical updates and breaking changes + +### Centos 8 package support removed + +Centos 8 is EOL for quite some time and packages will no longer be built for it, starting with OpenProject 15.3.0. For more information on CentOS installation, please see [our installations and operations guide](../../installation-and-operations/installation/packaged/#centos-installation). + +### Seeding of design variables allowed (Enterprise add-on) + +It is now possible to set up custom design variables and logos as environment variables. This is useful in automated deployments such as with Kubernetes. For more information, please see [our installations and operations guide](../../installation-and-operations/configuration/#seeding-custom-theme-and-design-enterprise-add-on). + + + + + +## Bug fixes and changes + + + + +- Feature: Cost reports should include work package children \[[#32813](https://community.openproject.org/wp/32813)\] +- Feature: Create recurring meetings with flexible schedules \[[#54188](https://community.openproject.org/wp/54188)\] +- Feature: Meeting templates for recurring meetings \[[#54752](https://community.openproject.org/wp/54752)\] +- Feature: Add an "all meetings" to the default Meetings list \[[#56789](https://community.openproject.org/wp/56789)\] +- Feature: Iterations of recurring meetings \[[#58225](https://community.openproject.org/wp/58225)\] +- Feature: Overview page for a recurring meeting \[[#58226](https://community.openproject.org/wp/58226)\] +- Feature: Show recurring meetings in the meeting index page \[[#58227](https://community.openproject.org/wp/58227)\] +- Feature: Indicate that there are work package relations which the user has no permission to see \[[#58427](https://community.openproject.org/wp/58427)\] +- Feature: Deletion dialog with danger zone for deleting items in a hierarchy \[[#58637](https://community.openproject.org/wp/58637)\] +- Feature: Allow entering meeting duration in hours and minutes \[[#59404](https://community.openproject.org/wp/59404)\] +- Feature: Allow changing dates of a meeting series occurrence \[[#59773](https://community.openproject.org/wp/59773)\] +- Feature: Automatic instantiation of the next occurrence of a meeting series \[[#59775](https://community.openproject.org/wp/59775)\] +- Feature: Copying of recurring meetings occurrences \[[#59777](https://community.openproject.org/wp/59777)\] +- Feature: Cancelling recurring meetings occurrences \[[#59829](https://community.openproject.org/wp/59829)\] +- Feature: Add trailing unit for input fields in datepicker and lag field \[[#59860](https://community.openproject.org/wp/59860)\] +- Feature: Update meeting series template blankslate to include information \[[#59867](https://community.openproject.org/wp/59867)\] +- Feature: Pagination for recurring meetings \[[#59883](https://community.openproject.org/wp/59883)\] +- Feature: Cancellation dialogs for for one-time and recurring meetings \[[#59885](https://community.openproject.org/wp/59885)\] +- Feature: Recurring meetings ICS schedule \[[#59886](https://community.openproject.org/wp/59886)\] +- Feature: Show user popover on the name, not only avatar \[[#59925](https://community.openproject.org/wp/59925)\] +- Feature: End recurring meeting series \[[#59951](https://community.openproject.org/wp/59951)\] +- Feature: Recurring meetings: Improved display of form dialog \[[#59974](https://community.openproject.org/wp/59974)\] +- Feature: Update seed data to make "Weekly" a recurring meeting \[[#60135](https://community.openproject.org/wp/60135)\] +- Feature: Rename Dynamic meeting to "one-time" again \[[#60141](https://community.openproject.org/wp/60141)\] +- Feature: Invitation email for meeting series \[[#60200](https://community.openproject.org/wp/60200)\] +- Feature: Allow children creation from the new Relations Tab \[[#60273](https://community.openproject.org/wp/60273)\] +- Feature: Prevent autocomplete on date picker input fields \[[#60286](https://community.openproject.org/wp/60286)\] +- Feature: Allow seeding design variables \[[#60598](https://community.openproject.org/wp/60598)\] +- Feature: Remove ability to set default time tracking activity \[[#60718](https://community.openproject.org/wp/60718)\] +- Feature: Recurring meetings: Allow end date to be optional \[[#60880](https://community.openproject.org/wp/60880)\] +- Feature: Display sums in Timesheet PDF \[[#60923](https://community.openproject.org/wp/60923)\] +- Feature: Separate meeting series show page into two tables \[[#60959](https://community.openproject.org/wp/60959)\] +- Feature: Autocompleters for user cf filter values on the project list \[[#60972](https://community.openproject.org/wp/60972)\] +- Feature: Better structure upcoming meetings by organising them into named date sections \[[#61030](https://community.openproject.org/wp/61030)\] +- Feature: Relations tab: Show a single date when start and finish dates are the same \[[#61044](https://community.openproject.org/wp/61044)\] +- Feature: Remove smooth animation when loading the Activity tab with sort order 'Newest at the bottom' \[[#61074](https://community.openproject.org/wp/61074)\] +- Feature: Make user popover information visible everywhere \[[#61126](https://community.openproject.org/wp/61126)\] +- Feature: Better indicate when a recurring meeting has ended (or is ended manually) with changes in phrasing and a more helpful blankslate \[[#61161](https://community.openproject.org/wp/61161)\] +- Feature: Primerize the log time modal \[[#61322](https://community.openproject.org/wp/61322)\] +- Bugfix: Cost query for work package does not show children / value differs from spentTime \[[#33790](https://community.openproject.org/wp/33790)\] +- Bugfix: When logging time with comma in English language settings everything after the comma is cut off \[[#36307](https://community.openproject.org/wp/36307)\] +- Bugfix: Logging time and removing time activity sets the default one \[[#51751](https://community.openproject.org/wp/51751)\] +- Bugfix: Adding a new required project attribute blocks other project-level modifications \[[#55813](https://community.openproject.org/wp/55813)\] +- Bugfix: Opening the meetings details creates additional buttons at the bottom \[[#57912](https://community.openproject.org/wp/57912)\] +- Bugfix: Disable hover card on mobile \[[#58260](https://community.openproject.org/wp/58260)\] +- Bugfix: Notification center: Activity tab goes into mobile layout even when the browser window is smaller desktop wide \[[#59235](https://community.openproject.org/wp/59235)\] +- Bugfix: Network error about notifications showing up on Community \[[#59328](https://community.openproject.org/wp/59328)\] +- Bugfix: \[Regression\] Missing "Commit Message" Comments in Work Packages after upgrade to 15.0.1 \[[#59374](https://community.openproject.org/wp/59374)\] +- Bugfix: Changing an image size is not reflected in the export \[[#59533](https://community.openproject.org/wp/59533)\] +- Bugfix: Table formatting is not reflected in the PDF export \[[#59534](https://community.openproject.org/wp/59534)\] +- Bugfix: Quote comment action does not work if the Activity comment box already has text in it \[[#59543](https://community.openproject.org/wp/59543)\] +- Bugfix: Some translation bugs \[[#59913](https://community.openproject.org/wp/59913)\] +- Bugfix: On narrow screens (including mobile) the view always scrolls to the end of the Activity tab \[[#59916](https://community.openproject.org/wp/59916)\] +- Bugfix: Project membership in group administration lists global roles \[[#59934](https://community.openproject.org/wp/59934)\] +- Bugfix: Editing the date of an upcoming recurring meeting to a past date doesn't move it to the 'Past' tab \[[#59944](https://community.openproject.org/wp/59944)\] +- Bugfix: Clicking on recurring meetings, "My meetings" stays selected \[[#59947](https://community.openproject.org/wp/59947)\] +- Bugfix: Meeting template details panel name should be 'Meeting series details' \[[#59953](https://community.openproject.org/wp/59953)\] +- Bugfix: Meeting interval can be empty, leading to an error \[[#59955](https://community.openproject.org/wp/59955)\] +- Bugfix: Recurring meeting template header is missing the author name \[[#59958](https://community.openproject.org/wp/59958)\] +- Bugfix: Recurring meeting template info pane is missing some text \[[#59959](https://community.openproject.org/wp/59959)\] +- Bugfix: Internal server error on Azure OIDC login with expired client secret \[[#59960](https://community.openproject.org/wp/59960)\] +- Bugfix: Main recurring meeting index doesn't show updated empty state \[[#59966](https://community.openproject.org/wp/59966)\] +- Bugfix: Meeting name is not in a lighter shade on the recurring meeting overview page \[[#59976](https://community.openproject.org/wp/59976)\] +- Bugfix: Breadcrumb name should be 'My meetings' \[[#59994](https://community.openproject.org/wp/59994)\] +- Bugfix: User is taken back to the top of the page after loading more occurences of recurring meeting \[[#60007](https://community.openproject.org/wp/60007)\] +- Bugfix: Left side menu doesn't highlight Meeting series name \[[#60019](https://community.openproject.org/wp/60019)\] +- Bugfix: As anonymized user, meetings side menus should be reduced \[[#60117](https://community.openproject.org/wp/60117)\] +- Bugfix: Missing \* to show fields are required + wrong primary button name on the Recurring meeting form \[[#60118](https://community.openproject.org/wp/60118)\] +- Bugfix: Meeting template shows weird/wrong schedule \[[#60138](https://community.openproject.org/wp/60138)\] +- Bugfix: PDF report: list style of work package description incorrect \[[#60331](https://community.openproject.org/wp/60331)\] +- Bugfix: PDF export: List in table not formatted as in work package description \[[#60333](https://community.openproject.org/wp/60333)\] +- Bugfix: Error message in case of duplicate folder name is not accurate \[[#60423](https://community.openproject.org/wp/60423)\] +- Bugfix: Hyphenation feature in generated pdf files removes space before italic text \[[#60431](https://community.openproject.org/wp/60431)\] +- Bugfix: Custom user action broken \[[#60439](https://community.openproject.org/wp/60439)\] +- Bugfix: Misplaced cursor in comments text editor on iOS \[[#60538](https://community.openproject.org/wp/60538)\] +- Bugfix: LDAP sync not lockingusers if no values returned \[[#60566](https://community.openproject.org/wp/60566)\] +- Bugfix: Role permissions concerning comments are named "Notes" and are unclear \[[#60602](https://community.openproject.org/wp/60602)\] +- Bugfix: Adding a WP with long name as agenda item on Meetings creates a visual overlap \[[#60608](https://community.openproject.org/wp/60608)\] +- Bugfix: Add relation dialog is overflowing when the ticket name is rather long \[[#60619](https://community.openproject.org/wp/60619)\] +- Bugfix: Opening a work package (full view) on mobile auto-scrolls to the tab row when not desired \[[#60638](https://community.openproject.org/wp/60638)\] +- Bugfix: Mandatory fields not visible during project creation \[[#60652](https://community.openproject.org/wp/60652)\] +- Bugfix: Click on hamburger icon does not always open the sidebar on iOS \[[#60680](https://community.openproject.org/wp/60680)\] +- Bugfix: Applying a change in a cost report query saves it \[[#60681](https://community.openproject.org/wp/60681)\] +- Bugfix: Ending series via number of occurrences does not work if the ending condition was originally after a specific date \[[#60700](https://community.openproject.org/wp/60700)\] +- Bugfix: Regression: If WP title is long without spaces, it overflows outside of the split screen \[[#60705](https://community.openproject.org/wp/60705)\] +- Bugfix: Ends after 'a specific date' dates are not inclusive \[[#60713](https://community.openproject.org/wp/60713)\] +- Bugfix: Duplicate work package comments when clicking submit multiple times \[[#60719](https://community.openproject.org/wp/60719)\] +- Bugfix: Show dates of Children of a work package in relations tab \[[#60957](https://community.openproject.org/wp/60957)\] +- Bugfix: Icon beside dates of a relation is wrong in relation row \[[#60958](https://community.openproject.org/wp/60958)\] +- Bugfix: Upcoming meetings: Meeting durations under the 'Duration' column are not displayed in hours and minutes \[[#61034](https://community.openproject.org/wp/61034)\] +- Bugfix: UI Flickering when clicking on the activity anchor point \[[#61042](https://community.openproject.org/wp/61042)\] +- Bugfix: Activity tab does not scroll to the bottom for work packages with long history \[[#61049](https://community.openproject.org/wp/61049)\] +- Bugfix: Poor performance of GET /api/v3/work\_packages/:id and PATCH /api/v3/work\_packages/:id \[[#61058](https://community.openproject.org/wp/61058)\] +- Bugfix: When allowed to log time entries for others, time entries can be logged for any user regardless of visibility \[[#61084](https://community.openproject.org/wp/61084)\] +- Bugfix: Search produces 500 error response on certain attachment constellation \[[#61110](https://community.openproject.org/wp/61110)\] +- Bugfix: Refreshing exchanged token does not work with Keycloak \[[#61140](https://community.openproject.org/wp/61140)\] +- Bugfix: When adding a new meeting globally, leaving the project unselected results in strange error \[[#61176](https://community.openproject.org/wp/61176)\] +- Bugfix: Deleting a meeting occurrence does not send out a cancelled event \[[#61310](https://community.openproject.org/wp/61310)\] +- Bugfix: Meeting attachments are not reliably picked up by groupware \[[#61311](https://community.openproject.org/wp/61311)\] +- Bugfix: Poor performance of mentioning feature in larger datasets \[[#61365](https://community.openproject.org/wp/61365)\] +- Bugfix: Empty meeting series templates don't show the blue 'this is a template' info box \[[#61387](https://community.openproject.org/wp/61387)\] +- Bugfix: Meeting series don't send out updated invitation emails when changing schedule \[[#61388](https://community.openproject.org/wp/61388)\] +- Bugfix: Meeting global or project-scope lost on performing various actions \[[#61422](https://community.openproject.org/wp/61422)\] +- Bugfix: Meeting series occurrence should allow to schedule earlier \[[#61424](https://community.openproject.org/wp/61424)\] +- Bugfix: Popover missing on author of the forum \[[#61453](https://community.openproject.org/wp/61453)\] +- Bugfix: "Download ICS" menu action is broken on recurring show page \[[#61462](https://community.openproject.org/wp/61462)\] +- Bugfix: Failing to copy queries in a project copy job results in internal errors \[[#61483](https://community.openproject.org/wp/61483)\] +- Feature: Activity tab bug fixes and enhancements \[[#61524](https://community.openproject.org/wp/61524)\] + + + + +## Contributions + +A very special thank you goes to City of Cologne, Deutsche Bahn and ZenDiS for sponsoring released or upcoming features. Your support, alongside the efforts of our amazing Community, helps drive these innovations. + +Also, a big thanks to our Community members for reporting bugs and helping us identify and provide fixes. Special thanks for reporting and finding bugs go to Luka Bradesko, Max Mutzge, Lars Geiger, Rudi B., Alexander Aleschenko, Alex Fantini, Peter Wafzig. + +Last but not least, we are very grateful for our very engaged translation contributors on Crowdin, who translated quite a few OpenProject strings! This release we would like to highlight +- [greench](https://crowdin.com/profile/greench), for an outstanding number of translations into Turkish. +- [Kuma Yamashita](https://crowdin.com/profile/dredgk), for a great number of translations into Japanese. +- [Willers-ICT](https://crowdin.com/profile/willers-ict), for a great number of translations into Dutch. +- [Vlastislav Dockal](https://crowdin.com/profile/vdockal), for a great number of translations into Czech. + +Would you like to help out with translations yourself? Then take a look at our [translation guide](../../contributions-guide/translate-openproject/) and find out exactly how you can contribute. It is very much appreciated! diff --git a/docs/release-notes/15-3-0/openproject-15-3-add-new-child-button-highlighted.png b/docs/release-notes/15-3-0/openproject-15-3-add-new-child-button-highlighted.png new file mode 100644 index 000000000000..b7403e135b6d Binary files /dev/null and b/docs/release-notes/15-3-0/openproject-15-3-add-new-child-button-highlighted.png differ diff --git a/docs/release-notes/15-3-0/openproject-15-3-child-relation-highlighted.png b/docs/release-notes/15-3-0/openproject-15-3-child-relation-highlighted.png new file mode 100644 index 000000000000..7c0598c24265 Binary files /dev/null and b/docs/release-notes/15-3-0/openproject-15-3-child-relation-highlighted.png differ diff --git a/docs/release-notes/15-3-0/openproject-15-3-cost-report-children.png b/docs/release-notes/15-3-0/openproject-15-3-cost-report-children.png new file mode 100644 index 000000000000..10e02750d43e Binary files /dev/null and b/docs/release-notes/15-3-0/openproject-15-3-cost-report-children.png differ diff --git a/docs/release-notes/15-3-0/openproject-15-3-hidden-relation.png b/docs/release-notes/15-3-0/openproject-15-3-hidden-relation.png new file mode 100644 index 000000000000..04476e8e3d4b Binary files /dev/null and b/docs/release-notes/15-3-0/openproject-15-3-hidden-relation.png differ diff --git a/docs/release-notes/15-3-0/openproject-15-3-recurring-meetings-highlighted.png b/docs/release-notes/15-3-0/openproject-15-3-recurring-meetings-highlighted.png new file mode 100644 index 000000000000..d0965841371b Binary files /dev/null and b/docs/release-notes/15-3-0/openproject-15-3-recurring-meetings-highlighted.png differ diff --git a/docs/release-notes/15-3-0/openproject-15-3-sums-pdf-timesheet-overview.png b/docs/release-notes/15-3-0/openproject-15-3-sums-pdf-timesheet-overview.png new file mode 100644 index 000000000000..d0f1ded3fa1e Binary files /dev/null and b/docs/release-notes/15-3-0/openproject-15-3-sums-pdf-timesheet-overview.png differ diff --git a/docs/release-notes/README.md b/docs/release-notes/README.md index 12a3eeb33f26..9892d7a89dad 100644 --- a/docs/release-notes/README.md +++ b/docs/release-notes/README.md @@ -13,6 +13,13 @@ Stay up to date and get an overview of the new features included in the releases +## 15.3.0 + +Release date: 2025-02-19 + +[Release Notes](15-3-0/) + + ## 15.2.1 Release date: 2025-02-05 diff --git a/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement.png b/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement.png index 5597a04be055..97d0d5853ec0 100644 Binary files a/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement.png and b/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement.png differ diff --git a/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_homepage.png b/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_homepage.png index 7e7ac10f9ffa..a04327e7225e 100644 Binary files a/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_homepage.png and b/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_homepage.png differ diff --git a/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_login_screen.png b/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_login_screen.png index f7c224b9acce..08aacd44d336 100644 Binary files a/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_login_screen.png and b/docs/system-admin-guide/announcement/openproject_system_admin_guide_announcement_login_screen.png differ diff --git a/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api.png b/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api.png index 7d8e0c1a64de..a00b11d51b8f 100644 Binary files a/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api.png and b/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api.png differ diff --git a/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api_new_webhook.png b/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api_new_webhook.png index ef83b94338b1..0e48c9148efd 100644 Binary files a/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api_new_webhook.png and b/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_api_new_webhook.png differ diff --git a/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_webhooks.png b/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_webhooks.png index ab7c39859a67..4e56f15f7f5c 100644 Binary files a/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_webhooks.png and b/docs/system-admin-guide/api-and-webhooks/openproject_system_admin_guide_webhooks.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_add.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_add.png index f50582664719..3d1423f26f49 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_add.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_add.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_edit_delete.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_edit_delete.png index f62bc9759de7..b8ec44befe3f 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_edit_delete.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_edit_delete.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example.png index 8c74d81dd672..91afdacf8999 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example_wp.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example_wp.png index 6d3fd6dd271b..06230d55d9db 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example_wp.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_example_wp.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_overview.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_overview.png index 7a3808f91146..070d82918a36 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_overview.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_overview.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_overview_page.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_overview_page.png index 38a7e87dbf7f..a02ad84ee7ed 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_overview_page.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_overview_page.png differ diff --git a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_settings_page.png b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_settings_page.png index 77110c8dcfc5..cbde9b25e4fd 100644 Binary files a/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_settings_page.png and b/docs/system-admin-guide/attribute-help-texts/openproject_system_admin_guide_attribute_help_texts_project_settings_page.png differ diff --git a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings.png b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings.png index 27d1166c060e..5df4ce21259d 100644 Binary files a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings.png and b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings.png differ diff --git a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_other.png b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_other.png index 6248a00b856e..723339b006e0 100644 Binary files a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_other.png and b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_other.png differ diff --git a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_passwords.png b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_passwords.png index 0fffcc9c589c..81557285df25 100644 Binary files a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_passwords.png and b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_passwords.png differ diff --git a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_registration_footer.png b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_registration_footer.png index c72ce7c33c2d..2f9013120abc 100644 Binary files a/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_registration_footer.png and b/docs/system-admin-guide/authentication/authentication-settings/openproject_system_admin_guide_authentication_settings_registration_footer.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_filter.png b/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_filter.png index 7d46fe3fae45..44c295b6a1f4 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_filter.png and b/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_filter.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_group.png b/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_group.png index 49d4038fcfe0..2d7906ae09b5 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_group.png and b/docs/system-admin-guide/authentication/ldap-connections/ldap-group-synchronization/openproject_system_guide_add_ldap_group.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections.png b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections.png index 0b71cec862e5..b7e9fbc6eae8 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections.png and b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_attribute_mapping.png b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_attribute_mapping.png index 4ad7544054a7..4750d23cca53 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_attribute_mapping.png and b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_attribute_mapping.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_created.png b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_created.png index f40eeb17eccc..606d04ef528b 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_created.png and b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_created.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_host_security.png b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_host_security.png index 4d10af687f7d..4619b78a968f 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_host_security.png and b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_host_security.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_account_credentials.png b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_account_credentials.png index 6e911113085b..4a19c45eae95 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_account_credentials.png and b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_account_credentials.png differ diff --git a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_ldap_details.png b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_ldap_details.png index bb664b920689..5468c50a219e 100644 Binary files a/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_ldap_details.png and b/docs/system-admin-guide/authentication/ldap-connections/openproject_system_guide_ldap_connections_new_system_ldap_details.png differ diff --git a/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_button.png b/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_button.png index ed2c1da00df9..2f0f13bf8dcc 100644 Binary files a/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_button.png and b/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_button.png differ diff --git a/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_new.png b/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_new.png index 2fed0a9f1310..8ce228a8e3d7 100644 Binary files a/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_new.png and b/docs/system-admin-guide/authentication/oauth-applications/openproject_system_admin_guide_oauth_application_new.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/07-client-secret.png b/docs/system-admin-guide/authentication/openid-providers/07-client-secret.png index 969da0109899..bc9ed0aa698e 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/07-client-secret.png and b/docs/system-admin-guide/authentication/openid-providers/07-client-secret.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/08-add-secret.png b/docs/system-admin-guide/authentication/openid-providers/08-add-secret.png index 938e29a504a5..831a6b92b884 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/08-add-secret.png and b/docs/system-admin-guide/authentication/openid-providers/08-add-secret.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/azure-display-name-tenant.png b/docs/system-admin-guide/authentication/openid-providers/azure-display-name-tenant.png index 9bbb7a5495db..bebcd27b8f6f 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/azure-display-name-tenant.png and b/docs/system-admin-guide/authentication/openid-providers/azure-display-name-tenant.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/custom-provider-advanced-config.png b/docs/system-admin-guide/authentication/openid-providers/custom-provider-advanced-config.png index e7d477a353c9..c1966ad37750 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/custom-provider-advanced-config.png and b/docs/system-admin-guide/authentication/openid-providers/custom-provider-advanced-config.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/custom-provider-claims.png b/docs/system-admin-guide/authentication/openid-providers/custom-provider-claims.png index 0178b49510b6..ad137e8b525e 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/custom-provider-claims.png and b/docs/system-admin-guide/authentication/openid-providers/custom-provider-claims.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/custom-provider-metadata-discovery.png b/docs/system-admin-guide/authentication/openid-providers/custom-provider-metadata-discovery.png index 134426d9f556..e2d65f0ca181 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/custom-provider-metadata-discovery.png and b/docs/system-admin-guide/authentication/openid-providers/custom-provider-metadata-discovery.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/oidc-index-page.png b/docs/system-admin-guide/authentication/openid-providers/oidc-index-page.png index 09c0e4432211..de92bc0f11ba 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/oidc-index-page.png and b/docs/system-admin-guide/authentication/openid-providers/oidc-index-page.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_empty.png b/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_empty.png index 57a9adaf5b34..9ca147dec879 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_empty.png and b/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_empty.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_new_google.png b/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_new_google.png index fece608b05a1..1206c54fd0ab 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_new_google.png and b/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_new_google.png differ diff --git a/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_saved_google.png b/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_saved_google.png index 9f2bb67a2a36..eb885032ef23 100644 Binary files a/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_saved_google.png and b/docs/system-admin-guide/authentication/openid-providers/openproject_system-admin-guide_authentication_openid_provider_saved_google.png differ diff --git a/docs/system-admin-guide/authentication/openproject_system_guide_authentication_settings.png b/docs/system-admin-guide/authentication/openproject_system_guide_authentication_settings.png index b00b73dd2d41..16555ae783dc 100644 Binary files a/docs/system-admin-guide/authentication/openproject_system_guide_authentication_settings.png and b/docs/system-admin-guide/authentication/openproject_system_guide_authentication_settings.png differ diff --git a/docs/system-admin-guide/authentication/recaptcha/openproject_system_admin_guide_recaptcha.png b/docs/system-admin-guide/authentication/recaptcha/openproject_system_admin_guide_recaptcha.png index deba4d6c3a83..73974fc2241b 100644 Binary files a/docs/system-admin-guide/authentication/recaptcha/openproject_system_admin_guide_recaptcha.png and b/docs/system-admin-guide/authentication/recaptcha/openproject_system_admin_guide_recaptcha.png differ diff --git a/docs/system-admin-guide/authentication/saml/saml-encryption.png b/docs/system-admin-guide/authentication/saml/saml-encryption.png index a483ed8c41cb..4d8a21de09d6 100644 Binary files a/docs/system-admin-guide/authentication/saml/saml-encryption.png and b/docs/system-admin-guide/authentication/saml/saml-encryption.png differ diff --git a/docs/system-admin-guide/authentication/saml/saml-provider-primary-configuration.png b/docs/system-admin-guide/authentication/saml/saml-provider-primary-configuration.png index d516f0caf3d2..dcf8636fdf44 100644 Binary files a/docs/system-admin-guide/authentication/saml/saml-provider-primary-configuration.png and b/docs/system-admin-guide/authentication/saml/saml-provider-primary-configuration.png differ diff --git a/docs/system-admin-guide/authentication/saml/saml-show-view.png b/docs/system-admin-guide/authentication/saml/saml-show-view.png index a8d638f24b51..3a568eff4cd4 100644 Binary files a/docs/system-admin-guide/authentication/saml/saml-show-view.png and b/docs/system-admin-guide/authentication/saml/saml-show-view.png differ diff --git a/docs/system-admin-guide/authentication/two-factor-authentication/openproject_system_admin_guide_two_factor_authentication.png b/docs/system-admin-guide/authentication/two-factor-authentication/openproject_system_admin_guide_two_factor_authentication.png index 86e97b8127a7..3916664fd982 100644 Binary files a/docs/system-admin-guide/authentication/two-factor-authentication/openproject_system_admin_guide_two_factor_authentication.png and b/docs/system-admin-guide/authentication/two-factor-authentication/openproject_system_admin_guide_two_factor_authentication.png differ diff --git a/docs/system-admin-guide/backlogs/openproject_system_admin_guide_backlog_settings.png b/docs/system-admin-guide/backlogs/openproject_system_admin_guide_backlog_settings.png index 0948ca21a830..2b825997005c 100644 Binary files a/docs/system-admin-guide/backlogs/openproject_system_admin_guide_backlog_settings.png and b/docs/system-admin-guide/backlogs/openproject_system_admin_guide_backlog_settings.png differ diff --git a/docs/system-admin-guide/backup/openproject_system_guide_backup_tocken.png b/docs/system-admin-guide/backup/openproject_system_guide_backup_tocken.png index 89cd6730dc7e..517b8151c6e2 100644 Binary files a/docs/system-admin-guide/backup/openproject_system_guide_backup_tocken.png and b/docs/system-admin-guide/backup/openproject_system_guide_backup_tocken.png differ diff --git a/docs/system-admin-guide/backup/openproject_system_guide_backup_token_confirm.png b/docs/system-admin-guide/backup/openproject_system_guide_backup_token_confirm.png index f4060c31922e..7d8623fdf0b2 100644 Binary files a/docs/system-admin-guide/backup/openproject_system_guide_backup_token_confirm.png and b/docs/system-admin-guide/backup/openproject_system_guide_backup_token_confirm.png differ diff --git a/docs/system-admin-guide/backup/openproject_system_guide_backup_token_success.png b/docs/system-admin-guide/backup/openproject_system_guide_backup_token_success.png index e6e6c3f484d4..5f6a99b115b8 100644 Binary files a/docs/system-admin-guide/backup/openproject_system_guide_backup_token_success.png and b/docs/system-admin-guide/backup/openproject_system_guide_backup_token_success.png differ diff --git a/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates.png b/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates.png index b77fe24e93ba..f6ee024759c2 100644 Binary files a/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates.png and b/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates.png differ diff --git a/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_calendar_subscritpions.png b/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_calendar_subscritpions.png index a14d68731d7a..a3283a93d580 100644 Binary files a/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_calendar_subscritpions.png and b/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_calendar_subscritpions.png differ diff --git a/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_date_format.png b/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_date_format.png index ac72336a08a1..2495bda5d175 100644 Binary files a/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_date_format.png and b/docs/system-admin-guide/calendars-and-dates/openeproject_system_admin_guide_calendars_dates_date_format.png differ diff --git a/docs/system-admin-guide/colors/openproject_system_admin_guide_colors.png b/docs/system-admin-guide/colors/openproject_system_admin_guide_colors.png index 8d0414c29c23..44ae581b4a9b 100644 Binary files a/docs/system-admin-guide/colors/openproject_system_admin_guide_colors.png and b/docs/system-admin-guide/colors/openproject_system_admin_guide_colors.png differ diff --git a/docs/system-admin-guide/colors/openproject_system_admin_guide_colors_new.png b/docs/system-admin-guide/colors/openproject_system_admin_guide_colors_new.png index 8be5ea564e39..21ed4f7b8936 100644 Binary files a/docs/system-admin-guide/colors/openproject_system_admin_guide_colors_new.png and b/docs/system-admin-guide/colors/openproject_system_admin_guide_colors_new.png differ diff --git a/docs/system-admin-guide/custom-fields/image-20200122112806127.png b/docs/system-admin-guide/custom-fields/image-20200122112806127.png deleted file mode 100644 index 9415ec1fc2ad..000000000000 Binary files a/docs/system-admin-guide/custom-fields/image-20200122112806127.png and /dev/null differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_field_new_hierarchy_subitems.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_field_new_hierarchy_subitems.png index f19ff4cbfcfe..311f42237f50 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_field_new_hierarchy_subitems.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_field_new_hierarchy_subitems.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_fields_list.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_fields_list.png index a6f59cec00b9..5203ea1545ae 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_fields_list.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_custom_fields_list.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_further_levels.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_further_levels.png index 4d082f37ed3e..b279c36c8392 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_further_levels.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_further_levels.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_button.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_button.png index d2530838be8c..a048475f7ac5 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_button.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_button.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_form.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_form.png index e75a154f97f0..2d7cdc43de7b 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_form.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_add_item_form.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_edit_items.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_edit_items.png index 7b575549c009..9be54a073e4d 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_edit_items.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_hierarchy_field_edit_items.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects.png index b56b0d076a6f..7455bfd75246 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects_search.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects_search.png index f1e90c8b0af1..674ebfd00698 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects_search.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_add_to_projects_search.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_formats.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_formats.png deleted file mode 100644 index b40e6dd463fa..000000000000 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_formats.png and /dev/null differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_new_hierarchy.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_new_hierarchy.png index 7b44986f6cb1..420397acaaa0 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_new_hierarchy.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_new_hierarchy.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_path.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_path.png index cd859fc75a76..9d1833eab703 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_path.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_field_path.png differ diff --git a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_hierarchy_details_tab.png b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_hierarchy_details_tab.png index 0c4df8063ecb..a1652db07955 100644 Binary files a/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_hierarchy_details_tab.png and b/docs/system-admin-guide/custom-fields/openproject_system_guide_new_custom_hierarchy_details_tab.png differ diff --git a/docs/system-admin-guide/custom-fields/system-admin-allow-multi-select.png b/docs/system-admin-guide/custom-fields/system-admin-allow-multi-select.png index 40294e591f46..090d1c0522cf 100644 Binary files a/docs/system-admin-guide/custom-fields/system-admin-allow-multi-select.png and b/docs/system-admin-guide/custom-fields/system-admin-allow-multi-select.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_branding.png b/docs/system-admin-guide/design/openproject_system_guide_design_branding.png index 92ec47350a6e..4504576dd5f0 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_branding.png and b/docs/system-admin-guide/design/openproject_system_guide_design_branding.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_color_theme_navy_blue.png b/docs/system-admin-guide/design/openproject_system_guide_design_color_theme_navy_blue.png index 279ffe936036..a78ebfc2ec44 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_color_theme_navy_blue.png and b/docs/system-admin-guide/design/openproject_system_guide_design_color_theme_navy_blue.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_custom_favicon.png b/docs/system-admin-guide/design/openproject_system_guide_design_custom_favicon.png index ee2cc0ac6cf6..fbf154163bf2 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_custom_favicon.png and b/docs/system-admin-guide/design/openproject_system_guide_design_custom_favicon.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_custom_logo_uploaded.png b/docs/system-admin-guide/design/openproject_system_guide_design_custom_logo_uploaded.png index 157bcae936da..1de7d9a0a5d7 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_custom_logo_uploaded.png and b/docs/system-admin-guide/design/openproject_system_guide_design_custom_logo_uploaded.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_interface.png b/docs/system-admin-guide/design/openproject_system_guide_design_interface.png index e45081bf1c95..43b844ad836d 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_interface.png and b/docs/system-admin-guide/design/openproject_system_guide_design_interface.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_interface_colors.png b/docs/system-admin-guide/design/openproject_system_guide_design_interface_colors.png index aaf4d8cf1d54..4e89079f740e 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_interface_colors.png and b/docs/system-admin-guide/design/openproject_system_guide_design_interface_colors.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_pdf_export_styles.png b/docs/system-admin-guide/design/openproject_system_guide_design_pdf_export_styles.png index 194e5e107c02..32efb09b3270 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_pdf_export_styles.png and b/docs/system-admin-guide/design/openproject_system_guide_design_pdf_export_styles.png differ diff --git a/docs/system-admin-guide/design/openproject_system_guide_design_upload_custom_logo.png b/docs/system-admin-guide/design/openproject_system_guide_design_upload_custom_logo.png index d9be0ba6c1e8..5be38bd1f86c 100644 Binary files a/docs/system-admin-guide/design/openproject_system_guide_design_upload_custom_logo.png and b/docs/system-admin-guide/design/openproject_system_guide_design_upload_custom_logo.png differ diff --git a/docs/system-admin-guide/design/pdf-export-styles/README.md b/docs/system-admin-guide/design/pdf-export-styles/README.md index 828f879fbe78..5c59bda5aca3 100644 --- a/docs/system-admin-guide/design/pdf-export-styles/README.md +++ b/docs/system-admin-guide/design/pdf-export-styles/README.md @@ -189,6 +189,7 @@ header: | `padding_top` | **Padding top**
      Padding only on the top side of the hero banner
      Examples: `10mm`, `10` | number or string
      See [Units](#units) | | `title` | **The first block in the hero**
      See [The first block in the hero](#the-first-block-in-the-hero) | object | | `heading` | **The main block in the hero**
      See [The main block in the hero](#the-main-block-in-the-hero) | object | +| `dates` | **The dates block in the hero**
      See [The dates block in the hero](#the-dates-block-in-the-hero) | object | | `subheading` | **The last block in the hero**
      See [The last block in the hero](#the-last-block-in-the-hero) | object | ## Font properties @@ -217,6 +218,32 @@ leading: 2 | `color` | **Color**
      A color in RRGGBB format
      Example: `F0F0F0` | string | | `styles` | Example: `[bold]`
      Valid values:
      `bold`, `italic`, `underline`, `strikethrough`, `superscript`, `subscript` | array of string | +## HTML table + +Key: `html_table` + +Example: + +```yaml +table: + auto_width: true + header: + background_color: F0F0F0 + no_repeating: true + size: 12 + cell: + background_color: 000FFF + size: 10 +``` + +| Key | Description | Data type | +| - | - | - | +| `auto_width` | **Automatic column widths**
      Table columns should fit the content, equal spacing of columns if value is `false` | boolean | +| `header` | **Table header cell**
      Styling for a table header cell
      See [Table header cell](#table-header-cell) | object | +| `cell` | **Table cell**
      Styling for a table cell
      See [Table cell](#table-cell) | object | +| … | See [Margin properties](#margin-properties) | | +| … | See [Border Properties](#border-properties) | | + ## Image caption Styling for the caption below an image @@ -301,6 +328,7 @@ markdown: | `font` | **Font properties**
      Properties to set the font style
      See [Font properties](#font-properties) | object | | `paragraph` | **Markdown paragraph**
      A block of text
      See [Markdown paragraph](#markdown-paragraph) | object | | `table` | **Markdown table**
      See [Markdown table](#markdown-table) | object | +| `html_table` | **HTML table**
      See [HTML table](#html-table) | object | | `headless_table` | **Markdown headless table**
      Tables without or empty header rows can be styled differently.
      See [Markdown headless table](#markdown-headless-table) | object | | `code` | **Markdown code**
      Styling to denote a word or phrase as code
      See [Markdown code](#markdown-code) | object | | `codeblock` | **Markdown code block**
      Styling to denote a paragraph as code
      See [Markdown code block](#markdown-code-block) | object | @@ -520,7 +548,7 @@ Example: ```yaml ordered_list_point: template: "." - alphabetical: false + list_style_type: decimal spacing: 0.75mm spanning: true ``` @@ -528,7 +556,8 @@ ordered_list_point: | Key | Description | Data type | | - | - | - | | `spacing` | A number >= 0 and an optional unit
      Examples: `10mm`, `10` | number or string
      See [Units](#units) | -| `alphabetical` | **Alphabetical bullet points**
      Convert the list item number into a character, eg. `a.` `b.` `c.` | boolean | +| `alphabetical` | **Alphabetical bullet points**
      (deprecated; use list_style_type) Convert the list item number into a character, eg. `a.` `b.` `c.` | boolean | +| `list_style_type` | **List style type**
      The style of the list bullet points, eg. `decimal`, `lower-latin`, `upper-roman`
      Valid values:
      `decimal`, `lower-latin`, `lower-roman`, `upper-latin`, `upper-roman` | string | | `spanning` | **Spanning**
      Use the width of the largest bullet as indention. | boolean | | `template` | **Template**
      customize what the prefix should contain, eg. `()` | string | | … | See [Font properties](#font-properties) | | @@ -650,14 +679,14 @@ overview: table: {} ``` -| Key | Description | Data type | -| - |-----------------------------------------------------------------------------------------------------------------------------------------------| - | -| `group_heading` | **Overview group heading**
      Styling for the group level if grouping is activated
      See [Overview group heading](#overview-group-heading) | object | -| `table` | **Overview table**
      See [Overview table](#overview-table) | object | +| Key | Description | Data type | +| - | - | - | +| `group_heading` | **Overview group heading**
      Styling for the group label if grouping is activated
      See [Overview group heading](#overview-group-heading) | object | +| `table` | **Overview table**
      See [Overview table](#overview-table) | object | ## Overview group heading -Styling for the group level if grouping is activated +Styling for the group label if grouping is activated Key: `group_heading` @@ -943,6 +972,28 @@ Key: `item_level_x` | … | See [Font properties](#font-properties) | | | … | See [Margin properties](#margin-properties) | | +## The dates block in the hero + +Key: `dates` + +Example: + +```yaml +heading: + spacing: 10 + max_height: 20 + size: 32 + color: 414d5f + styles: + - bold +``` + +| Key | Description | Data type | +| - | - | - | +| `max_height` | **Maximum height of the block**
      A number >= 0 and an optional unit
      Example: `30` | number or string
      See [Units](#units) | +| `spacing` | **Minimum spacing between dates and subheading**
      A number >= 0 and an optional unit
      Example: `10` | number or string
      See [Units](#units) | +| … | See [Font properties](#font-properties) | | + ## The first block in the hero Key: `title` diff --git a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_notification_settings.png b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_notification_settings.png index 05ba11b097c9..b9dfcc46519e 100644 Binary files a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_notification_settings.png and b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_notification_settings.png differ diff --git a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_aggregation.png b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_aggregation.png index 7b2511119e35..ca039da3f062 100644 Binary files a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_aggregation.png and b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_aggregation.png differ diff --git a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_header_footer.png b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_header_footer.png index 3e43cd29633f..5ca094688c6b 100644 Binary files a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_header_footer.png and b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_header_footer.png differ diff --git a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_incoming_emails.png b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_incoming_emails.png index 52cf8c2d473f..1eedd6481e15 100644 Binary files a/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_incoming_emails.png and b/docs/system-admin-guide/emails-and-notifications/openproject_system_admin_guide_email_settings_incoming_emails.png differ diff --git a/docs/system-admin-guide/enumerations/README.md b/docs/system-admin-guide/enumerations/README.md index 7895c9b39c83..c68571724ab6 100644 --- a/docs/system-admin-guide/enumerations/README.md +++ b/docs/system-admin-guide/enumerations/README.md @@ -28,9 +28,17 @@ You will then be able to name the value, activate it and choose if it should be ## Edit or remove enumeration value 1. To **edit** an existing configuration simply click on the name. + 2. If the enumeration is activated, it will have the check mark in the column **Active**. + 3. The **default value** is identified by the check mark in the respective column. + + > [!TIP] + > + > Values for **Time tracking activities** cannot be set as default values. + 4. You can move the enumerations in the list of possible values up or down with the sort. + 5. To remove an enumeration click on the respective **delete icon**. ![Edit, sort or remove enumerations in OpenProject administration](openproject_system_admin_guide_enumerations_sort_delete.png) diff --git a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations.png b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations.png index 408520a50f64..f7f335126819 100644 Binary files a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations.png and b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations.png differ diff --git a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new.png b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new.png index da45c10a8ee5..92703212df86 100644 Binary files a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new.png and b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new.png differ diff --git a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new_details.png b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new_details.png index f7d60cff8cc3..d6af34bc5bd5 100644 Binary files a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new_details.png and b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_add_new_details.png differ diff --git a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_sort_delete.png b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_sort_delete.png index b74fb74b705d..4c2a3203949b 100644 Binary files a/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_sort_delete.png and b/docs/system-admin-guide/enumerations/openproject_system_admin_guide_enumerations_sort_delete.png differ diff --git a/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_health_message.png b/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_health_message.png index 5d48406f7080..f481fdb69739 100644 Binary files a/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_health_message.png and b/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_health_message.png differ diff --git a/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection.png b/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection.png index 6f7cc36b33e1..a7edc3dc8188 100644 Binary files a/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection.png and b/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection.png differ diff --git a/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection_nextcloud.png b/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection_nextcloud.png index 66b07a52f3a6..af653a897ce7 100644 Binary files a/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection_nextcloud.png and b/docs/system-admin-guide/files/external-file-storages/health-status/openproject_file_storages_recheck_connection_nextcloud.png differ diff --git a/docs/system-admin-guide/information/openproject_system_admin_guide_information.png b/docs/system-admin-guide/information/openproject_system_admin_guide_information.png index 81880fd8f600..8ac08d8fd773 100644 Binary files a/docs/system-admin-guide/information/openproject_system_admin_guide_information.png and b/docs/system-admin-guide/information/openproject_system_admin_guide_information.png differ diff --git a/docs/system-admin-guide/information/openproject_system_admin_guide_information_storage_info.png b/docs/system-admin-guide/information/openproject_system_admin_guide_information_storage_info.png index 10cfc171269f..7e59436fc6b7 100644 Binary files a/docs/system-admin-guide/information/openproject_system_admin_guide_information_storage_info.png and b/docs/system-admin-guide/information/openproject_system_admin_guide_information_storage_info.png differ diff --git a/docs/system-admin-guide/information/openproject_system_admin_guide_information_system.png b/docs/system-admin-guide/information/openproject_system_admin_guide_information_system.png index 429b51b451bd..9b8c2498c125 100644 Binary files a/docs/system-admin-guide/information/openproject_system_admin_guide_information_system.png and b/docs/system-admin-guide/information/openproject_system_admin_guide_information_system.png differ diff --git a/docs/system-admin-guide/integrations/github-integration/README.md b/docs/system-admin-guide/integrations/github-integration/README.md index 96d293891152..6bccad1e74a0 100644 --- a/docs/system-admin-guide/integrations/github-integration/README.md +++ b/docs/system-admin-guide/integrations/github-integration/README.md @@ -1,6 +1,6 @@ --- sidebar_navigation: - title: GitHub integration + title: GitHub integration - Documentation priority: 900 description: Integrate the GitHub pull request workflow into OpenProject. keywords: github integration diff --git a/docs/system-admin-guide/integrations/github-integration/github-role.png b/docs/system-admin-guide/integrations/github-integration/github-role.png index 348f3d3290ca..224a63a1f52c 100644 Binary files a/docs/system-admin-guide/integrations/github-integration/github-role.png and b/docs/system-admin-guide/integrations/github-integration/github-role.png differ diff --git a/docs/system-admin-guide/integrations/gitlab-integration/README.md b/docs/system-admin-guide/integrations/gitlab-integration/README.md index f596f6825405..b703580141c4 100644 --- a/docs/system-admin-guide/integrations/gitlab-integration/README.md +++ b/docs/system-admin-guide/integrations/gitlab-integration/README.md @@ -1,6 +1,6 @@ --- sidebar_navigation: - title: GitLab integration + title: GitLab integration - Documentation priority: 800 description: Integrate the GitLab merge request and issues into OpenProject. keywords: GitLab, GitLab integration, merge request diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_admin-file-storages.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_admin-file-storages.png index e80390efd108..41d0b70fabef 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_admin-file-storages.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_admin-file-storages.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_file_storages_add_projects_button.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_file_storages_add_projects_button.png index 46300583743f..d156a1d177ad 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_file_storages_add_projects_button.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_file_storages_add_projects_button.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_edit_remove_in_projects.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_edit_remove_in_projects.png index a34c69111905..66edc7d21512 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_edit_remove_in_projects.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_edit_remove_in_projects.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_incomplete_message.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_incomplete_message.png index 48fdd830b20a..175d7856e56d 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_incomplete_message.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_incomplete_message.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_openproject_integration_app.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_openproject_integration_app.png index 94af7386262a..267105353ccf 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_openproject_integration_app.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_openproject_integration_app.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_1.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_1.png index 4f467a48a5ff..96a9f0947f0d 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_1.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_1.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_10.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_10.png index d82a76a4a4fa..bc09546a4477 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_10.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_10.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_11.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_11.png index aa44248488e3..fd2e81b18dc2 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_11.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_11.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_2.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_2.png index 398cfcb973eb..3fe1e50bc710 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_2.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_2.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_3.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_3.png index 1d0a9daff6b1..a8acc4fd3d84 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_3.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_3.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_4.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_4.png index d90bbc2df79d..41f5f29502a3 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_4.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_4.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_5.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_5.png index d09b75dff4c5..600035bfc478 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_5.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_5.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_6.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_6.png index bbe5975a30b8..65a18cdaf4b0 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_6.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_6.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_7.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_7.png index 6b44fd0bda2f..7a5c574ad600 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_7.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_7.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_8.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_8.png index b02898db9aeb..9458e5f4cf70 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_8.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_8.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_9.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_9.png index ae45951b0fba..f56a8c73ff7b 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_9.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_integration_setup_step_9.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_reset.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_reset.png index 9ad36d80fe69..b9d37eee4016 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_reset.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_reset.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_activate_in_projects.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_activate_in_projects.png index 1e7f23651c81..e3c8d31c74b7 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_activate_in_projects.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_activate_in_projects.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_button.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_button.png index c4696a0e86de..962dc8f4f295 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_button.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_button.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_icon.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_icon.png index 40c9790ce65c..5b330959acb0 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_icon.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_delete_storage_icon.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_oaut_replace_alert.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_oaut_replace_alert.png index 5eb2a571180d..9b6434a172ef 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_oaut_replace_alert.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_oaut_replace_alert.png differ diff --git a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_select_apps.png b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_select_apps.png index 0658009841bf..ab6329a3f4f8 100644 Binary files a/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_select_apps.png and b/docs/system-admin-guide/integrations/nextcloud/openproject_system_guide_nextcloud_setup_select_apps.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_icon_onedrive_storage.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_icon_onedrive_storage.png index 29061fd09ac7..c0ace83bc551 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_icon_onedrive_storage.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_icon_onedrive_storage.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_onedrive_storage_in_a_project.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_onedrive_storage_in_a_project.png index 8db266833914..022112c348d0 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_onedrive_storage_in_a_project.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_delete_onedrive_storage_in_a_project.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_edit_icon_onedrive_storage.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_edit_icon_onedrive_storage.png index 06bcd6792f82..310ad6e77c1a 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_edit_icon_onedrive_storage.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_edit_icon_onedrive_storage.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_file_storages_add_projects_button_onedrive.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_file_storages_add_projects_button_onedrive.png index c25c721c68a0..ad23276c66aa 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_file_storages_add_projects_button_onedrive.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_file_storages_add_projects_button_onedrive.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_add_multiple_projects.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_add_multiple_projects.png index 3d7c2b710666..57a4f7853d46 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_add_multiple_projects.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_add_multiple_projects.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_remove_projects.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_remove_projects.png index 1cff0c50c505..b0b97b23737e 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_remove_projects.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_onedrive_storage_remove_projects.png differ diff --git a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_select_onedrive_storage.png b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_select_onedrive_storage.png index 0a9d3ff804f9..d91efa74b86b 100644 Binary files a/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_select_onedrive_storage.png and b/docs/system-admin-guide/integrations/one-drive/openproject_system_guide_select_onedrive_storage.png differ diff --git a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_button.png b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_button.png index e33c77711b64..48dd848c446c 100644 Binary files a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_button.png and b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_button.png differ diff --git a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_create_new.png b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_create_new.png index 2909996bbca2..f7c4bb68a5d8 100644 Binary files a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_create_new.png and b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_create_new.png differ diff --git a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_edit_delete.png b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_edit_delete.png index 4db998edfbe2..805d023d2b96 100644 Binary files a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_edit_delete.png and b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_edit_delete.png differ diff --git a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_overview.png b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_overview.png index 127019c0b7f3..5e0739d4a288 100644 Binary files a/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_overview.png and b/docs/system-admin-guide/manage-work-packages/custom-actions/openproject_system_guide_work_packages_custom_actions_overview.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings.png b/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings.png index 2738d1497f57..c0c458929930 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings.png and b/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings_warning_message.png b/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings_warning_message.png index 9b3896850bb9..535a8fd9c727 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings_warning_message.png and b/docs/system-admin-guide/manage-work-packages/work-package-progress-tracking/openproject_system_guide_progress_tracking_settings_warning_message.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-settings/openproject_system_guide_work_package_settings.png b/docs/system-admin-guide/manage-work-packages/work-package-settings/openproject_system_guide_work_package_settings.png index d5ca2938aec5..00e7871efae0 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-settings/openproject_system_guide_work_package_settings.png and b/docs/system-admin-guide/manage-work-packages/work-package-settings/openproject_system_guide_work_package_settings.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_new_wp_status.png b/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_new_wp_status.png index 605a92179644..5afda71450a5 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_new_wp_status.png and b/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_new_wp_status.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_wp_status_overview.png b/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_wp_status_overview.png index 01f27fc06669..0e024c2cf10e 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_wp_status_overview.png and b/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_create_wp_status_overview.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_edit_new_wp_status.png b/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_edit_new_wp_status.png index bfaf9dac503b..62a6f1805145 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_edit_new_wp_status.png and b/docs/system-admin-guide/manage-work-packages/work-package-status/openproject_system_guide_edit_new_wp_status.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/README.md b/docs/system-admin-guide/manage-work-packages/work-package-types/README.md index 2980df8ee6d8..5f6cb90c6894 100644 --- a/docs/system-admin-guide/manage-work-packages/work-package-types/README.md +++ b/docs/system-admin-guide/manage-work-packages/work-package-types/README.md @@ -104,3 +104,7 @@ The **Activated for new projects by default** setting in the Types will only act This can be also configured in the [project settings](../../../user-guide/projects/project-settings). ![activate projects for work package types](image-20200116150513323.png) + +## Work package subject configuration (Enterprise add-on) + +Under **Administration -> Work packages -> Types** on the tab **Subject configuration** you can choose whether work package subjects should be defined automatically. diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/image-20200116150513323.png b/docs/system-admin-guide/manage-work-packages/work-package-types/image-20200116150513323.png index 2819c9913974..09c91551f618 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/image-20200116150513323.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/image-20200116150513323.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/open_project_admin_related_wp_table.png b/docs/system-admin-guide/manage-work-packages/work-package-types/open_project_admin_related_wp_table.png index 414ed7c3555c..ad62b734c101 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/open_project_admin_related_wp_table.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/open_project_admin_related_wp_table.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_admin_guide_filter_wp.png b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_admin_guide_filter_wp.png index 90efce0cbebf..3897cb00ccc2 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_admin_guide_filter_wp.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_admin_guide_filter_wp.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_risk_wp.png b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_risk_wp.png index d861b95191d4..745267c1ece5 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_risk_wp.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_risk_wp.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_work_package_typ.png b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_work_package_typ.png index ba653f5dd182..e78c5e3ce8f2 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_work_package_typ.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_new_work_package_typ.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_table_of_related_wp.png b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_table_of_related_wp.png index 2db2f83e7e6b..ccdc5ecd9eb3 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_table_of_related_wp.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_table_of_related_wp.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_work_package_types.png b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_work_package_types.png index 1a416b44acd6..5adbccb19b16 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_work_package_types.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_work_package_types.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_wp_form_configuration.png b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_wp_form_configuration.png index 383b8c0b0452..c3f74695e4ae 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_wp_form_configuration.png and b/docs/system-admin-guide/manage-work-packages/work-package-types/openproject_system_guide_wp_form_configuration.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows.png index 73849a7d71e0..8ffc17ef96dd 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy.png index 054028d4ee67..c75ed08b896e 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_copy.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_edit.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_edit.png index 3af1e58b455a..28a7b01faad8 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_edit.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_edit.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_overview.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_overview.png index 9bbf965c484b..92edf6447c8c 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_overview.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_overview.png differ diff --git a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_summary.png b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_summary.png index f75b8a05928b..8f98beb60f6e 100644 Binary files a/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_summary.png and b/docs/system-admin-guide/manage-work-packages/work-package-workflows/System-admin-guide-work-package-workflows_summary.png differ diff --git a/docs/system-admin-guide/openproject_system_administration_start_page.png b/docs/system-admin-guide/openproject_system_administration_start_page.png index 55856eaad19a..9fd35eea752c 100644 Binary files a/docs/system-admin-guide/openproject_system_administration_start_page.png and b/docs/system-admin-guide/openproject_system_administration_start_page.png differ diff --git a/docs/system-admin-guide/plugins/openproject_system_admin_guide_plugins.png b/docs/system-admin-guide/plugins/openproject_system_admin_guide_plugins.png index b0ed8f5be4b5..58d1e6837a75 100644 Binary files a/docs/system-admin-guide/plugins/openproject_system_admin_guide_plugins.png and b/docs/system-admin-guide/plugins/openproject_system_admin_guide_plugins.png differ diff --git a/docs/system-admin-guide/projects/new-project/open_project_system_guide_new_project_settings.png b/docs/system-admin-guide/projects/new-project/open_project_system_guide_new_project_settings.png index 428dcc5fdccb..9d527279c4d8 100644 Binary files a/docs/system-admin-guide/projects/new-project/open_project_system_guide_new_project_settings.png and b/docs/system-admin-guide/projects/new-project/open_project_system_guide_new_project_settings.png differ diff --git a/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_details.png b/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_details.png index 4599242ac826..0141d059c4ea 100644 Binary files a/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_details.png and b/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_details.png differ diff --git a/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_list.png b/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_list.png index 27a2aabe289d..ff9bda5f005c 100644 Binary files a/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_list.png and b/docs/system-admin-guide/projects/project-attributes/open_project_system_admin_guide_project_attributes_list.png differ diff --git a/docs/system-admin-guide/projects/project-attributes/open_project_system_guide_project_attributes_new_attribute.png b/docs/system-admin-guide/projects/project-attributes/open_project_system_guide_project_attributes_new_attribute.png index 0c550e160bf6..44bf2639326d 100644 Binary files a/docs/system-admin-guide/projects/project-attributes/open_project_system_guide_project_attributes_new_attribute.png and b/docs/system-admin-guide/projects/project-attributes/open_project_system_guide_project_attributes_new_attribute.png differ diff --git a/docs/system-admin-guide/projects/project-lists/open_project_system_guide_projects_project_lists.png b/docs/system-admin-guide/projects/project-lists/open_project_system_guide_projects_project_lists.png index 2004ce486991..8ed71ed54e54 100644 Binary files a/docs/system-admin-guide/projects/project-lists/open_project_system_guide_projects_project_lists.png and b/docs/system-admin-guide/projects/project-lists/open_project_system_guide_projects_project_lists.png differ diff --git a/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings.png b/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings.png index da84d9815179..47d9a5868371 100644 Binary files a/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings.png and b/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings.png differ diff --git a/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings_welcome_message.png b/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings_welcome_message.png index ffe8920e15ac..386f19aae155 100644 Binary files a/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings_welcome_message.png and b/docs/system-admin-guide/system-settings/general-settings/openproject_system_admin_guide_general_settings_welcome_message.png differ diff --git a/docs/system-admin-guide/system-settings/languages/openproject-system-languages.png b/docs/system-admin-guide/system-settings/languages/openproject-system-languages.png index e54a17a90b1a..e9ee499a5697 100644 Binary files a/docs/system-admin-guide/system-settings/languages/openproject-system-languages.png and b/docs/system-admin-guide/system-settings/languages/openproject-system-languages.png differ diff --git a/docs/system-admin-guide/system-settings/openproject_system_guide_system_settings.png b/docs/system-admin-guide/system-settings/openproject_system_guide_system_settings.png index d05376052735..ac29b2db6cfb 100644 Binary files a/docs/system-admin-guide/system-settings/openproject_system_guide_system_settings.png and b/docs/system-admin-guide/system-settings/openproject_system_guide_system_settings.png differ diff --git a/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_checkout_instructions.png b/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_checkout_instructions.png index 998f1a16d2eb..2a12c8591735 100644 Binary files a/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_checkout_instructions.png and b/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_checkout_instructions.png differ diff --git a/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_commit_messages.png b/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_commit_messages.png index df4fd4033af2..54582303bd2f 100644 Binary files a/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_commit_messages.png and b/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_commit_messages.png differ diff --git a/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_settings.png b/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_settings.png index 2fd37e8a4c4e..c713415dcf06 100644 Binary files a/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_settings.png and b/docs/system-admin-guide/system-settings/repositories/openproject_system_admin_guide_repositories_settings.png differ diff --git a/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_cost_types_overview.png b/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_cost_types_overview.png index 8e0db9335e81..fd9dc8c2dec4 100644 Binary files a/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_cost_types_overview.png and b/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_cost_types_overview.png differ diff --git a/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_new_cost_type.png b/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_new_cost_type.png index b6a40aae5fa8..b6c609d2b30e 100644 Binary files a/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_new_cost_type.png and b/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_new_cost_type.png differ diff --git a/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_settings.png b/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_settings.png index e6035e5c5f27..2f8170468dbf 100644 Binary files a/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_settings.png and b/docs/system-admin-guide/time-and-costs/openproject_system_admin_guide_time_costs_settings.png differ diff --git a/docs/system-admin-guide/users-permissions/avatars/system-guide-avatar.png b/docs/system-admin-guide/users-permissions/avatars/system-guide-avatar.png index 351725f5dd90..c94f7e56b5f5 100644 Binary files a/docs/system-admin-guide/users-permissions/avatars/system-guide-avatar.png and b/docs/system-admin-guide/users-permissions/avatars/system-guide-avatar.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_delete_groups.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_delete_groups.png index 26fe8f99ca3e..ad60c0019817 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_delete_groups.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_delete_groups.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_group_profile.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_group_profile.png index db3bbb724cc0..3dc5b32e1ecc 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_group_profile.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_group_profile.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group.png index bb498175f05f..a1993f31b792 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_members.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_members.png index 44f72f1639cc..6036225a4a16 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_members.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_members.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_projects.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_projects.png index ae5f5fc46280..2118dcec4963 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_projects.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_edit_new_group_add_projects.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_groups.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_groups.png index e535ba58f323..9cbe57b0ae8f 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_groups.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_groups.png differ diff --git a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_new_group.png b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_new_group.png index 4aebeb07d335..28c7a273bfea 100644 Binary files a/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_new_group.png and b/docs/system-admin-guide/users-permissions/groups/openproject_system_guide_new_group.png differ diff --git a/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_edit.png b/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_edit.png index 3c0cd4789690..65af721aa75d 100644 Binary files a/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_edit.png and b/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_edit.png differ diff --git a/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_overview.png b/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_overview.png index 132aac7f7a20..37452c57c8b1 100644 Binary files a/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_overview.png and b/docs/system-admin-guide/users-permissions/permissions-report/openproject_system_admin_guide_roles_permissions_report_overview.png differ diff --git a/docs/system-admin-guide/users-permissions/placeholder-users/open_project_user_guide_change_project.png b/docs/system-admin-guide/users-permissions/placeholder-users/open_project_user_guide_change_project.png index eadb1ed18fd9..dda1e3a13a85 100644 Binary files a/docs/system-admin-guide/users-permissions/placeholder-users/open_project_user_guide_change_project.png and b/docs/system-admin-guide/users-permissions/placeholder-users/open_project_user_guide_change_project.png differ diff --git a/docs/system-admin-guide/users-permissions/placeholder-users/openproject-system-guide-ph-user-new-project.png b/docs/system-admin-guide/users-permissions/placeholder-users/openproject-system-guide-ph-user-new-project.png index 92eb9fb41cd8..6a6cb7205020 100644 Binary files a/docs/system-admin-guide/users-permissions/placeholder-users/openproject-system-guide-ph-user-new-project.png and b/docs/system-admin-guide/users-permissions/placeholder-users/openproject-system-guide-ph-user-new-project.png differ diff --git a/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_new_placeholder_user.png b/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_new_placeholder_user.png index ca9f97f46e29..21f30dfd9c2f 100644 Binary files a/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_new_placeholder_user.png and b/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_new_placeholder_user.png differ diff --git a/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users.png b/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users.png index b209644863a3..d3e83278b2c3 100644 Binary files a/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users.png and b/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users.png differ diff --git a/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users_profile.png b/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users_profile.png index 9f9fe732cc60..98842e6f88c1 100644 Binary files a/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users_profile.png and b/docs/system-admin-guide/users-permissions/placeholder-users/openrpoject_system_guide_placeholder_users_profile.png differ diff --git a/docs/system-admin-guide/users-permissions/roles-permissions/openproject_user_guide_file_storages_permissions.png b/docs/system-admin-guide/users-permissions/roles-permissions/openproject_user_guide_file_storages_permissions.png index e9fff3d4b4a0..1d3e72206be8 100644 Binary files a/docs/system-admin-guide/users-permissions/roles-permissions/openproject_user_guide_file_storages_permissions.png and b/docs/system-admin-guide/users-permissions/roles-permissions/openproject_user_guide_file_storages_permissions.png differ diff --git a/docs/system-admin-guide/users-permissions/settings/Openproject_system_guide_user_settings.png b/docs/system-admin-guide/users-permissions/settings/Openproject_system_guide_user_settings.png index ac33196a92bd..6df8ed4aeb7a 100644 Binary files a/docs/system-admin-guide/users-permissions/settings/Openproject_system_guide_user_settings.png and b/docs/system-admin-guide/users-permissions/settings/Openproject_system_guide_user_settings.png differ diff --git a/docs/system-admin-guide/users-permissions/users/README.md b/docs/system-admin-guide/users-permissions/users/README.md index f82b768d015d..703be9b15a6c 100644 --- a/docs/system-admin-guide/users-permissions/users/README.md +++ b/docs/system-admin-guide/users-permissions/users/README.md @@ -200,7 +200,7 @@ The **Avatar** tab shows the default icon to be shown for this user. A custom im > ![TIP] > -> Hovering over a user's avatar, for example on the Members page or the Activity page, will display their information. +> Hovering over a user's avatar or name, for example on the Members page or the Activity page, will display their information. ### Two-factor authentication (2FA) diff --git a/docs/system-admin-guide/users-permissions/users/openproject_system_admin_guide_users_list.png b/docs/system-admin-guide/users-permissions/users/openproject_system_admin_guide_users_list.png index faca048c362a..6d0731471b86 100644 Binary files a/docs/system-admin-guide/users-permissions/users/openproject_system_admin_guide_users_list.png and b/docs/system-admin-guide/users-permissions/users/openproject_system_admin_guide_users_list.png differ diff --git a/docs/use-cases/safe-framework/project_list_-_solution_train.png b/docs/use-cases/safe-framework/project_list_-_solution_train.png index b8a8dcac5c80..e73548e9317a 100644 Binary files a/docs/use-cases/safe-framework/project_list_-_solution_train.png and b/docs/use-cases/safe-framework/project_list_-_solution_train.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_api.png b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_api.png index 067923b2310d..02b646b5fe57 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_api.png and b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_api.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_invalid.png b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_invalid.png index d40251efa366..28343d4b52e7 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_invalid.png and b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_invalid.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_list.png b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_list.png index 4be8ea5a4651..56a4108d3b2c 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_list.png and b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_calendar_list.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_delete_calendar.png b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_delete_calendar.png index da2017c33125..388d767dadf0 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_delete_calendar.png and b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_delete_calendar.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_oauth.png b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_oauth.png index dc74161caacd..e874e87cb0fd 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_oauth.png and b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_oauth.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_rss.png b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_rss.png index 79105495a997..26be6b8612ce 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_access_tokens_rss.png and b/docs/user-guide/account-settings/openproject_account_settings_access_tokens_rss.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_authentication_options.png b/docs/user-guide/account-settings/openproject_account_settings_authentication_options.png index 3e364d4f2d37..71189fd6d223 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_authentication_options.png and b/docs/user-guide/account-settings/openproject_account_settings_authentication_options.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_authenticator_webauth.png b/docs/user-guide/account-settings/openproject_account_settings_authenticator_webauth.png index b3f1b5ae3b47..37da013bf64a 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_authenticator_webauth.png and b/docs/user-guide/account-settings/openproject_account_settings_authenticator_webauth.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_avatar.png b/docs/user-guide/account-settings/openproject_account_settings_avatar.png index 062dc0801c16..26efeec3f637 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_avatar.png and b/docs/user-guide/account-settings/openproject_account_settings_avatar.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_change_password.png b/docs/user-guide/account-settings/openproject_account_settings_change_password.png index 37ce769bf523..8990126736a7 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_change_password.png and b/docs/user-guide/account-settings/openproject_account_settings_change_password.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_dark_mode.png b/docs/user-guide/account-settings/openproject_account_settings_dark_mode.png index 5a566d76dd4e..5c680e94ede8 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_dark_mode.png and b/docs/user-guide/account-settings/openproject_account_settings_dark_mode.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_delete_account.png b/docs/user-guide/account-settings/openproject_account_settings_delete_account.png index 0f92e4240e6c..dae7ebdcc4d4 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_delete_account.png and b/docs/user-guide/account-settings/openproject_account_settings_delete_account.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png b/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png index ea0bc15c7330..ebade92d0280 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png and b/docs/user-guide/account-settings/openproject_account_settings_email_reminders.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png b/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png index 014a02b5d884..ee3837334df0 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png and b/docs/user-guide/account-settings/openproject_account_settings_notification_settings.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_profile.png b/docs/user-guide/account-settings/openproject_account_settings_profile.png index 724222f20e28..68d7465177dc 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_profile.png and b/docs/user-guide/account-settings/openproject_account_settings_profile.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_sessions_management.png b/docs/user-guide/account-settings/openproject_account_settings_sessions_management.png index 125a4fbf29d0..952220da6a6d 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_sessions_management.png and b/docs/user-guide/account-settings/openproject_account_settings_sessions_management.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_settings.png b/docs/user-guide/account-settings/openproject_account_settings_settings.png index 4ef467f5f950..c9a632326b7d 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_settings.png and b/docs/user-guide/account-settings/openproject_account_settings_settings.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_settings_light_high_contrast_mode.png b/docs/user-guide/account-settings/openproject_account_settings_settings_light_high_contrast_mode.png index 5933fd1a7ac2..85a80752d492 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_settings_light_high_contrast_mode.png and b/docs/user-guide/account-settings/openproject_account_settings_settings_light_high_contrast_mode.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication.png b/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication.png index a326f446173d..3035726b3d51 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication.png and b/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication.png differ diff --git a/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication_mobile.png b/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication_mobile.png index 54fb1341920f..b89d658a1045 100644 Binary files a/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication_mobile.png and b/docs/user-guide/account-settings/openproject_account_settings_two_factor_authentication_mobile.png differ diff --git a/docs/user-guide/account-settings/openproject_select_account_settings.png b/docs/user-guide/account-settings/openproject_select_account_settings.png index 8c48c6e9188d..f79d2601ca21 100644 Binary files a/docs/user-guide/account-settings/openproject_select_account_settings.png and b/docs/user-guide/account-settings/openproject_select_account_settings.png differ diff --git a/docs/user-guide/activity/Activity-addEmoji.png b/docs/user-guide/activity/Activity-addEmoji.png index f555755d9033..3c95a582ddbf 100644 Binary files a/docs/user-guide/activity/Activity-addEmoji.png and b/docs/user-guide/activity/Activity-addEmoji.png differ diff --git a/docs/user-guide/activity/Activity-changeset.png b/docs/user-guide/activity/Activity-changeset.png index 4ecf3893210e..68e0dac599a9 100644 Binary files a/docs/user-guide/activity/Activity-changeset.png and b/docs/user-guide/activity/Activity-changeset.png differ diff --git a/docs/user-guide/activity/Activity-comment.png b/docs/user-guide/activity/Activity-comment.png index f84ca60cd939..aebf8332da35 100644 Binary files a/docs/user-guide/activity/Activity-comment.png and b/docs/user-guide/activity/Activity-comment.png differ diff --git a/docs/user-guide/activity/Activity-commentBox.png b/docs/user-guide/activity/Activity-commentBox.png index f941886700f8..c5fb51b0bdac 100644 Binary files a/docs/user-guide/activity/Activity-commentBox.png and b/docs/user-guide/activity/Activity-commentBox.png differ diff --git a/docs/user-guide/activity/Activity-filter.png b/docs/user-guide/activity/Activity-filter.png index 69c76eb1c1a0..7f4ffa7ab041 100644 Binary files a/docs/user-guide/activity/Activity-filter.png and b/docs/user-guide/activity/Activity-filter.png differ diff --git a/docs/user-guide/activity/Activity-mention.png b/docs/user-guide/activity/Activity-mention.png index b008a71e5066..f941a0a23a8c 100644 Binary files a/docs/user-guide/activity/Activity-mention.png and b/docs/user-guide/activity/Activity-mention.png differ diff --git a/docs/user-guide/activity/Activity-more.png b/docs/user-guide/activity/Activity-more.png index 5889804fbcf5..315932afd6b4 100644 Binary files a/docs/user-guide/activity/Activity-more.png and b/docs/user-guide/activity/Activity-more.png differ diff --git a/docs/user-guide/activity/Activity-sortOrder.png b/docs/user-guide/activity/Activity-sortOrder.png index 27a082e09c46..4640dde570eb 100644 Binary files a/docs/user-guide/activity/Activity-sortOrder.png and b/docs/user-guide/activity/Activity-sortOrder.png differ diff --git a/docs/user-guide/activity/Activity-tab.png b/docs/user-guide/activity/Activity-tab.png index ee3b9cab6abf..ca5ad53f8bbb 100644 Binary files a/docs/user-guide/activity/Activity-tab.png and b/docs/user-guide/activity/Activity-tab.png differ diff --git a/docs/user-guide/activity/README.md b/docs/user-guide/activity/README.md index 7ceffd6c3dcf..c587bc31fcf0 100644 --- a/docs/user-guide/activity/README.md +++ b/docs/user-guide/activity/README.md @@ -22,7 +22,7 @@ When you first access this tab, you will see the comments and list of changes in You can scroll up and down to go forwards or backwards in time. -By default, the activity tab shows both comments and changes, but you can filter this to only show one or the other: +By default, the Activity tab shows both comments and changes, but you can filter this to only show one or the other: ![Filter the activity tab](Activity-filter.png) diff --git a/docs/user-guide/activity/Work-package-activity-flag-someone.png b/docs/user-guide/activity/Work-package-activity-flag-someone.png deleted file mode 100644 index 37279661cae5..000000000000 Binary files a/docs/user-guide/activity/Work-package-activity-flag-someone.png and /dev/null differ diff --git a/docs/user-guide/activity/work-package-activity.png b/docs/user-guide/activity/work-package-activity.png deleted file mode 100644 index 37120cc673dd..000000000000 Binary files a/docs/user-guide/activity/work-package-activity.png and /dev/null differ diff --git a/docs/user-guide/agile-boards/choose-board-type.png b/docs/user-guide/agile-boards/choose-board-type.png index 8c29918a120a..ccdae72cc5a1 100644 Binary files a/docs/user-guide/agile-boards/choose-board-type.png and b/docs/user-guide/agile-boards/choose-board-type.png differ diff --git a/docs/user-guide/agile-boards/create-a-new-board-in-the-boards-module.png b/docs/user-guide/agile-boards/create-a-new-board-in-the-boards-module.png index ed6b99ddb9af..2a7a253d0ad6 100644 Binary files a/docs/user-guide/agile-boards/create-a-new-board-in-the-boards-module.png and b/docs/user-guide/agile-boards/create-a-new-board-in-the-boards-module.png differ diff --git a/docs/user-guide/agile-boards/openproject_userguide_boards_overview.png b/docs/user-guide/agile-boards/openproject_userguide_boards_overview.png index 0fa53df9c68c..3901be4bdf91 100644 Binary files a/docs/user-guide/agile-boards/openproject_userguide_boards_overview.png and b/docs/user-guide/agile-boards/openproject_userguide_boards_overview.png differ diff --git a/docs/user-guide/backlogs-scrum/taskboard/openproject_user_guide_backlogs_set_task_color.png b/docs/user-guide/backlogs-scrum/taskboard/openproject_user_guide_backlogs_set_task_color.png index 0caf66b5851c..32469a5d5b26 100644 Binary files a/docs/user-guide/backlogs-scrum/taskboard/openproject_user_guide_backlogs_set_task_color.png and b/docs/user-guide/backlogs-scrum/taskboard/openproject_user_guide_backlogs_set_task_color.png differ diff --git a/docs/user-guide/calendar/calendar-faq/README.md b/docs/user-guide/calendar/calendar-faq/README.md index 23bbe91ceb11..cf431e613289 100644 --- a/docs/user-guide/calendar/calendar-faq/README.md +++ b/docs/user-guide/calendar/calendar-faq/README.md @@ -20,7 +20,7 @@ To use the calendar in a project, you need to [activate the “Calendar” modul You cannot synchronize a personal calendar in OpenProject. However, you can [subscribe to a calendar](../#subscribe-to-a-calendar) using an external client that supports the iCalendar format. -You can also use the meeting module in OpenProject to organize meetings and invite project members. You can [export meetings as iCalendar file](../../meetings/dynamic-meetings/#create-or-edit-the-meeting-agenda) and import them to your external calendar. If you would like Microsoft Outlook to automatically import calendar invites, please check your Outlook settings and make sure to give permission from that side. +You can also use the meeting module in OpenProject to organize meetings and invite project members. You can [export meetings as iCalendar file](../../meetings/one-time-meetings/#download-a-meeting-as-an-icalendar-event) and import them to your external calendar. If you would like Microsoft Outlook to automatically import calendar invites, please check your Outlook settings and make sure to give permission from that side. ## Are holidays considered in the calendar? diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png index dc078d61b996..1363cc8b89e5 100644 Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-fileIsNowLinked.png differ diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png index c8055a5b34a4..8de28e82e2be 100644 Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selctFileToUpload.png differ diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png index 51747277da64..7904aa902406 100644 Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-selectLocationToUploadTo.png differ diff --git a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png index bf57ae45072c..9d1d420caded 100644 Binary files a/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png and b/docs/user-guide/file-management/nextcloud-integration/NC_12.5-uploadFilesLink.png differ diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png index b2225ffc3fa6..f80609ab1328 100644 Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_file_uploaded.png differ diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png index 2d833f7ccb68..ff679450eb70 100644 Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_file.png differ diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png index ca2464094ed2..1647efd8f868 100644 Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_select_location.png differ diff --git a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png index 35b7ebeb7123..4510299e425e 100644 Binary files a/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png and b/docs/user-guide/file-management/one-drive-integration/openproject_onedrive_upload_file_link.png differ diff --git a/docs/user-guide/forums/README.md b/docs/user-guide/forums/README.md index 741c7d45cdbc..0441f8547bd1 100644 --- a/docs/user-guide/forums/README.md +++ b/docs/user-guide/forums/README.md @@ -11,7 +11,7 @@ keywords: forum, forums In the forum in OpenProject you can discuss topics in a project with the team: post questions, comment on it and document answers.
      -**Forum** is defined as a module used to display forums and forum entries. The module has to be activated in the project settings and a forum has to be created in the forums tab in the project settings to be displayed in the side navigation. +**Forum** is defined as a module used to display forums and forum entries. The module has to be activated in the project settings and a forum has to be created in the Forums tab in the project settings to be displayed in the side navigation.
      | Topic | Content | diff --git a/docs/user-guide/forums/openproject_user_guide_forums_delete_message.png b/docs/user-guide/forums/openproject_user_guide_forums_delete_message.png index a46fb1cad10c..ec5c72ab3a43 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_delete_message.png and b/docs/user-guide/forums/openproject_user_guide_forums_delete_message.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_draft_saved_locally.png b/docs/user-guide/forums/openproject_user_guide_forums_draft_saved_locally.png index d110dc1b62b2..7c10a63ba193 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_draft_saved_locally.png and b/docs/user-guide/forums/openproject_user_guide_forums_draft_saved_locally.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_edit_message_button.png b/docs/user-guide/forums/openproject_user_guide_forums_edit_message_button.png index 931a28969580..29930c0157e3 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_edit_message_button.png and b/docs/user-guide/forums/openproject_user_guide_forums_edit_message_button.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_manage.png b/docs/user-guide/forums/openproject_user_guide_forums_manage.png index 73881f5ce291..d2c427ed2f00 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_manage.png and b/docs/user-guide/forums/openproject_user_guide_forums_manage.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_module.png b/docs/user-guide/forums/openproject_user_guide_forums_module.png index e4f3d47b10ad..18ee563a8e05 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_module.png and b/docs/user-guide/forums/openproject_user_guide_forums_module.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_module_new_forum.png b/docs/user-guide/forums/openproject_user_guide_forums_module_new_forum.png index 677f166dd0a5..e90fc1864e8b 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_module_new_forum.png and b/docs/user-guide/forums/openproject_user_guide_forums_module_new_forum.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_new_forum_create_form.png b/docs/user-guide/forums/openproject_user_guide_forums_new_forum_create_form.png index 929fc98ef8b5..09c256459193 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_new_forum_create_form.png and b/docs/user-guide/forums/openproject_user_guide_forums_new_forum_create_form.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_new_message.png b/docs/user-guide/forums/openproject_user_guide_forums_new_message.png index cec04ce3b697..f7935df06045 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_new_message.png and b/docs/user-guide/forums/openproject_user_guide_forums_new_message.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_new_message_created.png b/docs/user-guide/forums/openproject_user_guide_forums_new_message_created.png index 69a36a8d72e1..0acc695a612a 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_new_message_created.png and b/docs/user-guide/forums/openproject_user_guide_forums_new_message_created.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_reply_form.png b/docs/user-guide/forums/openproject_user_guide_forums_reply_form.png index 1ee344f401fe..072b515ce0e4 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_reply_form.png and b/docs/user-guide/forums/openproject_user_guide_forums_reply_form.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_reply_saved.png b/docs/user-guide/forums/openproject_user_guide_forums_reply_saved.png index c50b3bebfcaf..15d1f46c3436 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_reply_saved.png and b/docs/user-guide/forums/openproject_user_guide_forums_reply_saved.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_single_forum.png b/docs/user-guide/forums/openproject_user_guide_forums_single_forum.png index 4036f74858dc..9005e25bb7e2 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_single_forum.png and b/docs/user-guide/forums/openproject_user_guide_forums_single_forum.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_unwatch.png b/docs/user-guide/forums/openproject_user_guide_forums_unwatch.png index b67e272df337..6d63be514d7c 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_unwatch.png and b/docs/user-guide/forums/openproject_user_guide_forums_unwatch.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_watch.png b/docs/user-guide/forums/openproject_user_guide_forums_watch.png index 948a7604d6ae..d167ed4c5708 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_watch.png and b/docs/user-guide/forums/openproject_user_guide_forums_watch.png differ diff --git a/docs/user-guide/forums/openproject_user_guide_forums_watch_message.png b/docs/user-guide/forums/openproject_user_guide_forums_watch_message.png index 0c5e5a09780c..8e87ca36c78a 100644 Binary files a/docs/user-guide/forums/openproject_user_guide_forums_watch_message.png and b/docs/user-guide/forums/openproject_user_guide_forums_watch_message.png differ diff --git a/docs/user-guide/gantt-chart/gantt-context-menu.png b/docs/user-guide/gantt-chart/gantt-context-menu.png index 8cafa281d8a3..13629ad04d7f 100644 Binary files a/docs/user-guide/gantt-chart/gantt-context-menu.png and b/docs/user-guide/gantt-chart/gantt-context-menu.png differ diff --git a/docs/user-guide/gantt-chart/openproject-user-guide-export-gantt-chart.png b/docs/user-guide/gantt-chart/openproject-user-guide-export-gantt-chart.png index 880c409b500d..00cc3baf9ea4 100644 Binary files a/docs/user-guide/gantt-chart/openproject-user-guide-export-gantt-chart.png and b/docs/user-guide/gantt-chart/openproject-user-guide-export-gantt-chart.png differ diff --git a/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-export.png b/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-export.png index 82725afaaced..58906135e728 100644 Binary files a/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-export.png and b/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-export.png differ diff --git a/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-views.png b/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-views.png index 1fa15a014a4a..739b07b00d16 100644 Binary files a/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-views.png and b/docs/user-guide/gantt-chart/openproject-user-guide-gantt-charts-views.png differ diff --git a/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts-global.png b/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts-global.png index a1f6b7e26153..5922ed201e51 100644 Binary files a/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts-global.png and b/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts-global.png differ diff --git a/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts.png b/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts.png index 6ae4dc832cf9..588978207ca4 100644 Binary files a/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts.png and b/docs/user-guide/gantt-chart/openproject-user-guide-select-gantt-charts.png differ diff --git a/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu.png b/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu.png index af42a8b34ef4..7707d30e9063 100644 Binary files a/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu.png and b/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu.png differ diff --git a/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu_grid_icon.png b/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu_grid_icon.png index eb96a97dd5c9..88ab82d346f3 100644 Binary files a/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu_grid_icon.png and b/docs/user-guide/home/global-modules/open_project_user_guide_global_modules_menu_grid_icon.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_activity.png b/docs/user-guide/home/global-modules/openproject_global_modules_activity.png index 45d61bc8301e..5eeb9eb7b05c 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_activity.png and b/docs/user-guide/home/global-modules/openproject_global_modules_activity.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_add_board.png b/docs/user-guide/home/global-modules/openproject_global_modules_add_board.png index 4f8aca668f14..b6923156cbcd 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_add_board.png and b/docs/user-guide/home/global-modules/openproject_global_modules_add_board.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_add_calendar.png b/docs/user-guide/home/global-modules/openproject_global_modules_add_calendar.png index 9f47d7689e12..3599ce2bab12 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_add_calendar.png and b/docs/user-guide/home/global-modules/openproject_global_modules_add_calendar.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_add_team_planner.png b/docs/user-guide/home/global-modules/openproject_global_modules_add_team_planner.png index 008e789a41af..eb92efce9344 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_add_team_planner.png and b/docs/user-guide/home/global-modules/openproject_global_modules_add_team_planner.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_boards.png b/docs/user-guide/home/global-modules/openproject_global_modules_boards.png index e4667e645151..01974e38b107 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_boards.png and b/docs/user-guide/home/global-modules/openproject_global_modules_boards.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_calendars.png b/docs/user-guide/home/global-modules/openproject_global_modules_calendars.png index 7efff8282e94..f34430ba5143 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_calendars.png and b/docs/user-guide/home/global-modules/openproject_global_modules_calendars.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_gantt_charts.png b/docs/user-guide/home/global-modules/openproject_global_modules_gantt_charts.png index 51b8a402702d..e6a11d85099a 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_gantt_charts.png and b/docs/user-guide/home/global-modules/openproject_global_modules_gantt_charts.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_meetings.png b/docs/user-guide/home/global-modules/openproject_global_modules_meetings.png index 7c99a435d15b..c6d38836128d 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_meetings.png and b/docs/user-guide/home/global-modules/openproject_global_modules_meetings.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_new_meeting.png b/docs/user-guide/home/global-modules/openproject_global_modules_new_meeting.png index 0e617a950a2d..93f6aeec9340 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_new_meeting.png and b/docs/user-guide/home/global-modules/openproject_global_modules_new_meeting.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_news.png b/docs/user-guide/home/global-modules/openproject_global_modules_news.png index 7f1672693e83..357ceba8cbbd 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_news.png and b/docs/user-guide/home/global-modules/openproject_global_modules_news.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_projects.png b/docs/user-guide/home/global-modules/openproject_global_modules_projects.png index 146a631235fe..86d646d9906f 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_projects.png and b/docs/user-guide/home/global-modules/openproject_global_modules_projects.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_team_planner.png b/docs/user-guide/home/global-modules/openproject_global_modules_team_planner.png index 4ab221bb60ea..5e4628ce0ac6 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_team_planner.png and b/docs/user-guide/home/global-modules/openproject_global_modules_team_planner.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_time_costs.png b/docs/user-guide/home/global-modules/openproject_global_modules_time_costs.png index 6d5a72576385..cd74a2971972 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_time_costs.png and b/docs/user-guide/home/global-modules/openproject_global_modules_time_costs.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_unselect_project.png b/docs/user-guide/home/global-modules/openproject_global_modules_unselect_project.png index 7ea5c2687641..ed9ae06a6704 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_unselect_project.png and b/docs/user-guide/home/global-modules/openproject_global_modules_unselect_project.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_work_packages.png b/docs/user-guide/home/global-modules/openproject_global_modules_work_packages.png index 406c8ae6347e..7499553126a7 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_work_packages.png and b/docs/user-guide/home/global-modules/openproject_global_modules_work_packages.png differ diff --git a/docs/user-guide/home/global-modules/openproject_global_modules_work_packages_full_view.png b/docs/user-guide/home/global-modules/openproject_global_modules_work_packages_full_view.png index 02371ee9702f..848692eb6d55 100644 Binary files a/docs/user-guide/home/global-modules/openproject_global_modules_work_packages_full_view.png and b/docs/user-guide/home/global-modules/openproject_global_modules_work_packages_full_view.png differ diff --git a/docs/user-guide/home/openproject_user_guide_home_page1.png b/docs/user-guide/home/openproject_user_guide_home_page1.png index d50c87406c21..77e963270e6a 100644 Binary files a/docs/user-guide/home/openproject_user_guide_home_page1.png and b/docs/user-guide/home/openproject_user_guide_home_page1.png differ diff --git a/docs/user-guide/meetings/README.md b/docs/user-guide/meetings/README.md index fc2eb976d089..512425799ea5 100644 --- a/docs/user-guide/meetings/README.md +++ b/docs/user-guide/meetings/README.md @@ -8,21 +8,80 @@ keywords: meetings # Meeting management -Meetings in OpenProject allow you to manage and document your project meetings, prepare a meeting agenda together with your team and document and share minutes with attendees, all in one central place. +Meetings in OpenProject allow you to manage and document your project meetings, prepare a meeting agenda together with your team, and share minutes with attendees - all in one central place.
      **Meetings** is defined as a module that allows the organization of meetings. **Note:** In order to be able to use the meetings plugin, the **Meetings module needs to be activated** in the [Project Settings](../projects/project-settings/modules/).
      -| Topic | Content | -| --------------------------------------------------- | -------------------------------------------------------- | -| [Meetings in OpenProject](#meetings-in-openproject) | How to open meetings in OpenProject. | -| [Classic meetings](classic-meetings/) | How to create and edit a classic meeting in OpenProject. | -| [Dynamic meetings](dynamic-meetings/) | How to create and edit a dynamic meeting in OpenProject. | +> [!IMPORTANT] +> With OpenProject 13.1 we introduced dynamic meetings alongside [classic meetings](classic-meetings). +> With OpenProject 15.3 dynamic meetings are replaced by [one-time meetings](one-time-meetings) and [recurring meetings](recurring-meetings) to further improve meeting management. +> Please keep in mind that the ability to create classic meetings will eventually be removed from OpenProject. + + +| Topic | Content | +| --------------------------------------------------- | --------------------------------------------------------- | +| [Meetings in OpenProject](#meetings-in-openproject) | How to open meetings in OpenProject. | +| [One-time meetings](one-time-meetings/) | How to create and edit single meetings in OpenProject. | +| [Recurring meetings](recurring-meetings/) | How to create and edit recurring meetings in OpenProject. | +| [Classic meetings](classic-meetings/) | How to create and edit a classic meeting in OpenProject. | +| [Meetings FAQs](meetings-faq) | Frequently asked questions about meetings in OpenProject. | ## Meetings in OpenProject -You can view existing meetings within a project or create a new meeting by selecting the **Meetings** module on the left-hand project menu. Alternatively, you can access the transversal cross-project **Meetings** module from the [global modules](../home/global-modules/) menu. +Meetings in OpenProject help teams organise discussions, track meeting agendas, and document decisions efficiently. There are three types of meetings: **one-time meetings**, **recurring meetings**, and **classic meetings**. [One-time meetings](one-time-meetings/) are standalone events scheduled for a specific date and time. [Recurring meetings](recurring-meetings/) introduce a structured way to define a series of related meetings, ensuring consistency and reducing manual setup. [Classic meetings](classic-meetings/) are also standalone events, but are a legacy format that will eventually be phased out. + +### Meetings overview + +By selecting **Meetings** in the project menu on the left, you get an overview of all the meetings you have been invited to within a specific project sorted by date. By clicking on a meeting name you can view further details of the meeting. + +To get an overview of the meetings across multiple projects, you can select **Meetings** in the [global modules menu](../../user-guide/home/global-modules/). + +![Select meetings module from openproject global modules ](openproject_userguide_meetings_module_select.png) + +Meetings will be grouped based on the meeting start time into the following groups: + +- **Today** lists open meetings scheduled for the same day + +- **Tomorrow** lists open meetings scheduled for the day after + +- **Later this week** lists all open meetings scheduled between two days from now till the end of the week + +- **Next week and later** lists all open meetings scheduled the next week and later + +![Meetings overview in openproject global modules](openproject_userguide_meetings_overview.png) + +### Meetings filters + +The menu on the left will allow you to filter meetings based on following: + +- **My meetings** lists all meetings you participate in +- **Recurring meetings** lists all recurring meetings visible to you +- **All meetings** lists all meetings visible to you +- **Meeting series** lists meeting occurrences that are part of recurring meetings +- **Invitations** lists all meetings you are invited to +- **Attended** lists all meetings in which you were marked as having attended +- **Created by me** lists all meetings created by you + +The buttons next to *Filters* will allow you to filter for upcoming or past meetings. + +![Meetings module side menu in OpenProject](openproject_userguide_meetings_side_menu.png) + +You can also use the meetings filters to refine the list of meetings based on the following criteria: + +- **Attended user** - shows meetings that a specific user attended + +- **Author** - shows meetings that a specific user created + +- **Invited user** - shows meetings that a specific user was invited to + +- **Part of a meeting series** - shows meetings that are part of specific meeting series + +- **Project** - shows meetings for a specific project (this will only be displayed in the global module view, i.e. not within a specific project) + + ![Filter the list of dynamic meetings in OpenProject](openproject_userguide_meetings_filters.png) ->With OpenProject 13.1.0 there will be two types of meetings that you can create: [dynamic](dynamic-meetings/) and [classic](classic-meetings). Please keep in mind that the ability to create classic meetings will eventually be removed from OpenProject. +> [!TIP] +> If you are interested in how the Meetings module is used by the OpenProject team, please take a look at [this blog article](https://www.openproject.org/blog/meeting-management-example/). diff --git a/docs/user-guide/meetings/classic-meetings/README.md b/docs/user-guide/meetings/classic-meetings/README.md index 0833ae45a82d..2482a4a4c5e9 100644 --- a/docs/user-guide/meetings/classic-meetings/README.md +++ b/docs/user-guide/meetings/classic-meetings/README.md @@ -1,7 +1,7 @@ --- sidebar_navigation: title: Classic meetings - priority: 900 + priority: 700 description: Manage meetings with agenda and meeting minutes in OpenProject. keywords: meetings, classic meetings, agenda, minutes --- @@ -13,8 +13,13 @@ Meetings in OpenProject allow you to manage and document your project meetings,
      **Meetings** is defined as a module that allows the organization of meetings. The module has to be activated in the project settings in order to be displayed in the side navigation.
      + > [!NOTE] -> [Dynamic meetings](../dynamic-meetings) were introduced in OpenProject 13.1. At the moment, the Meetings module lets you create classic or dynamic meetings but please keep in mind that the ability to create classic meetings will eventually be removed from OpenProject. +> With OpenProject 13.1 we introduced dynamic meetings alongside classic meetings. +> With OpenProject 15.3 dynamic meetings are replaced by [one-time meetings](../one-time-meetings) and [recurring meetings](../recurring-meetings) to further improve meeting management. + +> [!IMPORTANT] +> Please keep in mind that the ability to create classic meetings will eventually be removed from OpenProject.At the moment, the Meetings module lets you create classic or dynamic meetings but please keep in mind that the ability to create classic meetings will eventually be removed from OpenProject. | Topic | Content | |---------------------------------------------------------------------------|---------------------------------------------| diff --git a/docs/user-guide/meetings/classic-meetings/create-new-classic-meeting.png b/docs/user-guide/meetings/classic-meetings/create-new-classic-meeting.png deleted file mode 100644 index 60f43708da40..000000000000 Binary files a/docs/user-guide/meetings/classic-meetings/create-new-classic-meeting.png and /dev/null differ diff --git a/docs/user-guide/meetings/classic-meetings/meeting-participants.png b/docs/user-guide/meetings/classic-meetings/meeting-participants.png deleted file mode 100644 index 59eaaf0f77c4..000000000000 Binary files a/docs/user-guide/meetings/classic-meetings/meeting-participants.png and /dev/null differ diff --git a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_button.png b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_button.png index 0bc3913a850a..975e9c7875bd 100644 Binary files a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_button.png and b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_button.png differ diff --git a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_copy_form.png b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_copy_form.png index 1c08ea42b16f..b9453013d440 100644 Binary files a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_copy_form.png and b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_copy_form.png differ diff --git a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_edit_participants.png b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_edit_participants.png index e49c50c279c4..eaaa408f3321 100644 Binary files a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_edit_participants.png and b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_edit_participants.png differ diff --git a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_form.png b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_form.png index eb13bbecb36f..93cf6f5a3644 100644 Binary files a/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_form.png and b/docs/user-guide/meetings/classic-meetings/openproject_user_guide_create_classic_meeting_form.png differ diff --git a/docs/user-guide/meetings/dynamic-meetings/agenda_drag_handle.png b/docs/user-guide/meetings/dynamic-meetings/agenda_drag_handle.png deleted file mode 100644 index 60ff3a117dd7..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/agenda_drag_handle.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_agenda_item.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_agenda_item.png deleted file mode 100644 index d4538a63e6d4..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_agenda_item.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_item_to_section.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_item_to_section.png deleted file mode 100644 index 5bcafdf6c89a..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_item_to_section.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_new_participants.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_new_participants.png deleted file mode 100644 index 80fd44c03d31..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_new_participants.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_section.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_section.png deleted file mode 100644 index c4e9ae9300b0..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_section.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_attachments.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_attachments.png deleted file mode 100644 index 600726df826f..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_attachments.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_meeting.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_meeting.png deleted file mode 100644 index 05876af58fd9..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_meeting.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_meeting_details.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_meeting_details.png deleted file mode 100644 index 012aa278a393..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_meeting_details.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_modal.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_modal.png deleted file mode 100644 index ad07d9f57559..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_copy_modal.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_create_button.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_create_button.png deleted file mode 100644 index 645eb69aec20..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_create_button.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_delete_meeting.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_delete_meeting.png deleted file mode 100644 index ed842f27a7c2..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_delete_meeting.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_edit_agenda.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_edit_agenda.png deleted file mode 100644 index 66a7f9fc2142..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_edit_agenda.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_edit_section_options.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_edit_section_options.png deleted file mode 100644 index 92efb97053d7..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_edit_section_options.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_filters.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_filters.png deleted file mode 100644 index 1f37c1bd8353..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_filters.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_meeting_history.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_meeting_history.png deleted file mode 100644 index 3f449c977cee..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_meeting_history.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_new_dynamic_meeting_form.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_new_dynamic_meeting_form.png deleted file mode 100644 index 60d66b9f82c7..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_new_dynamic_meeting_form.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_page_update_reload_button.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_page_update_reload_button.png deleted file mode 100644 index 2370610d4d82..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_page_update_reload_button.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_section_duration.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_section_duration.png deleted file mode 100644 index b98cfb6b94f3..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_section_duration.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_select_meeting_history.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_select_meeting_history.png deleted file mode 100644 index 5e6f8426f3c6..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_select_meeting_history.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_untitled_section.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_untitled_section.png deleted file mode 100644 index 76cbd2ac56f4..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_untitled_section.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_wp_agenda.png b/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_wp_agenda.png deleted file mode 100644 index 259de7953ed1..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_wp_agenda.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguid_dynamic_meeting_edit_title.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguid_dynamic_meeting_edit_title.png deleted file mode 100644 index 53cc32034adb..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguid_dynamic_meeting_edit_title.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_add_agenda_item.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_add_agenda_item.png deleted file mode 100644 index 34e5d9644eb7..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_add_agenda_item.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_add_work_package.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_add_work_package.png deleted file mode 100644 index 3cf5fbbd23e8..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_add_work_package.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_close_meeting.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_close_meeting.png deleted file mode 100644 index d2c637837548..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_close_meeting.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_create_new_meeting.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_create_new_meeting.png deleted file mode 100644 index af10464123c5..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_create_new_meeting.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_dynamic_meetings_overview.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_dynamic_meetings_overview.png deleted file mode 100644 index 4edce8daeaa8..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_dynamic_meetings_overview.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_dynamic_meeting.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_dynamic_meeting.png deleted file mode 100644 index 0c414dffec07..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_dynamic_meeting.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_dynamic_meeting_icon.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_dynamic_meeting_icon.png deleted file mode 100644 index bae899e4f374..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_dynamic_meeting_icon.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_screen.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_screen.png deleted file mode 100644 index f3817f424b0f..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_edit_screen.png and /dev/null differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_meetings_module_select.png b/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_meetings_module_select.png deleted file mode 100644 index f770c8aac135..000000000000 Binary files a/docs/user-guide/meetings/dynamic-meetings/openproject_userguide_meetings_module_select.png and /dev/null differ diff --git a/docs/user-guide/meetings/meetings-faq/README.md b/docs/user-guide/meetings/meetings-faq/README.md index 9d7e6dba6414..53a1763ef975 100644 --- a/docs/user-guide/meetings/meetings-faq/README.md +++ b/docs/user-guide/meetings/meetings-faq/README.md @@ -1,25 +1,27 @@ --- sidebar_navigation: title: Meetings FAQ - priority: 700 + priority: 100 description: Frequently asked questions about meetings. keywords: meetings, meetings faq, tickets, how to, task --- # Frequently asked questions (FAQ) for meetings -## What is difference between a dynamic and classic meeting? +## What is a difference between a dynamic and classic meeting? -[Dynamic meetings](../dynamic-meetings) are an improved version of the meetings meant to improve the user experience when managing meetings in OpenProject. +**Dynamic meetings** were introduced with OpenProject 13.1.0 as an improved version of the meetings meant to improve the user experience when managing meetings in OpenProject. + +With OpenProject 15.3.0, dynamic meetings can either be [one-time meetings](../one-time-meetings) or [recurring meetings](../recurring-meetings). ## How long will the classic meetings be available? -[Classic meetings](../classic-meetings) will be deprecated with one of the future releases after 13.1. We will communicate this in advance to ensure a smooth transition for all our users. +[Classic meetings](../classic-meetings) will be deprecated with one of the future releases after 15.3. We will communicate this in advance to ensure a smooth transition for all our users. ## Can I add a meeting to a calendar? -Yes, you can [download a meeting as an iCalendar event](../dynamic-meetings/#download-a-meeting-as-an-icalendar-event). +Yes, you can [download a meeting as an iCalendar event](../one-time-meetings/#download-a-meeting-as-an-icalendar-event). ## Are the meetings shown in calendar widgets? -Yes, the Calendar widget on the [project overview page](../../project-overview/#calendar-widget) and [My Page](../../../getting-started/my-page/#add-widgets) displays meetings. Meetings links in this widget are clickable and open the meeting directly. \ No newline at end of file +Yes, the Calendar widget on the [project overview page](../../project-overview/#calendar-widget) and [My Page](../../../getting-started/my-page/#add-widgets) displays meetings. Meetings links in this widget are clickable and open the meeting directly. diff --git a/docs/user-guide/meetings/dynamic-meetings/README.md b/docs/user-guide/meetings/one-time-meetings/README.md similarity index 53% rename from docs/user-guide/meetings/dynamic-meetings/README.md rename to docs/user-guide/meetings/one-time-meetings/README.md index df28a925bb1f..5943dda2ba5d 100644 --- a/docs/user-guide/meetings/dynamic-meetings/README.md +++ b/docs/user-guide/meetings/one-time-meetings/README.md @@ -1,21 +1,22 @@ --- sidebar_navigation: - title: Dynamic meetings - priority: 800 + title: One-time meetings + priority: 900 description: Manage meetings with agenda and meeting minutes in OpenProject. -keywords: meetings, dynamic meetings, agenda, minutes +keywords: meetings, dynamic meetings, agenda, minutes, one-time meeting --- -# Dynamic meetings management +# One-time meetings -Introduced in OpenProject 13.1, dynamic meetings offer easier meeting management, improved agenda creation and the ability to link work packages to meetings and vice-versa. +With OpenProject 15.3, meetings were enhanced by introducing a clear distinction between **one-time meetings** and **recurring meetings**. This page covers the features and functionalities of one-time meetings in OpenProject. + +For information on setting up recurring meeting series and templates, please refer to [this page](../recurring-meetings). Note that individual occurrences of a recurring meeting series are one-time meetings and have the same features as described here. > [!NOTE] -> The **Meetings module needs to be activated** in the [Project Settings](../../projects/project-settings/modules/) to be able to create and edit meetings. +> The **Meetings module needs to be activated** in the [Project settings](../../projects/project-settings/modules/) to be able to create and edit meetings. | Topic | Content | | ------------------------------------------------------------ | ---------------------------------------------------------- | -| [Meetings in OpenProject](#meetings-in-openproject) | How to open meetings in OpenProject. | | [Create a new meeting](#create-a-new-meeting) | How to create a new meeting in OpenProject. | | [Edit a meeting](#edit-a-meeting) | How to edit an existing meeting. | | [Add a work package to the agenda](#add-a-work-package-to-the-agenda) | How to add a work package to a meeting agenda. | @@ -29,83 +30,41 @@ Introduced in OpenProject 13.1, dynamic meetings offer easier meeting management | [Copy a meeting](#copy-a-meeting) | How to copy a meeting in OpenProject (recurring meetings). | | [Delete a meeting](#delete-a-meeting) | How to delete a meeting in OpenProject. | -## Meetings in OpenProject - -By selecting **Meetings** in the project menu on the left, you get an overview of all the meetings you have been invited to within a specific project sorted by date. By clicking on a meeting name you can view further details of the meeting. - -To get an overview of the meetings across multiple projects, you can select **Meetings** in the [global modules menu](../../../user-guide/home/global-modules/). - -![Select meetings module from openproject global modules ](openproject_userguide_meetings_module_select.png) - -The menu on the left will allow you to filter for upcoming or past meetings. You can also filter the list of the meetings based on your involvement. - -![Meetings overview in openproject global modules](openproject_userguide_dynamic_meetings_overview.png) - -You can also use the meetings filters to refine the list of meetings based on the following criteria: - -- **Attended user** - shows meetings that a specific user attended -- **Author** - shows meetings that a specific user created -- **Invited user** - shows meetings that a specific user was invited to -- **Project** - shows meetings for a specific project (this will only be displayed in the global module view, i.e. not within a specific project) -- **Time** - shows past or upcoming meetings - -![Filter the list of dynamic meetings in OpenProject](openproject_dynamic_meetings_filters.png) - -> [!TIP] -> If you are interested in how the Meetings module is used by the OpenProject team, please take a look at [this blog article](https://www.openproject.org/blog/meeting-management-example/). - - - -## Create and edit dynamic meetings +## Create and edit one-time meetings ### Create a new meeting You can either create a meeting from within a project or from the global **Meetings** module. +To create a new meeting, click the green **+ Meeting** button in the upper right corner and select what type of meeting you want to create. You can choose between **one-time, recurring or classic meetings**. -> [!NOTE] -> Dynamic meetings were introduced in OpenProject 13.1. At the moment, the Meetings module lets you create [classic](../classic-meetings) or dynamic meetings but please keep in mind that the ability to create [classic meetings](../classic-meetings) will eventually be removed from OpenProject. - -To create a new meeting, click the green **+ Meeting** button in the upper right corner and select if you want to create a dynamic or a classic meeting. - -![Create new meeting in OpenProject](openproject_dynamic_meetings_create_button.png) - -Enter your meeting's title, type, location, start date and duration. - -If you are creating a meeting from a global module you will first need to select a project to which the meeting is attributed. After you have selected a project, the list of potential participants (project members) will appear for you to select who to invite. After the meeting you can note who attended the meeting. - -![Create a new dynamic meeting in OpenProject](openproject_dynamic_meetings_new_dynamic_meeting_form.png) - -Click the **Create meeting** button to save your changes. You can proceed to adding more meeting details. +![Create new meeting in OpenProject](openproject_userguide_meetings_create_meeting_button.png) -### Edit a meeting - -If you want to change the details of a meeting, for example its time or location, open the meetings details view by clicking on pencil icon next to the **Meeting details**. +For steps on creating a classic meetings please consult [this page](../classic-meetings). For steps on setting up recurring meetings please consult [this page](../recurring-meetings). -![Edit a dynamic meeting in OpenProject](openproject_userguide_edit_dynamic_meeting_icon.png) - -An edit screen will be displayed, where you can adjust the date, time, duration and location of the meeting. - -![edit-meeting](openproject_userguide_edit_screen.png) - -Do not forget to save the changes by clicking the **Save** button. Cancel will bring you back to the details view. +If you choose the **one-time** option, enter your meeting's title, location, start date and time, and duration. -> [!TIP] -> If someone else edits or updates the current meeting page at the same time and saves their changes, you and all other users on the same page will be notified of this with a small banner at the top of the page. Click the **Reload** button to load the updated version of the page. +If you are creating a meeting from a global module you will first need to select a project to which the meeting is attributed. -![Banner notifying that a meeting has been updated while a user is editing it in OpenProject meetings module](openproject_dynamic_meetings_page_update_reload_button.png) +![Create a new one-time meeting in OpenProject](openproject_userguide_meetings_new_onetime_meeting_form.png) -In order to edit the title of the meeting select the dropdown menu behind the three dots and select the **Edit meeting title**. +> [!TIP] +> Duration can be entered both in hours and minutes. For example for a meeting that should last for 1.5 hours, you can enter: +> +> - 1.5h +> - 90m +> - 90min +> - 1:30 -![Edit a meeting title in OpenProject](openproject_userguid_dynamic_meeting_edit_title.png) +Click the **Create meeting** button to save your changes. You can then proceed to add more details to the meeting. ### Create or edit the meeting agenda After creating a meeting, you can set up a **meeting agenda**. -You do this by adding sections, agenda items or existing work packages by selecting the desired option under the green **+ Add** button. You can then add notes to each agenda item. +You can do this by adding sections, agenda items or existing work packages by selecting the desired option under the green **+ Add** button. You can then add notes to each agenda item. -![The add button with three choices: section, agenda item or work package](openproject_dynamic_meetings_add_agenda_item.png) +![The add button in OpenProject meetings module with three choices: section, agenda item or work package](openproject_userguide_meetings_add_agenda_item_button.png) #### Add an agenda section @@ -113,89 +72,116 @@ Sections allow you to group agenda items into blocks for better organization. To add a section, click on the **+ Add** button at the bottom of the agenda items and select the **Section** option. -![Add a new section to a meeting agenda in OpenProject](openproject_dynamic_meetings_add_section.png) +![Add a new section to a meeting agenda in OpenProject](openproject_userguide_meetings_add_section.png) -If, prior to creating your first section, your meeting already had existing [agenda items](#add-an-agenda-item), they will automatically be contained in a section called **Unnamed section**. You can rename this if you wish. +If, prior to creating your first section, your meeting already had existing [agenda items](#add-an-agenda-item), they will automatically be contained in a section called **Untitled section**. You can rename this section if you wish. > [!NOTE] > If you use sections, all agenda items must have sections. - ![Untitled section in OpenProject meeting](openproject_dynamic_meetings_untitled_section.png) - -![Add an agenda item to a meeting section](openproject_dynamic_meetings_add_item_to_section.png) +![Untitled section in OpenProject meeting](openproject_userguide_meetings_untitled_section.png) -Sections will show the sum of all the duration of all containing items (or at least, those that have a duration specified). +After adding a section, you can specify it further by [adding agenda items](#add-an-agenda-item) or [work packages](#link-a-work-package-to-a-meeting) to it. -![Duration of a section in OpenProject meeting](openproject_dynamic_meetings_section_duration.png) +You can also add agenda items to specific sections by either dragging and dropping items into each section, or by clicking on the **More** button (⋯) and choosing your desired action. +![Edit or delete a section in an OpenProject meeting](openproject_userguide_meetings_section_more_menu.png) -You can then add agenda items to specific sections by either dragging and dropping items into each, or by clicking on the **More** button (⋯) and choosing your desired action. +This menu also lets you rename a section, move it or delete the entire section by selecting the respective option from the dropdown menu behind the **More** (⋯) icon on the right side. If a section is moved, the agenda items will move along with it. -This menu also lets you rename a section, move it or delete the entire section by selecting the respective option from the dropdown menu behind the **More** (⋯) icon on the right side. +> [!TIP] +> +> You can also re-arrange sections by dragging and dropping sections up and down. > [!IMPORTANT] -> Deleting a section will delete all containing agenda items. If a section contains agenda items, you will asked for confirmation before deletion. - -![Edit or delete a section in an OpenProject meeting](openproject_dynamic_meetings_edit_section_options.png) - -You can also re-arrange sections by dragging and dropping sections up and down. If a section is moved, the agenda items will move along with it. +> Deleting a section will delete all containing agenda items. If a section contains agenda items, you will be asked for confirmation before deletion. #### Add an agenda item + If you select the **Agenda item** option, you can name that item, add notes, set the anticipated duration in minutes and select a user to be displayed next to the agenda item. This could for example be a meeting or a project member that is accountable for the item or someone who will present that particular topic. +![Add an agenda item to a meeting section](openproject_userguide_meetings_add_section_items.png) + By default, when creating an agenda item, this will be pre-filled with the name of the user adding the agenda item, but it can either be removed or replaced by one of the other meeting participants. -![Add agenda item](openproject_userguide_add_agenda_item.png) +![Form for adding agenda items to meetings sections in OpenProject](openproject_userguide_meetings_add_section_items_form.png) + +Sections will show the sum of all the durations of all containing items (or at least, those that have a duration specified). + +![Duration of a section in OpenProject meeting](openproject_userguide_meetings_section_duration_sum.png) > [!TIP] > If you need to store the agenda outside of OpenProject, you can generate an optimized PDF using the print function (Ctrl/Cmd + P). + #### Link a work package to a meeting If you select the **Work package** option, you can link a work package by entering either a work package ID, or starting to type in a keyword, which will open a list of possible options. -![Add work package](openproject_userguide_add_work_package.png) +![Add work package](openproject_userguide_meetings_add_work_package.png) + +#### Edit a meeting agenda -After you have finalized the agenda, you can always edit the agenda items, add notes, move an item up or down or delete it. Clicking on the three dots on the right edge of each agenda item will display a menu of available options, including editing, copying link to clipboard, moving the agenda item within the agenda or deleting it. +After you have finalized the agenda, you can always edit the agenda items, add notes, move an item up or down or delete it. Clicking on the **More** (three dots) menu icon on the right edge of each agenda item will display a menu of available options, including editing, copying link to clipboard, moving the agenda item within the agenda or deleting it. -![Edit agenda in OpenProject dynamic meetings](openproject_dynamic_meetings_edit_agenda.png) +![Menu showing options to edit agenda items in OpenProject meetings](openproject_userguide_meetings_agenda_item_more_menu.png) You may also re-order agenda items by clicking on the drag handle (the icon with six dots) on the left edge of each agenda item and dragging that item above or below. -![Drag handle next to an agenda item](agenda_drag_handle.png) +![Drag handle next to an agenda item in OpenProject meetings](openproject_userguide_meetings_agenda_item_drag_handle.png) The durations of each agenda item are automatically summed up. If that sum exceeds the planned duration entered in *Meeting Details*, the duration of those agenda times that exceed the planned duration will appear in red to warn you of the fact. -![OpenProject meeting too long](openproject_dynamic_meetings_agenda_too_long.png) +![Meeting agenda items duration sum is greater than the meeting duration set in OpenProject](openproject_userguide_meetings_agenda_too_long.png) ### Add a work package to the agenda There are two ways to add a work package to a meeting agenda. -- **From the Meetings module**: using the **+ Add** button [add a work package agenda item](#create-or-edit-the-meeting-agenda) or +- **From the Meetings module**: using the **+ Add** button [add a work package agenda item](#link-a-work-package-to-a-meeting) or - **From a particular work package**: using the **+ Add to meeting** button on the [Meetings tab](../../work-packages/add-work-packages-to-meetings) You can add a work package to both upcoming or past meetings as long as the work package is marked **open**. -![OpenProject work packages in meetings agenda](openproject_dynamic_meetings_wp_agenda.png) +![Button to add a work package to a meeting under Meetings tab in a work package in OpenProject](openproject_userguide_meetings_add_wp_to_meeting_agenda.png) > [!TIP] > The upcoming meetings are displayed in chronological order, from the nearest meeting to the most distant. > The past meetings are displayed in reverse chronological order, from the most recent meeting to the oldest. +### Edit a meeting + +If you want to change the details of a meeting, for example its time or location, open the meetings details view by clicking the cogwheel icon next to the **Meeting details**. + +![A cogwheel icon to edit a meeting in OpenProject](openproject_userguide_meetings_cogwheel_icon.png) + +An edit screen will be displayed, where you can adjust the date, time, duration and location of the meeting. + +![A form to edit an existing meeting in OpenProject](openproject_userguide_meetings_edit_meeting_form.png) + +Do not forget to save the changes by clicking the **Save** button. Cancel will bring you back to the details view. + +> [!TIP] +> If someone else edits or updates the current meeting page at the same time and saves their changes, you and all other users on the same page will be notified of this with a small banner at the top of the page. Click the **Reload** button to load the updated version of the page. + +![Banner notifying that a meeting has been updated while a user is editing it in OpenProject meetings module](openproject_userguide_meetings_page_update_reload_button.png) + +In order to edit the title of the meeting select the dropdown menu behind the three dots and select the **Edit meeting title**. + +![Edit a meeting title in OpenProject](openproject_userguide_meetings_edit_meeting_title.png) ## Meeting participants ### Add meeting participants -You will see the list of all the invited project members under **Participants**. You can **add participants** (Invitees and Attendees) to a meeting in [edit mode](#edit-a-meeting). The process is the same whether you are creating a new meeting or editing an existing one. +You will see the list of all the invited project members under **Participants**. You can add participants (Invitees and Attendees) to a meeting in [edit mode](#edit-a-meeting). The process is the same whether you are creating a new meeting or editing an existing one. You can either click the cogwheel icon next to **Participants** section or click the **Add participants** link under the list of existing participants. -![adding meeting participants](openproject_dynamic_meetings_add_participants.png) +![Add meeting participants in OpenProject](openproject_userguide_meetings_add_participants.png) You will see the list of all the project members and be able to tell, based on the check marks next to the name under the *Invited* column, who was invited. After the meeting, you can record who actually took part using the checkmarks under the Attended column. -![invite meeting participants](openproject_dynamic_meetings_add_new_participants.png) +![A form showing invited and attending meeting participants in OpenProject](openproject_userguide_meetings_add_new_participants_form.png) To remove an invited project member from a meeting, simply uncheck both check marks. @@ -203,7 +189,7 @@ Click on the **Save** button to confirm the changes. ### Send email to all participants -You can send an email reminder to all the meeting participants. Select the dropdown by clicking on the three dots in the top right corner and select **Send email to all participants**. An email reminder with the meeting details (including a link to the meeting) is immediately sent to all invitees and attendees. +You can send an email reminder to all the meeting participants. Select the dropdown by clicking on the **More** (three dots) icon in the top right corner and select **Send email to all participants**. An email reminder with the meeting details (including a link to the meeting) is immediately sent to all invitees and attendees. ## Meeting attachments @@ -211,50 +197,50 @@ You can attachments in the meetings in the **Attachments** section in the right Added attachments can be added to the Notes section of agenda packages by dragging and dropping them from the Attachments section. -![Attachments in OpenProject dynamic meetings](openproject_dynamic_meetings_attachments.png) +![Attachments in OpenProject meetings](openproject_userguide_meetings_attachments.png) ## Meeting history -You can track what changes were made to a meeting and by which user. Select the dropdown by clicking on the three dots in the top right corner and select **Meeting history**. +You can track what changes were made to a meeting and by which user. Select the dropdown by clicking on the **More** (three dots) icon in the top right corner and select **Meeting history**. -![Select Meeting history option in OpenProject dynamic meetings](openproject_dynamic_meetings_select_meeting_history.png) +![Select Meeting history option in OpenProject meetings](openproject_userguide_meetings_select_meeting_history.png) This will display meeting history details. -![Dynamic meeting history in OpenProject](openproject_dynamic_meetings_meeting_history.png) +![Meeting history in OpenProject](openproject_userguide_meetings_history_shown.png) ## Download a meeting as an iCalendar event -You can download a meeting as an iCalendar event. Select the dropdown by clicking on the three dots in the top right corner and select the **Download iCalendar event**. +You can download a meeting as an iCalendar event. Select the dropdown by clicking on the **More** (three dots) menu in the top right corner and select the **Download iCalendar event**. Read more about [subscribing to a calendar](../../calendar/#subscribe-to-a-calendar). ## Close a meeting -Clicking on the **Close meeting** after the meeting is completed with lock the current state and make render it read-only. +Clicking on the **Close meeting** after the meeting is completed with lock the current state and make it read-only. -![Close a meeting in OpenProject](openproject_userguide_close_meeting.png) +![Close a meeting in OpenProject](openproject_userguide_meetings_close_meeting.png) ## Re-open a meeting Once a meeting has been closed, it can no longer be edited. Project members with the permission to edit and close meetings will, however, see a **Re-open meeting** option. Clicking on this re-opens a meeting and allows further editing. -![Re-open a meeting in OpenProject](openproject_dynmic_meetings_reopen_meeting.png) +![Re-open a meeting in OpenProject](openproject_userguide_meetings_reopen_meeting.png) ## Copy a meeting You can copy an existing meeting. This is useful if you have recurring meetings. To copy a meeting, click on the three dots in the top right corner and select **Copy**. -![Copy a dynamic meeting in OpenProject](openproject_dynamic_meetings_copy_meeting.png) +![Copy a meeting in OpenProject](openproject_userguide_meetings_copy_meeting.png) A modal will open, which will allow you adjust the title, time, location and further details of the copied meeting. By default, the date for the copied meeting will be set to the next day. You also have an option of copying the agenda, attachments and the list of participants. You also have an option to email all participants after the meeting was copied. -If you copy a closed meeting, the new meeting status will automatically be set to open. Don't forget to **Save** the copied meeting by clicking the **Create** button. +If you copy a closed meeting, the new meeting status will automatically be set to open. Don't forget to **save** the copied meeting by clicking the **Create meeting** button. -![Edit details of a copied dynamic meeting in OpenProject](openproject_dynamic_meetings_copy_modal.png) +![Edit details of a copied meeting in OpenProject](openproject_userguide_meetings_copy_form.png) ## Delete a meeting You can delete a meeting. To do so, click on the three dots in the top right corner, select **Delete meeting** and confirm your choice. -![Deleting a dynamic meeting in OpenProject](openproject_dynamic_meetings_delete_meeting.png) +![Deleting a meeting in OpenProject](openproject_userguide_meetings_delete_meeting.png) diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_agenda_item_button.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_agenda_item_button.png new file mode 100644 index 000000000000..17eabccaa2e9 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_agenda_item_button.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_new_participants_form.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_new_participants_form.png new file mode 100644 index 000000000000..8dfa277457e8 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_new_participants_form.png differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_participants.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_participants.png similarity index 100% rename from docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_add_participants.png rename to docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_participants.png diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section.png new file mode 100644 index 000000000000..67dc789c4ef9 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section_items.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section_items.png new file mode 100644 index 000000000000..e409366c869b Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section_items.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section_items_form.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section_items_form.png new file mode 100644 index 000000000000..28f721894b0f Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_section_items_form.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_work_package.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_work_package.png new file mode 100644 index 000000000000..5c7cf6863c93 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_work_package.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_wp_to_meeting_agenda.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_wp_to_meeting_agenda.png new file mode 100644 index 000000000000..693a7ce6498e Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_add_wp_to_meeting_agenda.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_item_drag_handle.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_item_drag_handle.png new file mode 100644 index 000000000000..74920042b634 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_item_drag_handle.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_item_more_menu.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_item_more_menu.png new file mode 100644 index 000000000000..4462ff5e5a2b Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_item_more_menu.png differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_agenda_too_long.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_too_long.png similarity index 100% rename from docs/user-guide/meetings/dynamic-meetings/openproject_dynamic_meetings_agenda_too_long.png rename to docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_agenda_too_long.png diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_attachments.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_attachments.png new file mode 100644 index 000000000000..88442ae48852 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_attachments.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_close_meeting.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_close_meeting.png new file mode 100644 index 000000000000..91aba181f1ee Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_close_meeting.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_cogwheel_icon.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_cogwheel_icon.png new file mode 100644 index 000000000000..7c599c5b9359 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_cogwheel_icon.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_copy_form.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_copy_form.png new file mode 100644 index 000000000000..296059f2724f Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_copy_form.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_copy_meeting.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_copy_meeting.png new file mode 100644 index 000000000000..0a2d8610dbd1 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_copy_meeting.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_create_meeting_button.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_create_meeting_button.png new file mode 100644 index 000000000000..aa2baa1493b8 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_create_meeting_button.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_delete_meeting.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_delete_meeting.png new file mode 100644 index 000000000000..8a155caf9dd9 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_delete_meeting.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_edit_meeting_form.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_edit_meeting_form.png new file mode 100644 index 000000000000..1527a4dbcbe9 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_edit_meeting_form.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_edit_meeting_title.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_edit_meeting_title.png new file mode 100644 index 000000000000..68507309bcfd Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_edit_meeting_title.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_history_shown.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_history_shown.png new file mode 100644 index 000000000000..7eb1336aa132 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_history_shown.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_new_onetime_meeting_form.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_new_onetime_meeting_form.png new file mode 100644 index 000000000000..2dd0887f6cd6 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_new_onetime_meeting_form.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_page_update_reload_button.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_page_update_reload_button.png new file mode 100644 index 000000000000..a468a8738108 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_page_update_reload_button.png differ diff --git a/docs/user-guide/meetings/dynamic-meetings/openproject_dynmic_meetings_reopen_meeting.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_reopen_meeting.png similarity index 100% rename from docs/user-guide/meetings/dynamic-meetings/openproject_dynmic_meetings_reopen_meeting.png rename to docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_reopen_meeting.png diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_section_duration_sum.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_section_duration_sum.png new file mode 100644 index 000000000000..7e98a663a040 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_section_duration_sum.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_section_more_menu.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_section_more_menu.png new file mode 100644 index 000000000000..8eab93eb5051 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_section_more_menu.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_select_meeting_history.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_select_meeting_history.png new file mode 100644 index 000000000000..fb2e31d8c68b Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_select_meeting_history.png differ diff --git a/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_untitled_section.png b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_untitled_section.png new file mode 100644 index 000000000000..7a2f63e81296 Binary files /dev/null and b/docs/user-guide/meetings/one-time-meetings/openproject_userguide_meetings_untitled_section.png differ diff --git a/docs/user-guide/meetings/openproject_userguide_meetings_filters.png b/docs/user-guide/meetings/openproject_userguide_meetings_filters.png new file mode 100644 index 000000000000..aa3015fed41c Binary files /dev/null and b/docs/user-guide/meetings/openproject_userguide_meetings_filters.png differ diff --git a/docs/user-guide/meetings/openproject_userguide_meetings_module_select.png b/docs/user-guide/meetings/openproject_userguide_meetings_module_select.png new file mode 100644 index 000000000000..ab8b5f8406c2 Binary files /dev/null and b/docs/user-guide/meetings/openproject_userguide_meetings_module_select.png differ diff --git a/docs/user-guide/meetings/openproject_userguide_meetings_overview.png b/docs/user-guide/meetings/openproject_userguide_meetings_overview.png new file mode 100644 index 000000000000..da95b1e3678e Binary files /dev/null and b/docs/user-guide/meetings/openproject_userguide_meetings_overview.png differ diff --git a/docs/user-guide/meetings/openproject_userguide_meetings_side_menu.png b/docs/user-guide/meetings/openproject_userguide_meetings_side_menu.png new file mode 100644 index 000000000000..d413aaaaf36b Binary files /dev/null and b/docs/user-guide/meetings/openproject_userguide_meetings_side_menu.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/README.md b/docs/user-guide/meetings/recurring-meetings/README.md new file mode 100644 index 000000000000..6ed3652553ed --- /dev/null +++ b/docs/user-guide/meetings/recurring-meetings/README.md @@ -0,0 +1,119 @@ +--- +sidebar_navigation: + title: Recurring meetings + priority: 800 +description: Manage meetings with agenda and meeting minutes in OpenProject. +keywords: meetings, dynamic meetings, agenda, minutes, recurring meeting +--- + +# Recurring meetings management + +With OpenProject 15.3, meetings were enhanced by introducing a clear distinction between **one-time meetings** and **recurring meetings**. This page covers the features and functionalities of recurring meetings. For information on one-time meetings, please refer to [this page](../one-time-meetings). + +Recurring meetings are helpful to schedule and organize meetings that happen regularly and which have the same structure. They consist of individual occurrences that repeat with a defined frequency and interval, and are all based on a meeting template consisting of predefined sections, agenda items and participants. + +> [!NOTE] +> The **Meetings module needs to be activated** in the [Project settings](../../projects/project-settings/modules/) to be able to create and edit meetings. + +| Topic | Content | +| ------------------------------------------------------------ | ------------------------------------------------------------ | +| [Create and edit recurring meetings](#create-and-edit-recurring-meetings) | How to create and edit recurring meetings in OpenProject. | +| [Edit recurring meetings template](#edit-recurring-meetings-template) | How to edit a template for recurring meeting series. | +| [Edit recurring meeting series](#edit-recurring-meeting-series) | How to edit recurring meeting series in OpenProject. | +| [Edit a recurring meeting occurrence](#edit-a-recurring-meeting-occurrence) | How to edit a single meeting within recurring meeting series. | + +## Create and edit recurring meetings + +You can either create a recurring meeting from within a project or from the global **Meetings** module. For steps on creating a classic meetings please consult [this page](../classic-meetings). For steps on setting up one-time meetings please consult [this page](../one-time-meetings). + +To create a new recurring meeting, click the green **+ Meeting** button in the upper right corner and select **Recurring**. + +![A button to create recurring meetings in OpenProject](openproject_userguide_meetings_recurring_meeting_button.png) + +Enter your meeting's title, location, start and end date and time, duration, frequency and interval. Note that if you are creating a meeting from a global module you will first need to select a project to which the meeting belongs. + +![Form to create recurring meetings in OpenProject](openproject_userguide_meetings_recurring_meeting_form.png) + +> [!TIP] +> Duration can be entered both in hours and minutes. For example for a meeting that should last for 1.5 hours, you can enter: +> +> - 1.5h +> - 90m +> - 90min +> - 1:30 + +**Frequency** offers following options: + +- Every day +- Every working day +- Every week + +**Interval** is a **required** integer field that defines the recurrence pattern of a meeting series. It specifies how often a meeting should repeat within the selected recurrence scheme. For example: + +- Daily, Interval = 2 → The meeting occurs every two days. +- Weekly, Interval = 4 → The meeting occurs every four weeks. + +> [!TIP] +> For **working day-based recurrence**, the **Interval field is hidden** and always set to 1, meaning the meeting occurs on every working day without customization. + +**Meeting series ends** field is a select dropdown field that defines when a recurring meeting series should come to an end. The following options are possible: + +- **Never** - the meeting series runs indefinitely +- **After a specific date** – lets you specify an **end date** (the meeting might end before or on this date, depending on the original start date and frequency) +- **After a number of occurrences** – lets you specificy the number of individual **occurrences** after which the series will end + +Click the **Create meeting series** button to save your changes. This will create the recurring meeting series and redirect you to the meeting template page. + +## Edit recurring meetings template + +After creating a meeting series, you are redirected to the recurring meeting template. At this point, no meeting within the recurring meeting series has yet been set up. You need to first define a template that will be the basis of all upcoming meetings. In other words, all new iterations of meetings in the series will be a copy of this template. + +![Template meeting for recurring meetings in OpenProject](openproject_userguide_meetings_recurring_meeting_initial_template.png) + +You can define the template the same way that you would a [one-time meeting](../one-time-meetings): you can add sections, agenda items, work packages and even a set of participants. Keep in mind that every new occurrence of a meeting in the series will use this template. After you are done editing the meeting template, you can create the first meeting by clicking **Open first meeting** button, which will direct you to the first open meeting occurrence in the new series. + +You can always adjust the template at a later date by selecting the meeting series from the left hand menu and clicking **Edit template** on the meeting series index page. These changes will not affect past or already created (opened) meetings. + +![Edit template button for recurring meetings in OpenProject](openproject_userguide_meetings_recurring_meeting_edit_template_button.png) + + + +## Edit recurring meetings +### Edit recurring meeting series + +The left side menu displays all existing meeting series. Click on one will open the index page for this particular series, displaying all meeting occurrences planned for this series, and are grouped into: + +- **Open**: lists all meetings within the series that have been opened and can be edited. All open meetings will also be displayed under *My Meetings* section. +- **Planned**: lists all meetings within the selected meeting series that are scheduled, but not yet open. Every time a planned meeting starts, the next one will open automatically. You can also open any of the planned meetings manually to import the template and start editing the agenda. + +> [!TIP] +> Once a meeting is open, changes to the template do not affect it. + +To edit the meeting series, select the **More** (three dots) icon on the far right side of the meeting series name and select *Edit meeting series*. + +![Button to edit recurring meeting series in OpenProject](openproject_userguide_meetings_edit_meeting_series_button.png) + +Within the same menu you also have the following options: + +- Download meeting series as iCalendar event +- Send email to all participants +- Delete meeting series + +### Edit a recurring meeting occurrence + +To edit a single meeting within recurring meeting series you have to open it first by clicking the **Open** button next to the meeting. It will then be displayed under *Open* section on the recurring meeting index page, where you can click the meeting date and time. + +![Select a meeting occurrence on a recurring meetings series index page](openproject_userguide_meetings_edit_meeting_occurence_link.png) + +This will open the specific meeting page. You can then edit the meeting by using same functions as for [editing one-time meetings](../one-time-meetings), including adding sections and agenda points, inviting participants, and adding attachments. + +Additionally you can copy a specific meeting series occurrence as a one-time meeting. To do that click the **More** (three dots) icon and select **Copy as one-time meeting**. + +![Copy a recurring meeting occurrence as a one-time meeting](openproject_userguide_meetings_copy_recurring_meeting_as_onetime.png) + +Within the same menu you also have the following options: + +- Download iCalendar event +- Send email to all participants +- View history +- Cancel this occurence diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_copy_recurring_meeting_as_onetime.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_copy_recurring_meeting_as_onetime.png new file mode 100644 index 000000000000..aca2ed9c872a Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_copy_recurring_meeting_as_onetime.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_edit_meeting_occurence_link.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_edit_meeting_occurence_link.png new file mode 100644 index 000000000000..479c99facdda Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_edit_meeting_occurence_link.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_edit_meeting_series_button.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_edit_meeting_series_button.png new file mode 100644 index 000000000000..af85d2c37330 Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_edit_meeting_series_button.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_button.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_button.png new file mode 100644 index 000000000000..f229a199655a Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_button.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_edit_template_button.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_edit_template_button.png new file mode 100644 index 000000000000..c309a5342465 Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_edit_template_button.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_form.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_form.png new file mode 100644 index 000000000000..d1acaf7d341c Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_form.png differ diff --git a/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_initial_template.png b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_initial_template.png new file mode 100644 index 000000000000..09b81ea430ee Binary files /dev/null and b/docs/user-guide/meetings/recurring-meetings/openproject_userguide_meetings_recurring_meeting_initial_template.png differ diff --git a/docs/user-guide/members/confirm-user-deletion.png b/docs/user-guide/members/confirm-user-deletion.png index 736a1a7fbee0..d4cc5d8efc5e 100644 Binary files a/docs/user-guide/members/confirm-user-deletion.png and b/docs/user-guide/members/confirm-user-deletion.png differ diff --git a/docs/user-guide/members/delete-project-member.png b/docs/user-guide/members/delete-project-member.png index 79b929646f38..635ba89242b8 100644 Binary files a/docs/user-guide/members/delete-project-member.png and b/docs/user-guide/members/delete-project-member.png differ diff --git a/docs/user-guide/members/edit-project-member.png b/docs/user-guide/members/edit-project-member.png index 3e2ff1fb0b0a..eca46738fc6e 100644 Binary files a/docs/user-guide/members/edit-project-member.png and b/docs/user-guide/members/edit-project-member.png differ diff --git a/docs/user-guide/members/filter-project-members.png b/docs/user-guide/members/filter-project-members.png index bdecf9a74c93..3db844247912 100644 Binary files a/docs/user-guide/members/filter-project-members.png and b/docs/user-guide/members/filter-project-members.png differ diff --git a/docs/user-guide/members/members-overview-group.png b/docs/user-guide/members/members-overview-group.png index 75781bef83a6..b9e90e728f28 100644 Binary files a/docs/user-guide/members/members-overview-group.png and b/docs/user-guide/members/members-overview-group.png differ diff --git a/docs/user-guide/members/members-overview.png b/docs/user-guide/members/members-overview.png index 648b2f0a9e50..c7c237ce56a1 100644 Binary files a/docs/user-guide/members/members-overview.png and b/docs/user-guide/members/members-overview.png differ diff --git a/docs/user-guide/members/openproject_user_guide_confirm_user_removal_with_shares.png b/docs/user-guide/members/openproject_user_guide_confirm_user_removal_with_shares.png index badf100a64a4..0b7184951f2c 100644 Binary files a/docs/user-guide/members/openproject_user_guide_confirm_user_removal_with_shares.png and b/docs/user-guide/members/openproject_user_guide_confirm_user_removal_with_shares.png differ diff --git a/docs/user-guide/members/openproject_user_guide_members_remove_work_package_shares.png b/docs/user-guide/members/openproject_user_guide_members_remove_work_package_shares.png index f89cdb7ac65a..67faa1716a6f 100644 Binary files a/docs/user-guide/members/openproject_user_guide_members_remove_work_package_shares.png and b/docs/user-guide/members/openproject_user_guide_members_remove_work_package_shares.png differ diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png index eab394f7d525..a1fa8483608b 100644 Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-Participating.png differ diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png index 1bf7212ca3dd..30c890864b14 100644 Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-dateAlerts.png differ diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png index e4fd17123987..e377d9587e26 100644 Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-fromNotificationCenter.png differ diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png index 4b34d8d8be00..d66b5163d236 100644 Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-nonPartipating.png differ diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png index 98436bde2437..8da684155fb5 100644 Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-overall.png differ diff --git a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png index f0eb54699c3a..6a6e926e893f 100644 Binary files a/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png and b/docs/user-guide/notifications/notification-settings/Notification-settings-12.4-projectSpecific.png differ diff --git a/docs/user-guide/notifications/openproject-notification-center-inbox.png b/docs/user-guide/notifications/openproject-notification-center-inbox.png index d8eaeb6d9389..85039c63a8bb 100644 Binary files a/docs/user-guide/notifications/openproject-notification-center-inbox.png and b/docs/user-guide/notifications/openproject-notification-center-inbox.png differ diff --git a/docs/user-guide/notifications/openproject_user_guide_notification_activity_tab.png b/docs/user-guide/notifications/openproject_user_guide_notification_activity_tab.png index b8c19c8860f3..e3bddb27a2f2 100644 Binary files a/docs/user-guide/notifications/openproject_user_guide_notification_activity_tab.png and b/docs/user-guide/notifications/openproject_user_guide_notification_activity_tab.png differ diff --git a/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope.png b/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope.png index fd66814fd38c..191b67973b21 100644 Binary files a/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope.png and b/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope.png differ diff --git a/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope_splitscreen_mode.png b/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope_splitscreen_mode.png index 555553b0d3d6..a738a1dc7064 100644 Binary files a/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope_splitscreen_mode.png and b/docs/user-guide/notifications/openproject_user_guide_notification_center_mark_read_envelope_splitscreen_mode.png differ diff --git a/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png b/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png index abae45e0c412..10594631f1bd 100644 Binary files a/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png and b/docs/user-guide/notifications/openproject_user_guide_notification_center_split_screen.png differ diff --git a/docs/user-guide/project-overview/configure-view-widgets.png b/docs/user-guide/project-overview/configure-view-widgets.png index 1d7dab649039..9e21522b3d37 100644 Binary files a/docs/user-guide/project-overview/configure-view-widgets.png and b/docs/user-guide/project-overview/configure-view-widgets.png differ diff --git a/docs/user-guide/project-overview/image-20191112142303373.png b/docs/user-guide/project-overview/image-20191112142303373.png index 256fcda80d9f..7646478b6977 100644 Binary files a/docs/user-guide/project-overview/image-20191112142303373.png and b/docs/user-guide/project-overview/image-20191112142303373.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview.png index 435f3d9a7cd4..f8677d2e7a21 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_add_widget_icon.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_add_widget_icon.png index 451cf3250373..8e13c349900d 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_add_widget_icon.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_add_widget_icon.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_archive_project.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_archive_project.png index b0d483aea77c..b876e3139cf6 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_archive_project.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_archive_project.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_axis_criteria_widget.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_axis_criteria_widget.png index 7beb8d47f60d..f2f08dbf257b 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_axis_criteria_widget.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_axis_criteria_widget.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_filter_criteria_widget.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_filter_criteria_widget.png index ce201c323424..3c55b2968539 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_filter_criteria_widget.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_filter_criteria_widget.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_mark_favorite.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_mark_favorite.png index ca94f6848021..35e7d316ab7c 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_mark_favorite.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_mark_favorite.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_edit_new.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_edit_new.png index 4d6e408d88dd..86f9f9239cc3 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_edit_new.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_edit_new.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_new.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_new.png index e1051186e7d3..70643b762d4e 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_new.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_section_new.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_settings.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_settings.png index 92013e9259c2..b07876e620a6 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_settings.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_attributes_settings.png differ diff --git a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_members_widget.png b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_members_widget.png index e81ad397b600..d200657a6fbd 100644 Binary files a/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_members_widget.png and b/docs/user-guide/project-overview/openproject_user_guide_project_overview_project_members_widget.png differ diff --git a/docs/user-guide/project-overview/remove-widget.png b/docs/user-guide/project-overview/remove-widget.png index 98c839e8ceef..864b66c79114 100644 Binary files a/docs/user-guide/project-overview/remove-widget.png and b/docs/user-guide/project-overview/remove-widget.png differ diff --git a/docs/user-guide/projects/delete-a-project.png b/docs/user-guide/projects/delete-a-project.png index 993756661ef0..25c7d30aa582 100644 Binary files a/docs/user-guide/projects/delete-a-project.png and b/docs/user-guide/projects/delete-a-project.png differ diff --git a/docs/user-guide/projects/image-20220728200830893.png b/docs/user-guide/projects/image-20220728200830893.png index 92f13257bd9c..763ab6a911eb 100644 Binary files a/docs/user-guide/projects/image-20220728200830893.png and b/docs/user-guide/projects/image-20220728200830893.png differ diff --git a/docs/user-guide/projects/project-information-copy-project.png b/docs/user-guide/projects/project-information-copy-project.png index 32cbe6c6f78c..ef348583d3c7 100644 Binary files a/docs/user-guide/projects/project-information-copy-project.png and b/docs/user-guide/projects/project-information-copy-project.png differ diff --git a/docs/user-guide/projects/project-information-description-status.png b/docs/user-guide/projects/project-information-description-status.png index 9c623142ce4e..f9e6a714de14 100644 Binary files a/docs/user-guide/projects/project-information-description-status.png and b/docs/user-guide/projects/project-information-description-status.png differ diff --git a/docs/user-guide/projects/project-list-filter.png b/docs/user-guide/projects/project-list-filter.png index b8c5d7d2e323..b1b31820ebcb 100644 Binary files a/docs/user-guide/projects/project-list-filter.png and b/docs/user-guide/projects/project-list-filter.png differ diff --git a/docs/user-guide/projects/project-lists/Name-private-projects-filter.png b/docs/user-guide/projects/project-lists/Name-private-projects-filter.png index bee0b46cbd2e..a3c7e2fdfef1 100644 Binary files a/docs/user-guide/projects/project-lists/Name-private-projects-filter.png and b/docs/user-guide/projects/project-lists/Name-private-projects-filter.png differ diff --git a/docs/user-guide/projects/project-lists/Project-list-button.png b/docs/user-guide/projects/project-lists/Project-list-button.png index 392ff19838ec..1de012237343 100644 Binary files a/docs/user-guide/projects/project-lists/Project-list-button.png and b/docs/user-guide/projects/project-lists/Project-list-button.png differ diff --git a/docs/user-guide/projects/project-lists/activity-global-menu.png b/docs/user-guide/projects/project-lists/activity-global-menu.png index 1a6a5a2e9db8..8f0ce5bae55d 100644 Binary files a/docs/user-guide/projects/project-lists/activity-global-menu.png and b/docs/user-guide/projects/project-lists/activity-global-menu.png differ diff --git a/docs/user-guide/projects/project-lists/actvity-global-filter.png b/docs/user-guide/projects/project-lists/actvity-global-filter.png index acec7c885314..78fa94d6291e 100644 Binary files a/docs/user-guide/projects/project-lists/actvity-global-filter.png and b/docs/user-guide/projects/project-lists/actvity-global-filter.png differ diff --git a/docs/user-guide/projects/project-lists/configure-view-form-project-list-sort-order.png b/docs/user-guide/projects/project-lists/configure-view-form-project-list-sort-order.png index c35bc17bb417..5c617bf6ec60 100644 Binary files a/docs/user-guide/projects/project-lists/configure-view-form-project-list-sort-order.png and b/docs/user-guide/projects/project-lists/configure-view-form-project-list-sort-order.png differ diff --git a/docs/user-guide/projects/project-lists/configure-view-form-project-list.png b/docs/user-guide/projects/project-lists/configure-view-form-project-list.png index 8a011e37b732..5b881c7f1598 100644 Binary files a/docs/user-guide/projects/project-lists/configure-view-form-project-list.png and b/docs/user-guide/projects/project-lists/configure-view-form-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/configure-view-project-list.png b/docs/user-guide/projects/project-lists/configure-view-project-list.png index d407e57d6b31..dc50c3cfbc29 100644 Binary files a/docs/user-guide/projects/project-lists/configure-view-project-list.png and b/docs/user-guide/projects/project-lists/configure-view-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/expand-link-project-description.png b/docs/user-guide/projects/project-lists/expand-link-project-description.png index fd28be702a18..a0aaca82bd04 100644 Binary files a/docs/user-guide/projects/project-lists/expand-link-project-description.png and b/docs/user-guide/projects/project-lists/expand-link-project-description.png differ diff --git a/docs/user-guide/projects/project-lists/export-project-list-formats.png b/docs/user-guide/projects/project-lists/export-project-list-formats.png index 3163ac310963..4f244ce916a3 100644 Binary files a/docs/user-guide/projects/project-lists/export-project-list-formats.png and b/docs/user-guide/projects/project-lists/export-project-list-formats.png differ diff --git a/docs/user-guide/projects/project-lists/export-projects.png b/docs/user-guide/projects/project-lists/export-projects.png index e6835d3ada06..e4f518ce6225 100644 Binary files a/docs/user-guide/projects/project-lists/export-projects.png and b/docs/user-guide/projects/project-lists/export-projects.png differ diff --git a/docs/user-guide/projects/project-lists/name-new-project-list.png b/docs/user-guide/projects/project-lists/name-new-project-list.png index 55bc794ed2a4..8993e07d4720 100644 Binary files a/docs/user-guide/projects/project-lists/name-new-project-list.png and b/docs/user-guide/projects/project-lists/name-new-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/navigation-bar-modules.png b/docs/user-guide/projects/project-lists/navigation-bar-modules.png index 57fd78f478a5..f9b5ee2803da 100644 Binary files a/docs/user-guide/projects/project-lists/navigation-bar-modules.png and b/docs/user-guide/projects/project-lists/navigation-bar-modules.png differ diff --git a/docs/user-guide/projects/project-lists/new-subproject-project-list.png b/docs/user-guide/projects/project-lists/new-subproject-project-list.png index 98600057f204..47093a517a25 100644 Binary files a/docs/user-guide/projects/project-lists/new-subproject-project-list.png and b/docs/user-guide/projects/project-lists/new-subproject-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/open-as-gantt-view.png b/docs/user-guide/projects/project-lists/open-as-gantt-view.png index 5465a56e1ba6..a121b7e2b037 100644 Binary files a/docs/user-guide/projects/project-lists/open-as-gantt-view.png and b/docs/user-guide/projects/project-lists/open-as-gantt-view.png differ diff --git a/docs/user-guide/projects/project-lists/openproject_project_list_column_header_dropdown.png b/docs/user-guide/projects/project-lists/openproject_project_list_column_header_dropdown.png index d4f0f3854283..f69dac8f517c 100644 Binary files a/docs/user-guide/projects/project-lists/openproject_project_list_column_header_dropdown.png and b/docs/user-guide/projects/project-lists/openproject_project_list_column_header_dropdown.png differ diff --git a/docs/user-guide/projects/project-lists/openproject_project_list_search_bar.png b/docs/user-guide/projects/project-lists/openproject_project_list_search_bar.png index 661d734f78f0..36d90d7a344d 100644 Binary files a/docs/user-guide/projects/project-lists/openproject_project_list_search_bar.png and b/docs/user-guide/projects/project-lists/openproject_project_list_search_bar.png differ diff --git a/docs/user-guide/projects/project-lists/openproject_project_list_select_zen_mode.png b/docs/user-guide/projects/project-lists/openproject_project_list_select_zen_mode.png index 4b89400ebcb2..6eb3555b22ed 100644 Binary files a/docs/user-guide/projects/project-lists/openproject_project_list_select_zen_mode.png and b/docs/user-guide/projects/project-lists/openproject_project_list_select_zen_mode.png differ diff --git a/docs/user-guide/projects/project-lists/openproject_user_guide_project_lists.png b/docs/user-guide/projects/project-lists/openproject_user_guide_project_lists.png index c73e33925605..f67df7fc10d8 100644 Binary files a/docs/user-guide/projects/project-lists/openproject_user_guide_project_lists.png and b/docs/user-guide/projects/project-lists/openproject_user_guide_project_lists.png differ diff --git a/docs/user-guide/projects/project-lists/openproject_user_guide_project_project_list.png b/docs/user-guide/projects/project-lists/openproject_user_guide_project_project_list.png index aa2ebc16df50..31d4f3d160e0 100644 Binary files a/docs/user-guide/projects/project-lists/openproject_user_guide_project_project_list.png and b/docs/user-guide/projects/project-lists/openproject_user_guide_project_project_list.png differ diff --git a/docs/user-guide/projects/project-lists/overall-activity-link.png b/docs/user-guide/projects/project-lists/overall-activity-link.png index 3e3b28fe4eb5..d48d70d086b8 100644 Binary files a/docs/user-guide/projects/project-lists/overall-activity-link.png and b/docs/user-guide/projects/project-lists/overall-activity-link.png differ diff --git a/docs/user-guide/projects/project-lists/private-project-filter-rename-delete.png b/docs/user-guide/projects/project-lists/private-project-filter-rename-delete.png index 0f9065090c71..c068170ba1f7 100644 Binary files a/docs/user-guide/projects/project-lists/private-project-filter-rename-delete.png and b/docs/user-guide/projects/project-lists/private-project-filter-rename-delete.png differ diff --git a/docs/user-guide/projects/project-lists/private-project-filter-saved.png b/docs/user-guide/projects/project-lists/private-project-filter-saved.png index f94c98822bf5..33327e4ca046 100644 Binary files a/docs/user-guide/projects/project-lists/private-project-filter-saved.png and b/docs/user-guide/projects/project-lists/private-project-filter-saved.png differ diff --git a/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-button.png b/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-button.png index 729c8ffc51e9..765d50ce7e29 100644 Binary files a/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-button.png and b/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-button.png differ diff --git a/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-list.png b/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-list.png index acbc698dc829..f5894b5e9c73 100644 Binary files a/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-list.png and b/docs/user-guide/projects/project-lists/project-lists-share-with-everyone-list.png differ diff --git a/docs/user-guide/projects/project-lists/projects-list-share-enterprise.png b/docs/user-guide/projects/project-lists/projects-list-share-enterprise.png index 24226b6a3a07..888de4a6c843 100644 Binary files a/docs/user-guide/projects/project-lists/projects-list-share-enterprise.png and b/docs/user-guide/projects/project-lists/projects-list-share-enterprise.png differ diff --git a/docs/user-guide/projects/project-lists/projects-lists-default-filters.png b/docs/user-guide/projects/project-lists/projects-lists-default-filters.png index d6469c73f46f..6f3ef7b220ed 100644 Binary files a/docs/user-guide/projects/project-lists/projects-lists-default-filters.png and b/docs/user-guide/projects/project-lists/projects-lists-default-filters.png differ diff --git a/docs/user-guide/projects/project-lists/save-button-filtered-view.png b/docs/user-guide/projects/project-lists/save-button-filtered-view.png index 99c948c1bea4..e383af831603 100644 Binary files a/docs/user-guide/projects/project-lists/save-button-filtered-view.png and b/docs/user-guide/projects/project-lists/save-button-filtered-view.png differ diff --git a/docs/user-guide/projects/project-lists/save-link-project-list.png b/docs/user-guide/projects/project-lists/save-link-project-list.png index 06bb2fe699ec..e9c9c0a93281 100644 Binary files a/docs/user-guide/projects/project-lists/save-link-project-list.png and b/docs/user-guide/projects/project-lists/save-link-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/star-project-list.png b/docs/user-guide/projects/project-lists/star-project-list.png index bcdece7818fd..2fb2d6ffbe38 100644 Binary files a/docs/user-guide/projects/project-lists/star-project-list.png and b/docs/user-guide/projects/project-lists/star-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/star-yellow-project-list.png b/docs/user-guide/projects/project-lists/star-yellow-project-list.png index 3101cde9ec4d..2e2425247147 100644 Binary files a/docs/user-guide/projects/project-lists/star-yellow-project-list.png and b/docs/user-guide/projects/project-lists/star-yellow-project-list.png differ diff --git a/docs/user-guide/projects/project-lists/view_all_projects_options.png b/docs/user-guide/projects/project-lists/view_all_projects_options.png index 830aef54be72..be3c711317bd 100644 Binary files a/docs/user-guide/projects/project-lists/view_all_projects_options.png and b/docs/user-guide/projects/project-lists/view_all_projects_options.png differ diff --git a/docs/user-guide/projects/project-settigns-copy-project.png b/docs/user-guide/projects/project-settigns-copy-project.png index 519bc6c0676e..8a6d08ca12d2 100644 Binary files a/docs/user-guide/projects/project-settigns-copy-project.png and b/docs/user-guide/projects/project-settigns-copy-project.png differ diff --git a/docs/user-guide/projects/project-settings-archive-project.png b/docs/user-guide/projects/project-settings-archive-project.png index 179e028fd302..98595a57c581 100644 Binary files a/docs/user-guide/projects/project-settings-archive-project.png and b/docs/user-guide/projects/project-settings-archive-project.png differ diff --git a/docs/user-guide/projects/project-settings-copy-project-advanced-settings.png b/docs/user-guide/projects/project-settings-copy-project-advanced-settings.png index 08d631c46d0a..1b73a9f43e00 100644 Binary files a/docs/user-guide/projects/project-settings-copy-project-advanced-settings.png and b/docs/user-guide/projects/project-settings-copy-project-advanced-settings.png differ diff --git a/docs/user-guide/projects/project-settings-copy-project-copy-options.png b/docs/user-guide/projects/project-settings-copy-project-copy-options.png index 8987bf7c7577..f102e53c12e3 100644 Binary files a/docs/user-guide/projects/project-settings-copy-project-copy-options.png and b/docs/user-guide/projects/project-settings-copy-project-copy-options.png differ diff --git a/docs/user-guide/projects/project-settings-information-change-hierarchy.png b/docs/user-guide/projects/project-settings-information-change-hierarchy.png index 589d9765b4f1..99c411f6261d 100644 Binary files a/docs/user-guide/projects/project-settings-information-change-hierarchy.png and b/docs/user-guide/projects/project-settings-information-change-hierarchy.png differ diff --git a/docs/user-guide/projects/project-settings-subproject.png b/docs/user-guide/projects/project-settings-subproject.png index 0f7f8ff96c17..11a1f8cf7a39 100644 Binary files a/docs/user-guide/projects/project-settings-subproject.png and b/docs/user-guide/projects/project-settings-subproject.png differ diff --git a/docs/user-guide/projects/project-settings/custom-fields/openproject_user_guide_projects_project_settings_custom_fields.png b/docs/user-guide/projects/project-settings/custom-fields/openproject_user_guide_projects_project_settings_custom_fields.png index b2b77b7ae569..5c4822103799 100644 Binary files a/docs/user-guide/projects/project-settings/custom-fields/openproject_user_guide_projects_project_settings_custom_fields.png and b/docs/user-guide/projects/project-settings/custom-fields/openproject_user_guide_projects_project_settings_custom_fields.png differ diff --git a/docs/user-guide/projects/project-settings/files/file-storages-available-in-project.png b/docs/user-guide/projects/project-settings/files/file-storages-available-in-project.png index 344b9e6bbd0a..0da6ddfadd2b 100644 Binary files a/docs/user-guide/projects/project-settings/files/file-storages-available-in-project.png and b/docs/user-guide/projects/project-settings/files/file-storages-available-in-project.png differ diff --git a/docs/user-guide/projects/project-settings/files/file-storages-oauth-nudge-nextcloud.png b/docs/user-guide/projects/project-settings/files/file-storages-oauth-nudge-nextcloud.png index 80a6224cb596..f46a9aaaa19e 100644 Binary files a/docs/user-guide/projects/project-settings/files/file-storages-oauth-nudge-nextcloud.png and b/docs/user-guide/projects/project-settings/files/file-storages-oauth-nudge-nextcloud.png differ diff --git a/docs/user-guide/projects/project-settings/files/onedrive-storage-add-folders-new.png b/docs/user-guide/projects/project-settings/files/onedrive-storage-add-folders-new.png index 02978bead2fe..ace6bf01c2ce 100644 Binary files a/docs/user-guide/projects/project-settings/files/onedrive-storage-add-folders-new.png and b/docs/user-guide/projects/project-settings/files/onedrive-storage-add-folders-new.png differ diff --git a/docs/user-guide/projects/project-settings/files/project-settings-attachments.png b/docs/user-guide/projects/project-settings/files/project-settings-attachments.png index edf2824a947e..a021890ed302 100644 Binary files a/docs/user-guide/projects/project-settings/files/project-settings-attachments.png and b/docs/user-guide/projects/project-settings/files/project-settings-attachments.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-add-new.png b/docs/user-guide/projects/project-settings/files/storage-add-new.png index 958c2f1bc388..3c916c93ed1d 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-add-new.png and b/docs/user-guide/projects/project-settings/files/storage-add-new.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-add-project-folder.png b/docs/user-guide/projects/project-settings/files/storage-add-project-folder.png index 232575cbdada..83d96f9b0348 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-add-project-folder.png and b/docs/user-guide/projects/project-settings/files/storage-add-project-folder.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-delete.png b/docs/user-guide/projects/project-settings/files/storage-delete.png index e1573d991014..457b57d5eda4 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-delete.png and b/docs/user-guide/projects/project-settings/files/storage-delete.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-edit.png b/docs/user-guide/projects/project-settings/files/storage-edit.png index f24426c63b2f..b46cf73f78d5 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-edit.png and b/docs/user-guide/projects/project-settings/files/storage-edit.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-list-edit-delete.png b/docs/user-guide/projects/project-settings/files/storage-list-edit-delete.png index b8255807a8d9..546914f64ce8 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-list-edit-delete.png and b/docs/user-guide/projects/project-settings/files/storage-list-edit-delete.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-list-member-status.png b/docs/user-guide/projects/project-settings/files/storage-list-member-status.png index f802d402605e..250464b144dc 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-list-member-status.png and b/docs/user-guide/projects/project-settings/files/storage-list-member-status.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage-list-members.png b/docs/user-guide/projects/project-settings/files/storage-list-members.png index 7b321f224089..1fbcf6e44c80 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage-list-members.png and b/docs/user-guide/projects/project-settings/files/storage-list-members.png differ diff --git a/docs/user-guide/projects/project-settings/files/storage_delete_icon.png b/docs/user-guide/projects/project-settings/files/storage_delete_icon.png index 61a596b71b98..2b793f3af119 100644 Binary files a/docs/user-guide/projects/project-settings/files/storage_delete_icon.png and b/docs/user-guide/projects/project-settings/files/storage_delete_icon.png differ diff --git a/docs/user-guide/projects/project-settings/modules/Modules-overview.png b/docs/user-guide/projects/project-settings/modules/Modules-overview.png index ae4141ac6b32..8b87fa4ae5e3 100644 Binary files a/docs/user-guide/projects/project-settings/modules/Modules-overview.png and b/docs/user-guide/projects/project-settings/modules/Modules-overview.png differ diff --git a/docs/user-guide/projects/project-settings/project-attributes/open_project_user_guide_project_settings_project_attributes_list.png b/docs/user-guide/projects/project-settings/project-attributes/open_project_user_guide_project_settings_project_attributes_list.png index 1e2ad93e1eb9..8495ed13c9b6 100644 Binary files a/docs/user-guide/projects/project-settings/project-attributes/open_project_user_guide_project_settings_project_attributes_list.png and b/docs/user-guide/projects/project-settings/project-attributes/open_project_user_guide_project_settings_project_attributes_list.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_assignee.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_assignee.png index a13a29935196..a3cf77954d35 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_assignee.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_assignee.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_existing_task.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_existing_task.png index 63a6191e78b3..0df7dd0010ac 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_existing_task.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_existing_task.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task.png index adf25121631b..ddd04486460c 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task_select_row.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task_select_row.png index f2be4b6446e2..933371ca9403 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task_select_row.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_add_task_select_row.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_delete_task.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_delete_task.png index 5c5363da8a69..b3b246664088 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_delete_task.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_delete_task.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_detailed_view_explained.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_detailed_view_explained.png index 1d2dda9c1d2d..c4a9fa41f04d 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_detailed_view_explained.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_detailed_view_explained.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_new_unnamed_empty.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_new_unnamed_empty.png index 58b792b368c3..652f9383f6c2 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_new_unnamed_empty.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_new_unnamed_empty.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview.png index c8e5bba4c372..9876c9984bfd 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview_explained.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview_explained.png index a9cbc585392a..bfe3539106de 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview_explained.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_overview_explained.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_drag_handles.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_drag_handles.png index 60ad059c639b..43219c8617da 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_drag_handles.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_drag_handles.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_info_icon.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_info_icon.png index 0af81c4753a3..e80af4afba25 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_info_icon.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_info_icon.png differ diff --git a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_splitscreen.png b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_splitscreen.png index 8f6d053cb23d..eca035e4c3e6 100644 Binary files a/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_splitscreen.png and b/docs/user-guide/team-planner/openproject_user_guide_teamplanner_task_splitscreen.png differ diff --git a/docs/user-guide/time-and-costs/progress-tracking/README.md b/docs/user-guide/time-and-costs/progress-tracking/README.md index 91965cedd1f4..bbb1616630a5 100644 --- a/docs/user-guide/time-and-costs/progress-tracking/README.md +++ b/docs/user-guide/time-and-costs/progress-tracking/README.md @@ -10,10 +10,6 @@ keywords: Progress tracking, estimated time, remaining time, work, % complete, p OpenProject lets you track and monitor the progress of your work packages. -> [!IMPORTANT] -> In OpenProject 14.0, the way progress is reported and calculated has changed significantly. Refer to [this blog article](https://www.openproject.org/blog/changes-progress-work-estimates/) to follow the changes. -> **In OpenProject 14.6 some of the changes made in 14.0 were removed and updated**. Please read the documentation below and [this blog post](https://www.openproject.org/blog/updates-to-progress-tracking-in-14-6-based-on-user-feedback/) to understand how OpenProject handles work and progress estimates. - ## Terms [OpenProject 13.2](../../../release-notes/13/13-2-0/) introduced important changes in the names of three work package fields: diff --git a/docs/user-guide/time-and-costs/progress-tracking/hierarchy-totals-days.png b/docs/user-guide/time-and-costs/progress-tracking/hierarchy-totals-days.png index d181bb2d173f..2f58356a068e 100644 Binary files a/docs/user-guide/time-and-costs/progress-tracking/hierarchy-totals-days.png and b/docs/user-guide/time-and-costs/progress-tracking/hierarchy-totals-days.png differ diff --git a/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_calculation_hint.png b/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_calculation_hint.png index e537279c4183..67333b6d090a 100644 Binary files a/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_calculation_hint.png and b/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_calculation_hint.png differ diff --git a/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_manual.png b/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_manual.png index 9a0504362510..685274c2c57f 100644 Binary files a/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_manual.png and b/docs/user-guide/time-and-costs/progress-tracking/openproject_user_guide_percentage_complete_manual.png differ diff --git a/docs/user-guide/time-and-costs/progress-tracking/progress-popover-status-based-days.png b/docs/user-guide/time-and-costs/progress-tracking/progress-popover-status-based-days.png index 9d5e295d2988..09d9a3f67b95 100644 Binary files a/docs/user-guide/time-and-costs/progress-tracking/progress-popover-status-based-days.png and b/docs/user-guide/time-and-costs/progress-tracking/progress-popover-status-based-days.png differ diff --git a/docs/user-guide/time-and-costs/progress-tracking/progress-popover-work-based-days.png b/docs/user-guide/time-and-costs/progress-tracking/progress-popover-work-based-days.png index f8d73fff8479..da073a5b0e20 100644 Binary files a/docs/user-guide/time-and-costs/progress-tracking/progress-popover-work-based-days.png and b/docs/user-guide/time-and-costs/progress-tracking/progress-popover-work-based-days.png differ diff --git a/docs/user-guide/time-and-costs/progress-tracking/progress-work-estimates-excludedFromParent-days.png b/docs/user-guide/time-and-costs/progress-tracking/progress-work-estimates-excludedFromParent-days.png index e78edad3b08c..cc66aee28f3d 100644 Binary files a/docs/user-guide/time-and-costs/progress-tracking/progress-work-estimates-excludedFromParent-days.png and b/docs/user-guide/time-and-costs/progress-tracking/progress-work-estimates-excludedFromParent-days.png differ diff --git a/docs/user-guide/time-and-costs/reporting/README.md b/docs/user-guide/time-and-costs/reporting/README.md index b5453802eabb..1070d4cf2280 100644 --- a/docs/user-guide/time-and-costs/reporting/README.md +++ b/docs/user-guide/time-and-costs/reporting/README.md @@ -40,18 +40,17 @@ You can change the view of a cost reports and adapt it to your needs. ### Filter cost reports -You can select and apply various filters, such as work package, author, start date or target version. +You can select and apply various filters, such as work package, author, start date, or target version, to refine the displayed data. The **Projects** filter allows selection of multiple projects. Depending on your rights within a project, multiple users can also be selected. -Multiple projects can be selected by adding a **Projects** filter. -Depending on your rights in the project, multiple users can also be selected. This way you can filter the time and cost entries exactly to your need, depending on the time, work or user you want to see. +The **Work Package** and **Projects** filters support the inclusion or exclusion of related elements. The **Work Package** filter can include or exclude children work packages, while the **Projects** filter can include or exclude subprojects. -The results will then be displayed in the time and cost report below. +Filtered results are displayed in the time and cost report below. ![Time and cost reports filters in OpenProject](openproject_userguide_timeandcosts_module_filter.png) ### Group by criteria for cost reports -The time and cost reports can be grouped by selected criteria, such as dates, work packages, assignee, or any other field, incl. custom fields. +The time and cost reports can be grouped by selected criteria, such as dates, work packages, assignee, or any other field, including custom fields. To add grouping criteria to the columns or rows of the report, select the drop-down field on the right to **add a group-by attribute**. @@ -118,3 +117,10 @@ To prepare the export, first filter and set up the report according to your pref A PDF file will be generated, containing the time entries specified by the report. ![Timesheet PDF export in OpenProject](openproject_userguide_timesheet_pdf_export.png) + +> [!TIP] +> +> If the exported PDF includes multiple users, an additional page after the cover page will provide an overview table displaying the total hours worked by each user, as well as a sum per user. +> + +![Timesheet PDF export for multiple users in OpenProject](openproject_userguide_timesheet_pdf_export_multiple_users.png) \ No newline at end of file diff --git a/docs/user-guide/time-and-costs/reporting/Time-cots-group-by.png b/docs/user-guide/time-and-costs/reporting/Time-cots-group-by.png deleted file mode 100644 index 5d8ffbd44516..000000000000 Binary files a/docs/user-guide/time-and-costs/reporting/Time-cots-group-by.png and /dev/null differ diff --git a/docs/user-guide/time-and-costs/reporting/image-20210305134143475.png b/docs/user-guide/time-and-costs/reporting/image-20210305134143475.png deleted file mode 100644 index f6a58906e9da..000000000000 Binary files a/docs/user-guide/time-and-costs/reporting/image-20210305134143475.png and /dev/null differ diff --git a/docs/user-guide/time-and-costs/reporting/image-20210305134828633.png b/docs/user-guide/time-and-costs/reporting/image-20210305134828633.png deleted file mode 100644 index 494b3e1709a9..000000000000 Binary files a/docs/user-guide/time-and-costs/reporting/image-20210305134828633.png and /dev/null differ diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png index 6993f4913326..8fdca27d305f 100644 Binary files a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_groupby.png differ diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png index 42828bd277be..3d74f061820f 100644 Binary files a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module.png differ diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png index 63eb15fb5cb0..70a53efb9ae0 100644 Binary files a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_module_filter.png differ diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png index 5a2d46af9638..fc42e7948327 100644 Binary files a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timeandcosts_timesheet_export_settings.png differ diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png index 80745f0401f4..531ba75b2cae 100644 Binary files a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export.png differ diff --git a/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export_multiple_users.png b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export_multiple_users.png new file mode 100644 index 000000000000..4c3a67010c46 Binary files /dev/null and b/docs/user-guide/time-and-costs/reporting/openproject_userguide_timesheet_pdf_export_multiple_users.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_button.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_button.png index 76b49c6041ca..9c5e0185a364 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_button.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_button.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_form.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_form.png index e92a04c0ef06..b409602f9d34 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_form.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_create_wiki_page_form.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_edit_wiki_page_button.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_edit_wiki_page_button.png index ce15220c82d6..ff8439248b14 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_edit_wiki_page_button.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_edit_wiki_page_button.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_watch_wiki_page_button.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_watch_wiki_page_button.png index 13a7da7c9ec6..7df53c03a289 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_watch_wiki_page_button.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_watch_wiki_page_button.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_autosave_icon.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_autosave_icon.png index 50e2271c1e5a..bac9e985d8fd 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_autosave_icon.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_autosave_icon.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_child_page_example.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_child_page_example.png index 535e36b73b6d..56854f143f8f 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_child_page_example.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_child_page_example.png differ diff --git a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_noparent_page_example.png b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_noparent_page_example.png index 340f8ed2fbc4..4d8503faf896 100644 Binary files a/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_noparent_page_example.png and b/docs/user-guide/wiki/create-edit-wiki/openproject_user_guide_wiki_noparent_page_example.png differ diff --git a/docs/user-guide/wiki/openproject_user_guide_wiki.png b/docs/user-guide/wiki/openproject_user_guide_wiki.png index 4d529a1e5802..41dae63e569b 100644 Binary files a/docs/user-guide/wiki/openproject_user_guide_wiki.png and b/docs/user-guide/wiki/openproject_user_guide_wiki.png differ diff --git a/docs/user-guide/wiki/openproject_user_guide_wiki_emoji.png b/docs/user-guide/wiki/openproject_user_guide_wiki_emoji.png index 53559695accc..94e562450095 100644 Binary files a/docs/user-guide/wiki/openproject_user_guide_wiki_emoji.png and b/docs/user-guide/wiki/openproject_user_guide_wiki_emoji.png differ diff --git a/docs/user-guide/work-packages/add-work-packages-to-meetings/README.md b/docs/user-guide/work-packages/add-work-packages-to-meetings/README.md index d8a3a4847310..fbcf99a1e761 100644 --- a/docs/user-guide/work-packages/add-work-packages-to-meetings/README.md +++ b/docs/user-guide/work-packages/add-work-packages-to-meetings/README.md @@ -8,7 +8,7 @@ keywords: meetings, dynamic meetings, meeting agenda # Add work packages to meetings -Starting with OpenProject 13.1, meetings and work packages can be linked to one another. This can be done either from the detailed view of a work package or when editing [a dynamic meeting](../../meetings/dynamic-meetings/#add-a-work-package-to-the-agenda). +Starting with OpenProject 13.1, meetings and work packages can be linked to one another. This can be done either from the detailed view of a work package or when editing [a one-time or recurring meetings](../../meetings/one-time-meetings/#add-a-work-package-to-the-agenda). To add a work package to a meeting, open the detailed view of that work package, select the **Meetings** tab and click the **+Add to meeting** button. @@ -22,7 +22,7 @@ In the dialog that appears, select a meeting from the list of open upcoming meet ![Add a work package to a new meeting](openproject_user_guide_meeting_dialogue.png) -The newly-created work package agenda item can be [re-ordered and edited](../../meetings/dynamic-meetings/#edit-a-meeting). +The newly-created work package agenda item can be [re-ordered and edited](../../meetings/one-time-meetings/#edit-a-meeting). ## View existing linked meetings diff --git a/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_add_wp_to_meeting.png b/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_add_wp_to_meeting.png index 259de7953ed1..693a7ce6498e 100644 Binary files a/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_add_wp_to_meeting.png and b/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_add_wp_to_meeting.png differ diff --git a/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_meeting_dialogue.png b/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_meeting_dialogue.png index f031212d2821..aacc91c404e3 100644 Binary files a/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_meeting_dialogue.png and b/docs/user-guide/work-packages/add-work-packages-to-meetings/openproject_user_guide_meeting_dialogue.png differ diff --git a/docs/user-guide/work-packages/duplicate-move-delete/change-project-of-work-package.png b/docs/user-guide/work-packages/duplicate-move-delete/change-project-of-work-package.png index 5869f8794aab..28ee535641c6 100644 Binary files a/docs/user-guide/work-packages/duplicate-move-delete/change-project-of-work-package.png and b/docs/user-guide/work-packages/duplicate-move-delete/change-project-of-work-package.png differ diff --git a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_detailed_view.png b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_detailed_view.png index 2baab5f94a0e..42f9b5d76c8b 100644 Binary files a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_detailed_view.png and b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_detailed_view.png differ diff --git a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_threedotsmenu.png b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_threedotsmenu.png index ed1b339fe343..290830716e61 100644 Binary files a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_threedotsmenu.png and b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_threedotsmenu.png differ diff --git a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_warning_message_missing_wp_type.png b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_warning_message_missing_wp_type.png index ac10e61ce9a1..4209104a58fc 100644 Binary files a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_warning_message_missing_wp_type.png and b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_warning_message_missing_wp_type.png differ diff --git a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_wptableview.png b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_wptableview.png index 027cb5725f04..4684b4f03a2d 100644 Binary files a/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_wptableview.png and b/docs/user-guide/work-packages/duplicate-move-delete/openproject_user_guide_copy_move_delete_wptableview.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/README.md b/docs/user-guide/work-packages/edit-work-package/README.md index 14da820e24c7..89cfeadffaca 100644 --- a/docs/user-guide/work-packages/edit-work-package/README.md +++ b/docs/user-guide/work-packages/edit-work-package/README.md @@ -42,7 +42,7 @@ The green message on top of the work package indicates a successful update. ![Restore local backups in text editor in OpenProject](openproject_user_guide_wp_autosave_icon.png) -All changes of a work package are documented in the work package tab [Activity](../../../getting-started/work-packages-introduction/#activity-of-work-packages). +All changes of a work package are documented in the work package [Activity](../../../getting-started/work-packages-introduction/#activity-of-work-packages) tab. > [!NOTE] > There is no possibility to undo changes to work packages by using Ctrl+Z combination. @@ -64,7 +64,7 @@ Please note, the status may differ from work package type. They can be configure ### How to add comments to a work package -To add a comment to a work package, open the [details view](../../work-packages/work-package-views/#full-screen-view) or the [split screen view](../../work-packages/work-package-views/#split-screen-view) of a work package. On the tab [Activity](../../../getting-started/work-packages-introduction/#activity-of-work-packages) tab you have a comment field at the bottom (or on top depending on your [Account settings](../../../user-guide/account-settings/)). +To add a comment to a work package, open the [details view](../../work-packages/work-package-views/#full-screen-view) or the [split screen view](../../work-packages/work-package-views/#split-screen-view) of a work package. Under [Activity](../../../getting-started/work-packages-introduction/#activity-of-work-packages) tab you have a comment field at the bottom (or on top depending on your [Account settings](../../../user-guide/account-settings/)). **Split screen view:** @@ -89,11 +89,11 @@ Starting with OpenProject 13.0 you can add emojis to all text editors. Type a co > [!IMPORTANT] > Please note, that this option needs to activated by your project administrator under [*Project settings*](../../projects/project-settings/files/). -You can manually upload files to work packages directly under the tab **Files** in the work package detailed view. You can either attach files by dragging and dropping or by using the **+Attach files** option. +You can manually upload files to work packages directly under the *Files* tab in the work package detailed view. You can either attach files by dragging and dropping or by using the **+Attach files** option. ![Manual attachment upload in an OpenProject work package](openproject_user_guide_wp_file_upload.png) -Under the **Files** tab you will see the list of the all previously uploaded attachments, including file names, as well as which user uploaded an attachment and when. If no files were attached yet, the list will be empty. +Under the *Files* tab you will see the list of the all previously uploaded attachments, including file names, as well as which user uploaded an attachment and when. If no files were attached yet, the list will be empty. You can remove an attachment by hovering over it and clicking the **Delete** icon. @@ -135,7 +135,7 @@ At the configured date and time, you will receive the reminder in [Notification **Watchers** can be added to a work package in order to notify members about changes. They will receive notifications according to their notification settings if changes are made to the respective work package.
    -To add watchers, open the work package [detailed view](../../work-packages/work-package-views/#full-screen-view), select the tab watchers on the right hand side and choose the members you want to add with the drop-down menu or by starting to type their name. +To add watchers, open the work package [detailed view](../../work-packages/work-package-views/#full-screen-view), select the *Watchers* tab on the right hand side and choose the members you want to add with the drop-down menu or by starting to type their name. It is also possible to add oneself as watcher (if you have sufficient permissions). @@ -143,7 +143,7 @@ It is also possible to add oneself as watcher (if you have sufficient permission ### How to remove watchers from a work package -To remove watchers, navigate to the work package [details view](../../work-packages/work-package-views/#full-screen-view) and select the tab Watchers. Hover over the name of the watcher you want to remove and click the cross icon next to the watcher name. +To remove watchers, navigate to the work package [details view](../../work-packages/work-package-views/#full-screen-view) and select the *Watchers* tab. Hover over the name of the watcher you want to remove and click the cross icon next to the watcher name. The user will no longer get notifications in OpenProject about changes to this work package according to their notification settings. However, if he/she is the author, assignee or accountable of the work package there still might be notifications. Read [here](../../../user-guide/account-settings/#notifications-settings) for more information. ![Remove watchers from OpenProject work packages](openproject_user_guide_wp_watchers_remove.png) diff --git a/docs/user-guide/work-packages/edit-work-package/edit-work-package.png b/docs/user-guide/work-packages/edit-work-package/edit-work-package.png index 966e4dd6af09..11deae92a46b 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/edit-work-package.png and b/docs/user-guide/work-packages/edit-work-package/edit-work-package.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment.png index 454da6e91fae..fd6d0bed57c5 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment_update.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment_update.png index e44048e0ae2c..d4991f1da83b 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment_update.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_activity_tab_comment_update.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_assignee_responsible.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_assignee_responsible.png index e3f7de30c5ec..c0d9a2c9e3a6 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_assignee_responsible.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_assignee_responsible.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_autosave_icon.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_autosave_icon.png index ed9623003c03..cd67372729ab 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_autosave_icon.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_autosave_icon.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit.png index ec8f61896c69..4f6a6afa6a1e 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit_notification.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit_notification.png index c27ea6023545..99a1871507ca 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit_notification.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_bulk_edit_notification.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_change_status.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_change_status.png index a8cde050eded..ee52826a4aa2 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_change_status.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_change_status.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_comment_emojis.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_comment_emojis.png index 8fa4e6d1a353..96bbae73946a 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_comment_emojis.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_comment_emojis.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_delete.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_delete.png index 8ca6a0e6faf5..01111953dfbc 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_delete.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_delete.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_upload.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_upload.png index 580174588864..44e2bcdf8571 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_upload.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_file_upload.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_quick_context_menu.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_quick_context_menu.png index 4165329b82bf..eb1fe2e6f785 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_quick_context_menu.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_quick_context_menu.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png index 7c245a56a14b..52af63125daf 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_badge.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png index 46be521140fd..5d017595f6a0 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_reminder_icon.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png index 85694a95948a..0a242e37ec77 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png index a945d8be5581..480c950759be 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_set_reminder_notification.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_update_message.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_update_message.png index e4fdda629f37..6834f79c0f5c 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_update_message.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_update_message.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_remove.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_remove.png index 5f0158a0006d..f3794838e3e4 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_remove.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_remove.png differ diff --git a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_tab.png b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_tab.png index dec30f6d4182..d8a593daa987 100644 Binary files a/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_tab.png and b/docs/user-guide/work-packages/edit-work-package/openproject_user_guide_wp_watchers_tab.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject-pdf-export-work-plans.png b/docs/user-guide/work-packages/exporting/openproject-pdf-export-work-plans.png index 7c815acf71f0..1be2d6787121 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject-pdf-export-work-plans.png and b/docs/user-guide/work-packages/exporting/openproject-pdf-export-work-plans.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_export_csv.png b/docs/user-guide/work-packages/exporting/openproject_export_csv.png index 943c2320742f..75423465cb9e 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_export_csv.png and b/docs/user-guide/work-packages/exporting/openproject_export_csv.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_export_csv_with_descriptions.png b/docs/user-guide/work-packages/exporting/openproject_export_csv_with_descriptions.png index 8d370ac53a68..5b3af0192daf 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_export_csv_with_descriptions.png and b/docs/user-guide/work-packages/exporting/openproject_export_csv_with_descriptions.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_export_excel.png b/docs/user-guide/work-packages/exporting/openproject_export_excel.png index 72d1e14fac73..2ccfed34c0e3 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_export_excel.png and b/docs/user-guide/work-packages/exporting/openproject_export_excel.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_export_excel_with_descriptions.png b/docs/user-guide/work-packages/exporting/openproject_export_excel_with_descriptions.png index f362476270a0..bcc0629cc269 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_export_excel_with_descriptions.png and b/docs/user-guide/work-packages/exporting/openproject_export_excel_with_descriptions.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_export_excel_with_relations.png b/docs/user-guide/work-packages/exporting/openproject_export_excel_with_relations.png index 3585d179ca75..429b8d8d6315 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_export_excel_with_relations.png and b/docs/user-guide/work-packages/exporting/openproject_export_excel_with_relations.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_export_wp.png b/docs/user-guide/work-packages/exporting/openproject_export_wp.png index b166b3885d0a..7734093ca686 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_export_wp.png and b/docs/user-guide/work-packages/exporting/openproject_export_wp.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_excel_options.png b/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_excel_options.png index 31b2f2a36f52..f4539ef9e226 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_excel_options.png and b/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_excel_options.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_gantt_chart_options.png b/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_gantt_chart_options.png index 51a8a3163de0..d8f7ffb84367 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_gantt_chart_options.png and b/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_gantt_chart_options.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_options.png b/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_options.png index 98dbbb807f3e..07980c545b95 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_options.png and b/docs/user-guide/work-packages/exporting/openproject_pdf_export_report_options.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_pdf_report_csv_options.png b/docs/user-guide/work-packages/exporting/openproject_pdf_report_csv_options.png index 175101dfbc59..f1cef1b27231 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_pdf_report_csv_options.png and b/docs/user-guide/work-packages/exporting/openproject_pdf_report_csv_options.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_pdf_table_export.png b/docs/user-guide/work-packages/exporting/openproject_pdf_table_export.png index c2a7fff76bc3..e7285169f2d8 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_pdf_table_export.png and b/docs/user-guide/work-packages/exporting/openproject_pdf_table_export.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_wp_report_include_images_checked.png b/docs/user-guide/work-packages/exporting/openproject_wp_report_include_images_checked.png index 00f04db8d7a2..6acc3c5cfb08 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_wp_report_include_images_checked.png and b/docs/user-guide/work-packages/exporting/openproject_wp_report_include_images_checked.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_wp_report_total_sum.png b/docs/user-guide/work-packages/exporting/openproject_wp_report_total_sum.png index ff7f8b78fbf4..53f5b4c40a1a 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_wp_report_total_sum.png and b/docs/user-guide/work-packages/exporting/openproject_wp_report_total_sum.png differ diff --git a/docs/user-guide/work-packages/exporting/openproject_wp_table_total_sum.png b/docs/user-guide/work-packages/exporting/openproject_wp_table_total_sum.png index fe4ed3adcc0e..ab35d4147ded 100644 Binary files a/docs/user-guide/work-packages/exporting/openproject_wp_table_total_sum.png and b/docs/user-guide/work-packages/exporting/openproject_wp_table_total_sum.png differ diff --git a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp.png b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp.png index 9e5236d24a56..24e5141aca42 100644 Binary files a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp.png and b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp.png differ diff --git a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp_numbers.png b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp_numbers.png index a0bbb5c6f92f..ee1145c69778 100644 Binary files a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp_numbers.png and b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_share_button_wp_numbers.png differ diff --git a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_search.png b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_search.png index b0033c416722..4e28a4f53a49 100644 Binary files a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_search.png and b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_search.png differ diff --git a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list.png b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list.png index a04f68b95ab4..320962a7c5b5 100644 Binary files a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list.png and b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list.png differ diff --git a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list_change_role.png b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list_change_role.png index 2c9821b25103..671353e4e82d 100644 Binary files a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list_change_role.png and b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_list_change_role.png differ diff --git a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_users_filter_new.png b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_users_filter_new.png index 285d771dfe4d..be7cb56ce884 100644 Binary files a/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_users_filter_new.png and b/docs/user-guide/work-packages/share-work-packages/openproject_user_guide_shared_with_users_filter_new.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md b/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md index c1f6a77df593..95e9a36882ad 100644 --- a/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md +++ b/docs/user-guide/work-packages/work-package-relations-hierarchies/README.md @@ -25,7 +25,7 @@ Relations indicate any functional or timely relation (e.g. follows or proceeds, Work package relations indicate that work packages address a similar topic or create status dependencies. To create a relationship between two work packages: -1. Select a work package, click on **Relations** to open the relations tab and click the **+ Relation** button. +1. Select a work package, click on **Relations** to open the *Relations* tab and click the **+ Relation** button. 2. Select the type of relationship from the dropdown menu. 3. Enter the ID or name of the work package, to which the relation should be created. The autocomplete will suggest the work package to be added. 4. Enter a description of the relation. It will be visible for both of the related work packages. @@ -37,12 +37,16 @@ Work package relations indicate that work packages address a similar topic or cr You can select one of the following relations: +- **New child** - This option lets you create a new package and automatically adds it as a child to the current (parent) work package. + +- **Existing child** - This option allows you to add an existing work package as a child to the current (parent) work package. + - **Related to** - This option adds a link from the work package A to work package B, so that project members can immediately see the connection, even if the work packages are not members of the same hierarchy. - **Duplicates / Duplicated by** - This option indicates that the work package B duplicates a work package A in one way or another, for example both address the same task. This can be useful if you have the same work package that needs to be a part of a closed and public projects at the same time. The connection in this case is only semantic, the changes you make in work package A will need to be adapted in work package B manually. > [!NOTE] -> some changes in statuses will be adjusted automatically for the duplicated work package. Specifically, if the status of a work package A is set to be "closed" (or set to any status that is defined to count as "closed" in the [system settings](../../../system-admin-guide/manage-work-packages/work-package-status/), for example "rejected" often counts as a "closed" status), the status of the work package B will change to "closed". Note that this is direction dependent. Only if the work package A is closed will the work package B be closed as well, not the other way around. +> Some changes in statuses will be adjusted automatically for the duplicated work package. Specifically, if the status of a work package A is set to be "closed" (or set to any status that is defined to count as "closed" in the [system settings](../../../system-admin-guide/manage-work-packages/work-package-status/), for example "rejected" often counts as a "closed" status), the status of the work package B will change to "closed". Note that this is direction dependent. Only if the work package A is closed will the work package B be closed as well, not the other way around. - **Blocks / Blocked by** - This option defines status change restrictions between two work packages. If you set a work package A to be blocking work package B, the status of work package B cannot be set to closed or resolved until the work package A is closed. @@ -60,11 +64,11 @@ For the relations of type Predecessor/Successor, you can also define **Lag**, wh - **Requires / Required by** - Defines if work package A requires or is required by work package B. There is no additional effect. -- **Child** - Makes the related a work package a sub-item of the current (parent) work package - > [!TIP] > The selected relation status will be automatically displayed in the work package that you enter. For example if you select "Blocks" in the current work package A and specify work package B, work package B will automatically show that it is "Blocked by" A. + + ### Moving related work packages The predecessor/successor relation is the only one that can constrain or affect the dates of work packages. @@ -111,16 +115,26 @@ There are **four ways to add or create a child work package**: ### Add a child in the *Relations* tab in a work package's details view -Open a work package and select the tab *Relations*. Click on *+ Relation* button, scroll down the list of options and select *Child*. +Open a work package and select the tab *Relations*. Here you can click on *+ Relation* button, and select either *New child* or *Existing child* option to add a new or an existing work package as a child to the current one. + +![Add a child to a work package in OpenProject](openproject_user_guide_wp_add_child.png) -![Add a child](openproject_user_guide_wp_add_child.png) +Type the name of the new work package or select an existing one, then click the *Save* button. -Insert the name of the new work package and save the newly added child work package by clicking *Save* button. +When creating a new work package as a child, you will be asked to select type, a subject and optionally add description text. If there are required fields for the type selected, they will also appear here. + +![Create a new child work package under Relations tab in OpenProject](openproject_user_guide_wp_add_child_new.png) ![Select a child work package in OpenProject](openproject_user_guide_wp_add_child_select.png) For more information on the work package creation take a look at the guideline on [creating a work package](../create-work-package). +> [!TIP] +> +> If children work packages already exist for the current work package, you can also use the **+Child** button in the header of the 'Children' section. + +![Create child button under work package Relations tab in OpenProject](openproject_user_guide_wp_relations_child_button.png) + ## Change the parent work package To edit or remove the parent of a work package open the work package. At the top of the details view of the work package you will see the work package hierarchy. Click on the **edit icon** or **delete icon** to change the work package parent. @@ -129,10 +143,23 @@ To edit or remove the parent of a work package open the work package. At the top ## Display work package hierarchies -After adding the parent and child work packages they are listed in the *Relations* tab. -Note that only the children are shown in the relations tab and the parent isn't. +After adding the parent and child work packages they are listed in the *Relations* tab. Related work packages are grouped by the type of relation into respective sections. + +> [!NOTE] +> +> Only the children are shown in the *Relations* tab and the parent isn't. + +> [!TIP] +> +> Dates of the related work packages are only shown for date-based relations: children, predecessor and successor. + +![Work package relations displayed in the Relations tab in OpenProject](openproject_user_guide_wp_relations_tab_overview.png) + +> [!NOTE] +> +> If you do not have necessary permissions (for example if only one specific work package was shared with you, but not the entire project), you will be able to see that a work package has a relation, and the dates of that related work package, but not other details of that related work package. -![Work package relations displayed in the relations tab in OpenProject](openproject_user_guide_relations_tab.png) +![Example of work package relations displayed under Relations tab for a user with limited permissions in OpenProject](openproject_user_guide_ghost_relations.png) Hierarchies can also be displayed from the work package table view. To display work package hierarchies make sure the *Subject* column is displayed. You can activate or deactivate the hierarchy by pressing the icon next to the Subject. diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/open_project_admin_related_wp_table.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/open_project_admin_related_wp_table.png index ec45fbf9539f..9ba5f7f423fa 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/open_project_admin_related_wp_table.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/open_project_admin_related_wp_table.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_ghost_relations.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_ghost_relations.png new file mode 100644 index 000000000000..27a82932111f Binary files /dev/null and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_ghost_relations.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_change_parent.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_change_parent.png index ef30b3882e02..51c98f5c50a2 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_change_parent.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_change_parent.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab.png index eaadbadf2650..100f37c3b5b2 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png index c3f4aa997153..a6a308b18646 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_relations_tab_edit_lag.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child.png index 8d80bdd24e93..b348c59ff550 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_new.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_new.png new file mode 100644 index 000000000000..3fc3428ea9a8 Binary files /dev/null and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_new.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_select.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_select.png index 050648046e74..d4c6cdd36f95 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_select.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_child_select.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_button.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_button.png index ad5b7c7c0b2b..b6b7a315f586 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_button.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_button.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_form.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_form.png index 52e688357a36..0bd848c31a14 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_form.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_add_relations_form.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_hierarchy_icon.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_hierarchy_icon.png index e5fb37abfb89..d63445871fce 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_hierarchy_icon.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_hierarchy_icon.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_relations_child_button.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_relations_child_button.png new file mode 100644 index 000000000000..ff00675e1e80 Binary files /dev/null and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_relations_child_button.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_relations_tab_overview.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_relations_tab_overview.png new file mode 100644 index 000000000000..48df5aae3ce0 Binary files /dev/null and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_relations_tab_overview.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_add_child.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_add_child.png index da3aad1acb67..d495da8c6862 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_add_child.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_add_child.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration.png index 49c0d8a2bac1..005684d0338f 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration_filtered.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration_filtered.png index c46bc8373987..c44070593f4d 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration_filtered.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_configuration_filtered.png differ diff --git a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_show_parent.png b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_show_parent.png index 160f7263b61b..dbbfa798d694 100644 Binary files a/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_show_parent.png and b/docs/user-guide/work-packages/work-package-relations-hierarchies/openproject_user_guide_wp_table_show_parent.png differ diff --git a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-full-screen-back-arrow.png b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-full-screen-back-arrow.png index 6e5f10d92d75..ec30bd878af2 100644 Binary files a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-full-screen-back-arrow.png and b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-full-screen-back-arrow.png differ diff --git a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-table-view.png b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-table-view.png index 9d15625eeab7..e3fdef54b432 100644 Binary files a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-table-view.png and b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-table-view.png differ diff --git a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-views.png b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-views.png index a281987eff86..a8ad0b3db68e 100644 Binary files a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-views.png and b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-package-views.png differ diff --git a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-full-screen-icon.png b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-full-screen-icon.png index ae1163344ca4..8681448b84bc 100644 Binary files a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-full-screen-icon.png and b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-full-screen-icon.png differ diff --git a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-icon.png b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-icon.png index df001234c60f..c8df03be200d 100644 Binary files a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-icon.png and b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-icon.png differ diff --git a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-view.png b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-view.png index 1e9412ca951f..17c1577f79f1 100644 Binary files a/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-view.png and b/docs/user-guide/work-packages/work-package-views/openproject-user-guide-work-packages-split-screen-view.png differ diff --git a/docs/user-guide/work-packages/work-packages-faq/README.md b/docs/user-guide/work-packages/work-packages-faq/README.md index e924899b7645..04a4198a4f89 100644 --- a/docs/user-guide/work-packages/work-packages-faq/README.md +++ b/docs/user-guide/work-packages/work-packages-faq/README.md @@ -69,7 +69,7 @@ You need to activate the module "Time and costs" in the project settings, first. One possible solution: If you receive this error message when trying to create a new work package: Please navigate to *Administration ->Work packages ->Status ->[status of the work package you were trying to change, e.g. "New"]* and un-check the box next to "Work package read-only". If this box was checked it could have caused these problems, as project attributes couldn't be changed. -### How can I change the order of the activities/comments in the activity tab of a work package? +### How can I change the order of the activities/comments in the Activity tab of a work package? You can change this in your account settings. Please find out more [here](../../../user-guide/account-settings/#change-the-order-to-display-comments). diff --git a/frontend/ci-plugins-generator.js b/frontend/ci-plugins-generator.js new file mode 100644 index 000000000000..3d3cff097751 --- /dev/null +++ b/frontend/ci-plugins-generator.js @@ -0,0 +1,71 @@ +const path = require('node:path'); +const fs = require('node:fs'); +const _ = require("lodash"); + +const LINKED_PLUGINS_MODULE_TEMPLATE = (plugins) => { + const importableName = (name) => _.upperFirst(_.camelCase(name)); + const frontendPlugins = plugins.map(([name, _]) => [name, importableName(name)]); + + return ` +import {NgModule} from "@angular/core"; +${ + frontendPlugins + .map(([actualName, moduleName]) => + `import {PluginModule as ${moduleName}} from './linked/${actualName}/main';` + ) + .join("\n") +} + +@NgModule({ + imports: [ + ${ + frontendPlugins + .map(([_, moduleName]) => moduleName) + .join(`,\n${" ".repeat(8)}`) + } + ], +}) +export class LinkedPluginsModule { } + `; +}; + +const railsRout = path.join(__dirname, ".."); +const pluginDir = path.join(railsRout, 'modules'); +const targetDir = path.join(railsRout, 'frontend/src/app/features/plugins/linked'); + +const plugins = new Map([ + ["budgets", path.join(pluginDir, "budgets")], + ["costs", path.join(pluginDir, "costs")], + ["openproject-avatars", path.join(pluginDir, "avatars")], + ["openproject-documents", path.join(pluginDir, "documents")], + ["openproject-github_integration", path.join(pluginDir, "github_integration")], + ["openproject-gitlab_integration", path.join(pluginDir, "gitlab_integration")], + ["openproject-meeting", path.join(pluginDir, "meeting")] +]); + +console.log(`Cleaning linked target directory ${targetDir}`); +fs.rmSync(targetDir, { recursive: true, force: true }); +fs.mkdirSync(targetDir); + +plugins.forEach((pluginPath, name) => { + const linkTarget = path.join(pluginPath, "frontend", "module"); + const linkPath = path.join(targetDir, name); + + console.log(`Linking frontend of OpenProject plugin ${name} to ${linkPath}.`) + fs.symlinkSync(linkTarget, linkPath); +}); + +const allFrontendPlugins = Array.from(plugins).filter(([_, pluginPath]) => { + const frontendEntry = path.join(pluginPath, "frontend", "module", "main.ts"); + return fs.existsSync(frontendEntry); +}); + +function generatePluginModule(plugins) { + const fileRegister = path.join(railsRout, "frontend/src/app/features/plugins/linked-plugins.module.ts"); + console.log(`Regenerating frontend plugin registry ${fileRegister}.`); + + const result = LINKED_PLUGINS_MODULE_TEMPLATE(plugins); + fs.writeFileSync(fileRegister, result); +}; + +generatePluginModule(allFrontendPlugins); diff --git a/frontend/karma.conf.js b/frontend/karma.conf.js index b2565433632e..256971bcabf5 100644 --- a/frontend/karma.conf.js +++ b/frontend/karma.conf.js @@ -8,7 +8,6 @@ module.exports = function (config) { // I18n.js is provided by the Asset pipeline, // which is unavailable for unit tests. // For testing, shim its functionality - 'src/test/i18n-shim.ts', 'node_modules/jquery/dist/jquery.js', // 'node_modules/angular-mocks/angular-mocks.js' ], @@ -16,20 +15,29 @@ module.exports = function (config) { plugins: [ require('karma-jasmine'), require('karma-chrome-launcher'), + require('karma-coverage'), require('@angular-devkit/build-angular/plugins/karma'), require('karma-spec-reporter'), ], client:{ clearContext: false // leave Jasmine Spec Runner output visible in browser }, - coverageIstanbulReporter: { - dir: require('path').join(__dirname, 'coverage'), reports: [ 'html', 'lcovonly' ], - fixWebpackSourcePaths: true + coverageReporter: { + dir: require('path').join(__dirname, 'coverage'), + subdir: '.', + reporters: [ + { type: 'html' }, + { type: 'text-summary' }, + { type: 'lcov', subdir: 'report-lcov' }, + ] + }, + preprocessors: { + 'src/**/*.ts': 'coverage' }, angularCli: { environment: 'dev' }, - reporters: ['spec'], + reporters: ['spec', 'coverage'], specReporter: { maxLogLines: 5, // limit number of lines logged per test suppressErrorSummary: false, // do not print error summary @@ -48,7 +56,7 @@ module.exports = function (config) { customLaunchers: { ChromeHeadlessNoSandbox: { base: 'ChromeHeadless', - flags: ['--no-sandbox'] + flags: ['--no-sandbox', '--disable-gpu'] }, ChromeWithDebug: { base: 'Chrome', diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 16becf86c119..2ba0f7cfc1d7 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -25,6 +25,7 @@ "@appsignal/javascript": "^1.3.28", "@appsignal/plugin-breadcrumbs-console": "^1.1.29", "@appsignal/plugin-breadcrumbs-network": "^1.1.22", + "@braintree/sanitize-url": "^7.1.1", "@datorama/akita": "^8.0.1", "@floating-ui/dom": "^1.2.1", "@fullcalendar/angular": "^6.1.10", @@ -47,11 +48,11 @@ "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", "@openproject/octicons-angular": "^19.20.0", - "@openproject/primer-view-components": "^0.52.0", + "@openproject/primer-view-components": "^0.54.0", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.54.0", "@types/hotwired__turbo": "^8.0.1", "@uirouter/angular": "^13.0.0", "@uirouter/core": "^6.1.0", @@ -2810,6 +2811,12 @@ "node": ">=6.9.0" } }, + "node_modules/@braintree/sanitize-url": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-7.1.1.tgz", + "integrity": "sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==", + "license": "MIT" + }, "node_modules/@cnakazawa/watch": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", @@ -3337,18 +3344,18 @@ } }, "node_modules/@floating-ui/dom": { - "version": "1.6.12", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz", - "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==", + "version": "1.6.13", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz", + "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==", "dependencies": { "@floating-ui/core": "^1.6.0", - "@floating-ui/utils": "^0.2.8" + "@floating-ui/utils": "^0.2.9" } }, "node_modules/@floating-ui/utils": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", - "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz", + "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==" }, "node_modules/@fullcalendar/angular": { "version": "6.1.16", @@ -4809,9 +4816,10 @@ } }, "node_modules/@oddbird/popover-polyfill": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@oddbird/popover-polyfill/-/popover-polyfill-0.4.0.tgz", - "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@oddbird/popover-polyfill/-/popover-polyfill-0.5.2.tgz", + "integrity": "sha512-iFrvar5SOMtKFOSjYvs4z9UlLqDdJbMx0mgISLcPedv+g0ac5sgeETLGtipHCVIae6HJPclNEH5aCyD1RZaEHw==", + "license": "BSD-3-Clause" }, "node_modules/@openproject/octicons-angular": { "version": "19.20.0", @@ -4828,9 +4836,9 @@ } }, "node_modules/@openproject/primer-view-components": { - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "0.54.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.54.0.tgz", + "integrity": "sha512-7lgTeSRwKmmeHi9Kvk8wFn+9IlkuFFDBYqDgyB/CdjJN6olVLg1Ho0bp+YP2ASNBdZ3KVRaAP8gaZX8yifCBMg==", "dependencies": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -4842,7 +4850,7 @@ "@github/relative-time-element": "^4.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", - "@oddbird/popover-polyfill": "^0.4.0", + "@oddbird/popover-polyfill": "^0.5.2", "@primer/behaviors": "^1.3.4", "@primer/live-region-element": "^0.7.1" }, @@ -4925,9 +4933,9 @@ }, "node_modules/@primer/view-components": { "name": "@openproject/primer-view-components", - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "0.54.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.54.0.tgz", + "integrity": "sha512-7lgTeSRwKmmeHi9Kvk8wFn+9IlkuFFDBYqDgyB/CdjJN6olVLg1Ho0bp+YP2ASNBdZ3KVRaAP8gaZX8yifCBMg==", "dependencies": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -4939,7 +4947,7 @@ "@github/relative-time-element": "^4.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", - "@oddbird/popover-polyfill": "^0.4.0", + "@oddbird/popover-polyfill": "^0.5.2", "@primer/behaviors": "^1.3.4", "@primer/live-region-element": "^0.7.1" }, @@ -5559,9 +5567,10 @@ "dev": true }, "node_modules/@types/hotwired__turbo": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.3.tgz", - "integrity": "sha512-dBO3AlOdN9IXTD3bmAzi5ZhNwJJd8Eiy1tObsUbFUH6sCohvybwyv3GOtP3KlziWfK/qC85CFohsTR5wcmRM1A==" + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.4.tgz", + "integrity": "sha512-kgEKOms0taywPxPQvXUh90+G7M+phBHTiUw95Dosw0FU/we86iFerMfgBGcf3eQcAGs5pTNYnLMhiIlfRw/AfA==", + "license": "MIT" }, "node_modules/@types/http-errors": { "version": "2.0.1", @@ -5612,10 +5621,11 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz", - "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==", - "dev": true + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==", + "dev": true, + "license": "MIT" }, "node_modules/@types/mime": { "version": "2.0.3", @@ -5739,10 +5749,11 @@ "dev": true }, "node_modules/@types/webpack-env": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.5.tgz", - "integrity": "sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA==", - "dev": true + "version": "1.18.8", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.8.tgz", + "integrity": "sha512-G9eAoJRMLjcvN4I08wB5I7YofOb/kaJNd5uoCMX+LbKXTPCF+ZIHuqTnFaK9Jz1rgs035f9JUPUhNFtqgucy/A==", + "dev": true, + "license": "MIT" }, "node_modules/@types/ws": { "version": "7.4.7", @@ -7271,13 +7282,13 @@ } }, "node_modules/array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" }, "engines": { "node": ">= 0.4" @@ -7416,15 +7427,15 @@ } }, "node_modules/array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -7450,19 +7461,18 @@ } }, "node_modules/arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", "dev": true, "dependencies": { "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" }, "engines": { "node": ">= 0.4" @@ -7954,9 +7964,9 @@ } }, "node_modules/browserslist": { - "version": "4.24.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", - "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "funding": [ { "type": "opencollective", @@ -8075,15 +8085,41 @@ } }, "node_modules/call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", "dependencies": { + "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "set-function-length": "^1.2.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "dependencies": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" + } + }, + "node_modules/call-bound": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -8745,9 +8781,9 @@ } }, "node_modules/core-js": { - "version": "3.39.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz", - "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==", + "version": "3.40.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz", + "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==", "hasInstallScript": true, "funding": { "type": "opencollective", @@ -9075,14 +9111,14 @@ "dev": true }, "node_modules/data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -9092,29 +9128,29 @@ } }, "node_modules/data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" }, "engines": { "node": ">= 0.4" }, "funding": { - "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/inspect-js" } }, "node_modules/data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-data-view": "^1.0.1" }, @@ -9554,6 +9590,19 @@ "crossvent": "1.5.5" } }, + "node_modules/dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -9767,57 +9816,62 @@ } }, "node_modules/es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", "dev": true, "dependencies": { - "array-buffer-byte-length": "^1.0.1", - "arraybuffer.prototype.slice": "^1.0.3", + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "data-view-buffer": "^1.0.1", - "data-view-byte-length": "^1.0.1", - "data-view-byte-offset": "^1.0.0", - "es-define-property": "^1.0.0", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "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-set-tostringtag": "^2.0.3", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.4", - "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", - "gopd": "^1.0.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-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "internal-slot": "^1.0.7", - "is-array-buffer": "^3.0.4", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.13", - "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", "object-keys": "^1.1.1", - "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", - "safe-array-concat": "^1.1.2", - "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.9", - "string.prototype.trimend": "^1.0.8", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", - "typed-array-buffer": "^1.0.2", - "typed-array-byte-length": "^1.0.1", - "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.6", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.15" + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" }, "engines": { "node": ">= 0.4" @@ -9827,12 +9881,9 @@ } }, "node_modules/es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "dependencies": { - "get-intrinsic": "^1.2.4" - }, + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "engines": { "node": ">= 0.4" } @@ -9852,25 +9903,27 @@ "dev": true }, "node_modules/es-iterator-helpers": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.1.0.tgz", - "integrity": "sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "es-abstract": "^1.23.3", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", "es-set-tostringtag": "^2.0.3", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", + "get-intrinsic": "^1.2.6", "globalthis": "^1.0.4", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "iterator.prototype": "^1.1.3", - "safe-array-concat": "^1.1.2" + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" }, "engines": { "node": ">= 0.4" @@ -9885,7 +9938,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, "dependencies": { "es-errors": "^1.3.0" }, @@ -9894,14 +9946,15 @@ } }, "node_modules/es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", "dev": true, "dependencies": { - "get-intrinsic": "^1.2.4", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -9917,14 +9970,14 @@ } }, "node_modules/es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", "dev": true, "dependencies": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" }, "engines": { "node": ">= 0.4" @@ -10404,28 +10457,28 @@ } }, "node_modules/eslint-plugin-react": { - "version": "7.37.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz", - "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==", + "version": "7.37.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz", + "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==", "dev": true, "dependencies": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", - "array.prototype.flatmap": "^1.3.2", + "array.prototype.flatmap": "^1.3.3", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.1.0", + "es-iterator-helpers": "^1.2.1", "estraverse": "^5.3.0", "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.8", "object.fromentries": "^2.0.8", - "object.values": "^1.2.0", + "object.values": "^1.2.1", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.11", + "string.prototype.matchall": "^4.0.12", "string.prototype.repeat": "^1.0.0" }, "engines": { @@ -11607,15 +11660,17 @@ } }, "node_modules/function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" }, "engines": { "node": ">= 0.4" @@ -11650,15 +11705,20 @@ } }, "node_modules/get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", "dependencies": { + "call-bind-apply-helpers": "^1.0.1", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "get-proto": "^1.0.0", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -11727,6 +11787,18 @@ "node": ">=8.0.0" } }, + "node_modules/get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "dependencies": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", @@ -11739,14 +11811,14 @@ } }, "node_modules/get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -11877,11 +11949,11 @@ } }, "node_modules/gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "dependencies": { - "get-intrinsic": "^1.1.3" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -12199,10 +12271,13 @@ } }, "node_modules/has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", "dev": true, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -12227,9 +12302,13 @@ } }, "node_modules/has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "dependencies": { + "dunder-proto": "^1.0.0" + }, "engines": { "node": ">= 0.4" }, @@ -12238,9 +12317,9 @@ } }, "node_modules/has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "engines": { "node": ">= 0.4" }, @@ -12955,14 +13034,14 @@ } }, "node_modules/internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", "dev": true, "dependencies": { "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" + "hasown": "^2.0.2", + "side-channel": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -12999,13 +13078,14 @@ "integrity": "sha512-gxiZ+y/u67AzpeFmAmo4CbtME/bs7J2C++su5zQzvQyaxUqVzkh69DI+jN+KZuSO6JaH6TIIU6M6LhqxMjxEpw==" }, "node_modules/is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -13020,12 +13100,15 @@ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, "node_modules/is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.0.tgz", + "integrity": "sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -13035,12 +13118,15 @@ } }, "node_modules/is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", "dev": true, "dependencies": { - "has-bigints": "^1.0.1" + "has-bigints": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13058,13 +13144,13 @@ } }, "node_modules/is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz", + "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -13112,11 +13198,13 @@ } }, "node_modules/is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", "dev": true, "dependencies": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" }, "engines": { @@ -13127,12 +13215,13 @@ } }, "node_modules/is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -13198,12 +13287,15 @@ } }, "node_modules/is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bound": "^1.0.3" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -13218,12 +13310,15 @@ } }, "node_modules/is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -13268,18 +13363,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", - "dev": true, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-number": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", @@ -13290,12 +13373,13 @@ } }, "node_modules/is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -13367,13 +13451,15 @@ } }, "node_modules/is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -13407,12 +13493,12 @@ } }, "node_modules/is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", "dev": true, "dependencies": { - "call-bind": "^1.0.7" + "call-bound": "^1.0.3" }, "engines": { "node": ">= 0.4" @@ -13433,12 +13519,13 @@ } }, "node_modules/is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", "dev": true, "dependencies": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -13448,12 +13535,14 @@ } }, "node_modules/is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", "dev": true, "dependencies": { - "has-symbols": "^1.0.2" + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -13463,12 +13552,12 @@ } }, "node_modules/is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", "dev": true, "dependencies": { - "which-typed-array": "^1.1.14" + "which-typed-array": "^1.1.16" }, "engines": { "node": ">= 0.4" @@ -13501,25 +13590,28 @@ } }, "node_modules/is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz", + "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==", "dev": true, "dependencies": { - "call-bind": "^1.0.2" + "call-bound": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/is-weakset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", - "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4" + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" }, "engines": { "node": ">= 0.4" @@ -13717,16 +13809,17 @@ } }, "node_modules/iterator.prototype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz", - "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", "dev": true, "dependencies": { - "define-properties": "^1.2.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "reflect.getprototypeof": "^1.0.4", - "set-function-name": "^2.0.1" + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -14956,6 +15049,14 @@ "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz", "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==" }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "engines": { + "node": ">= 0.4" + } + }, "node_modules/mdx-embed": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/mdx-embed/-/mdx-embed-1.1.2.tgz", @@ -15377,9 +15478,10 @@ } }, "node_modules/moment-timezone": { - "version": "0.5.46", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz", - "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==", + "version": "0.5.47", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz", + "integrity": "sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==", + "license": "MIT", "dependencies": { "moment": "^2.29.4" }, @@ -16202,9 +16304,12 @@ } }, "node_modules/object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==", + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==", + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -16231,14 +16336,16 @@ } }, "node_modules/object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", "dev": true, "dependencies": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", "object-keys": "^1.1.1" }, "engines": { @@ -16307,12 +16414,13 @@ } }, "node_modules/object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" }, @@ -16512,6 +16620,23 @@ "node": ">=0.10.0" } }, + "node_modules/own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "dependencies": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -17568,18 +17693,19 @@ "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==" }, "node_modules/reflect.getprototypeof": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", - "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.23.1", + "es-abstract": "^1.23.9", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -17661,15 +17787,17 @@ "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==" }, "node_modules/regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" }, "engines": { "node": ">= 0.4" @@ -18023,14 +18151,15 @@ } }, "node_modules/safe-array-concat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", - "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", "isarray": "^2.0.5" }, "engines": { @@ -18045,6 +18174,22 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "node_modules/safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "dependencies": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", @@ -18055,14 +18200,14 @@ } }, "node_modules/safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", "dev": true, "dependencies": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", - "is-regex": "^1.1.4" + "is-regex": "^1.2.1" }, "engines": { "node": ">= 0.4" @@ -18477,16 +18622,16 @@ } }, "node_modules/set-function-length": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", - "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dependencies": { - "define-data-property": "^1.1.2", + "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.3", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -18519,6 +18664,20 @@ "node": ">=0.10.0" } }, + "node_modules/set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "dependencies": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" + } + }, "node_modules/set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -18578,14 +18737,65 @@ } }, "node_modules/side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "dependencies": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "dependencies": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, + "node_modules/side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "dependencies": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" }, "engines": { "node": ">= 0.4" @@ -19384,23 +19594,24 @@ } }, "node_modules/string.prototype.matchall": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", - "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "regexp.prototype.flags": "^1.5.2", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", "set-function-name": "^2.0.2", - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" }, "engines": { "node": ">= 0.4" @@ -19420,15 +19631,18 @@ } }, "node_modules/string.prototype.trim": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", - "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-object-atoms": "^1.0.0" + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" }, "engines": { "node": ">= 0.4" @@ -19438,15 +19652,19 @@ } }, "node_modules/string.prototype.trimend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", - "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" }, + "engines": { + "node": ">= 0.4" + }, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -20478,30 +20696,30 @@ } }, "node_modules/typed-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", - "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" } }, "node_modules/typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", "dev": true, "dependencies": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" }, "engines": { "node": ">= 0.4" @@ -20511,17 +20729,18 @@ } }, "node_modules/typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" }, "engines": { "node": ">= 0.4" @@ -20531,17 +20750,17 @@ } }, "node_modules/typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "dev": true, "dependencies": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-proto": "^1.0.3", "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" }, "engines": { "node": ">= 0.4" @@ -20647,15 +20866,18 @@ } }, "node_modules/unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", "dev": true, "dependencies": { - "call-bind": "^1.0.2", + "call-bound": "^1.0.3", "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" @@ -21885,39 +22107,43 @@ } }, "node_modules/which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", "dev": true, "dependencies": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" }, "funding": { "url": "https://github.com/sponsors/ljharb" } }, "node_modules/which-builtin-type": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", - "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", "dev": true, "dependencies": { + "call-bound": "^1.0.2", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", - "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", - "is-regex": "^1.1.4", + "is-regex": "^1.2.1", "is-weakref": "^1.0.2", "isarray": "^2.0.5", - "which-boxed-primitive": "^1.0.2", + "which-boxed-primitive": "^1.1.0", "which-collection": "^1.0.2", - "which-typed-array": "^1.1.15" + "which-typed-array": "^1.1.16" }, "engines": { "node": ">= 0.4" @@ -21945,15 +22171,16 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", + "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", "dev": true, "dependencies": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "for-each": "^0.3.3", - "gopd": "^1.0.1", + "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" }, "engines": { @@ -23929,6 +24156,11 @@ "to-fast-properties": "^2.0.0" } }, + "@braintree/sanitize-url": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@braintree/sanitize-url/-/sanitize-url-7.1.1.tgz", + "integrity": "sha512-i1L7noDNxtFyL5DmZafWy1wRVhGehQmzZaz1HiN5e7iylJMSZR7ekOV7NsIqa5qBldlLrsKv4HbgFUVlQrz8Mw==" + }, "@cnakazawa/watch": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", @@ -24203,18 +24435,18 @@ } }, "@floating-ui/dom": { - "version": "1.6.12", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.12.tgz", - "integrity": "sha512-NP83c0HjokcGVEMeoStg317VD9W7eDlGK7457dMBANbKA6GJZdc7rjujdgqzTaz93jkGgc5P/jeWbaCHnMNc+w==", + "version": "1.6.13", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz", + "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==", "requires": { "@floating-ui/core": "^1.6.0", - "@floating-ui/utils": "^0.2.8" + "@floating-ui/utils": "^0.2.9" } }, "@floating-ui/utils": { - "version": "0.2.8", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz", - "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig==" + "version": "0.2.9", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz", + "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==" }, "@fullcalendar/angular": { "version": "6.1.16", @@ -25279,9 +25511,9 @@ "optional": true }, "@oddbird/popover-polyfill": { - "version": "0.4.0", - "resolved": "https://registry.npmjs.org/@oddbird/popover-polyfill/-/popover-polyfill-0.4.0.tgz", - "integrity": "sha512-jrqoTI8lk5UziDsDPJ2Y+nmXYCcRhmr6uMARr3v/W6AMxRgsnRLWJyWKYr6FjaGMgbyxXG+OkCUPQY4Xl3toGg==" + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/@oddbird/popover-polyfill/-/popover-polyfill-0.5.2.tgz", + "integrity": "sha512-iFrvar5SOMtKFOSjYvs4z9UlLqDdJbMx0mgISLcPedv+g0ac5sgeETLGtipHCVIae6HJPclNEH5aCyD1RZaEHw==" }, "@openproject/octicons-angular": { "version": "19.20.0", @@ -25292,9 +25524,9 @@ } }, "@openproject/primer-view-components": { - "version": "0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "0.54.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.54.0.tgz", + "integrity": "sha512-7lgTeSRwKmmeHi9Kvk8wFn+9IlkuFFDBYqDgyB/CdjJN6olVLg1Ho0bp+YP2ASNBdZ3KVRaAP8gaZX8yifCBMg==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -25306,7 +25538,7 @@ "@github/relative-time-element": "^4.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", - "@oddbird/popover-polyfill": "^0.4.0", + "@oddbird/popover-polyfill": "^0.5.2", "@primer/behaviors": "^1.3.4", "@primer/live-region-element": "^0.7.1" } @@ -25367,9 +25599,9 @@ } }, "@primer/view-components": { - "version": "npm:@openproject/primer-view-components@0.52.0", - "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.52.0.tgz", - "integrity": "sha512-rs08YC4NtJsyQOCb+/xq3rqSrNWOOiDicOiEAKwOMf5NNjdy/aVK5vE/F19qdGETy3SXobElk68Mm+SEPXesWg==", + "version": "npm:@openproject/primer-view-components@0.54.0", + "resolved": "https://registry.npmjs.org/@openproject/primer-view-components/-/primer-view-components-0.54.0.tgz", + "integrity": "sha512-7lgTeSRwKmmeHi9Kvk8wFn+9IlkuFFDBYqDgyB/CdjJN6olVLg1Ho0bp+YP2ASNBdZ3KVRaAP8gaZX8yifCBMg==", "requires": { "@github/auto-check-element": "^5.2.0", "@github/auto-complete-element": "^3.6.2", @@ -25381,7 +25613,7 @@ "@github/relative-time-element": "^4.0.0", "@github/remote-input-element": "^0.4.0", "@github/tab-container-element": "^3.1.2", - "@oddbird/popover-polyfill": "^0.4.0", + "@oddbird/popover-polyfill": "^0.5.2", "@primer/behaviors": "^1.3.4", "@primer/live-region-element": "^0.7.1" } @@ -25839,9 +26071,9 @@ "dev": true }, "@types/hotwired__turbo": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.3.tgz", - "integrity": "sha512-dBO3AlOdN9IXTD3bmAzi5ZhNwJJd8Eiy1tObsUbFUH6sCohvybwyv3GOtP3KlziWfK/qC85CFohsTR5wcmRM1A==" + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/@types/hotwired__turbo/-/hotwired__turbo-8.0.4.tgz", + "integrity": "sha512-kgEKOms0taywPxPQvXUh90+G7M+phBHTiUw95Dosw0FU/we86iFerMfgBGcf3eQcAGs5pTNYnLMhiIlfRw/AfA==" }, "@types/http-errors": { "version": "2.0.1", @@ -25892,9 +26124,9 @@ "dev": true }, "@types/lodash": { - "version": "4.17.13", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.13.tgz", - "integrity": "sha512-lfx+dftrEZcdBPczf9d0Qv0x+j/rfNCMuC6OcfXmO8gkfeNAY88PgKUbvG56whcN23gc27yenwF6oJZXGFpYxg==", + "version": "4.17.15", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.15.tgz", + "integrity": "sha512-w/P33JFeySuhN6JLkysYUK2gEmy9kHHFN7E8ro0tkfmlDOgxBDzWEZ/J8cWA+fHqFevpswDTFZnDx+R9lbL6xw==", "dev": true }, "@types/mime": { @@ -26021,9 +26253,9 @@ "dev": true }, "@types/webpack-env": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.5.tgz", - "integrity": "sha512-wz7kjjRRj8/Lty4B+Kr0LN6Ypc/3SymeCCGSbaXp2leH0ZVg/PriNiOwNj4bD4uphI7A8NXS4b6Gl373sfO5mA==", + "version": "1.18.8", + "resolved": "https://registry.npmjs.org/@types/webpack-env/-/webpack-env-1.18.8.tgz", + "integrity": "sha512-G9eAoJRMLjcvN4I08wB5I7YofOb/kaJNd5uoCMX+LbKXTPCF+ZIHuqTnFaK9Jz1rgs035f9JUPUhNFtqgucy/A==", "dev": true }, "@types/ws": { @@ -27104,13 +27336,13 @@ "integrity": "sha512-TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==" }, "array-buffer-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.1.tgz", - "integrity": "sha512-ahC5W1xgou+KTXix4sAO8Ki12Q+jf4i0+tmk3sC+zgcynshkHxzpXdImBehiUYKKKDwvfFiJl1tZt6ewscS1Mg==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", + "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", "dev": true, "requires": { - "call-bind": "^1.0.5", - "is-array-buffer": "^3.0.4" + "call-bound": "^1.0.3", + "is-array-buffer": "^3.0.5" } }, "array-flatten": { @@ -27209,15 +27441,15 @@ } }, "array.prototype.flatmap": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.2.tgz", - "integrity": "sha512-Ewyx0c9PmpcsByhSW4r+9zDU7sGjFc86qf/kKtuSCRdhfbk0SNLLkaT5qvcHnRGgc5NP/ly/y+qkXkqONX54CQ==", + "version": "1.3.3", + "resolved": "https://registry.npmjs.org/array.prototype.flatmap/-/array.prototype.flatmap-1.3.3.tgz", + "integrity": "sha512-Y7Wt51eKJSyi80hFrJCePGGNo5ktJCslFuboqJsbf57CCPcm5zztluPlc4/aD8sWsKvlwatezpV4U1efk8kpjg==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "es-shim-unscopables": "^1.0.0" + "call-bind": "^1.0.8", + "define-properties": "^1.2.1", + "es-abstract": "^1.23.5", + "es-shim-unscopables": "^1.0.2" } }, "array.prototype.tosorted": { @@ -27234,19 +27466,18 @@ } }, "arraybuffer.prototype.slice": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.3.tgz", - "integrity": "sha512-bMxMKAjg13EBSVscxTaYA4mRc5t1UAXa2kXiGTNfZ079HIWXEkKmkgFrh/nJqamaLSrXO5H4WFFkPEaLJWbs3A==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", + "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", "dev": true, "requires": { "array-buffer-byte-length": "^1.0.1", - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.22.3", - "es-errors": "^1.2.1", - "get-intrinsic": "^1.2.3", - "is-array-buffer": "^3.0.4", - "is-shared-array-buffer": "^1.0.2" + "es-abstract": "^1.23.5", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", + "is-array-buffer": "^3.0.4" } }, "assign-symbols": { @@ -27615,9 +27846,9 @@ } }, "browserslist": { - "version": "4.24.3", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.3.tgz", - "integrity": "sha512-1CPmv8iobE2fyRMV97dAcMVegvvWKxmq94hkLiAkUGwKVTyDLw33K+ZxiFrREKmmps4rIw6grcCFCnTMSZ/YiA==", + "version": "4.24.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz", + "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==", "requires": { "caniuse-lite": "^1.0.30001688", "electron-to-chromium": "^1.5.73", @@ -27690,15 +27921,32 @@ } }, "call-bind": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.7.tgz", - "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2w==", + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", + "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", "requires": { + "call-bind-apply-helpers": "^1.0.0", "es-define-property": "^1.0.0", - "es-errors": "^1.3.0", - "function-bind": "^1.1.2", "get-intrinsic": "^1.2.4", - "set-function-length": "^1.2.1" + "set-function-length": "^1.2.2" + } + }, + "call-bind-apply-helpers": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.1.tgz", + "integrity": "sha512-BhYE+WDaywFg2TBWYNXAE+8B1ATnThNBqXHP5nQu0jWJdVvY2hvkpyB3qOmtmDePiS5/BDQ8wASEWGMWRG148g==", + "requires": { + "es-errors": "^1.3.0", + "function-bind": "^1.1.2" + } + }, + "call-bound": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz", + "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==", + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "get-intrinsic": "^1.2.6" } }, "callsites": { @@ -28180,9 +28428,9 @@ } }, "core-js": { - "version": "3.39.0", - "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.39.0.tgz", - "integrity": "sha512-raM0ew0/jJUqkJ0E6e8UDtl+y/7ktFivgWvqw8dNSQeNWoSDLvQ1H/RN3aPXB9tBd4/FhyR4RDPGhsNIMsAn7g==" + "version": "3.40.0", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz", + "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==" }, "core-js-compat": { "version": "3.36.1", @@ -28419,34 +28667,34 @@ "dev": true }, "data-view-buffer": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.1.tgz", - "integrity": "sha512-0lht7OugA5x3iJLOWFhWK/5ehONdprk0ISXqVFn/NFrDu+cuc8iADFrGQz5BnRK7LLU3JmkbXSxaqX+/mXYtUA==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", + "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", "dev": true, "requires": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" } }, "data-view-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.1.tgz", - "integrity": "sha512-4J7wRJD3ABAzr8wP+OcIcqq2dlUKp4DVflx++hs5h5ZKydWMI6/D/fAot+yh6g2tHh8fLFTvNOaVN357NvSrOQ==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", + "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-data-view": "^1.0.1" + "is-data-view": "^1.0.2" } }, "data-view-byte-offset": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.0.tgz", - "integrity": "sha512-t/Ygsytq+R995EJ5PZlD4Cu56sWa8InXySaViRzw9apusqsOO2bQP+SbYzAhR0pFKoB+43lYy8rWban9JSuXnA==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", + "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", "dev": true, "requires": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", "is-data-view": "^1.0.1" } @@ -28775,6 +29023,16 @@ "crossvent": "1.5.5" } }, + "dunder-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", + "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", + "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-errors": "^1.3.0", + "gopd": "^1.2.0" + } + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -28944,66 +29202,68 @@ "dev": true }, "es-abstract": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.3.tgz", - "integrity": "sha512-e+HfNH61Bj1X9/jLc5v1owaLYuHdeHHSQlkhCBiTK8rBvKaULl/beGMxwrMXjpYrv4pz22BlY570vVePA2ho4A==", + "version": "1.23.9", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz", + "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==", "dev": true, "requires": { - "array-buffer-byte-length": "^1.0.1", - "arraybuffer.prototype.slice": "^1.0.3", + "array-buffer-byte-length": "^1.0.2", + "arraybuffer.prototype.slice": "^1.0.4", "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", - "data-view-buffer": "^1.0.1", - "data-view-byte-length": "^1.0.1", - "data-view-byte-offset": "^1.0.0", - "es-define-property": "^1.0.0", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "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-set-tostringtag": "^2.0.3", - "es-to-primitive": "^1.2.1", - "function.prototype.name": "^1.1.6", - "get-intrinsic": "^1.2.4", - "get-symbol-description": "^1.0.2", - "globalthis": "^1.0.3", - "gopd": "^1.0.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-symbol-description": "^1.1.0", + "globalthis": "^1.0.4", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", "hasown": "^2.0.2", - "internal-slot": "^1.0.7", - "is-array-buffer": "^3.0.4", + "internal-slot": "^1.1.0", + "is-array-buffer": "^3.0.5", "is-callable": "^1.2.7", - "is-data-view": "^1.0.1", - "is-negative-zero": "^2.0.3", - "is-regex": "^1.1.4", - "is-shared-array-buffer": "^1.0.3", - "is-string": "^1.0.7", - "is-typed-array": "^1.1.13", - "is-weakref": "^1.0.2", - "object-inspect": "^1.13.1", + "is-data-view": "^1.0.2", + "is-regex": "^1.2.1", + "is-shared-array-buffer": "^1.0.4", + "is-string": "^1.1.1", + "is-typed-array": "^1.1.15", + "is-weakref": "^1.1.0", + "math-intrinsics": "^1.1.0", + "object-inspect": "^1.13.3", "object-keys": "^1.1.1", - "object.assign": "^4.1.5", - "regexp.prototype.flags": "^1.5.2", - "safe-array-concat": "^1.1.2", - "safe-regex-test": "^1.0.3", - "string.prototype.trim": "^1.2.9", - "string.prototype.trimend": "^1.0.8", + "object.assign": "^4.1.7", + "own-keys": "^1.0.1", + "regexp.prototype.flags": "^1.5.3", + "safe-array-concat": "^1.1.3", + "safe-push-apply": "^1.0.0", + "safe-regex-test": "^1.1.0", + "set-proto": "^1.0.0", + "string.prototype.trim": "^1.2.10", + "string.prototype.trimend": "^1.0.9", "string.prototype.trimstart": "^1.0.8", - "typed-array-buffer": "^1.0.2", - "typed-array-byte-length": "^1.0.1", - "typed-array-byte-offset": "^1.0.2", - "typed-array-length": "^1.0.6", - "unbox-primitive": "^1.0.2", - "which-typed-array": "^1.1.15" + "typed-array-buffer": "^1.0.3", + "typed-array-byte-length": "^1.0.3", + "typed-array-byte-offset": "^1.0.4", + "typed-array-length": "^1.0.7", + "unbox-primitive": "^1.1.0", + "which-typed-array": "^1.1.18" } }, "es-define-property": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.0.tgz", - "integrity": "sha512-jxayLKShrEqqzJ0eumQbVhTYQM27CfT1T35+gCgDFoL82JLsXqTJ76zv6A0YLOgEnLUMvLzsDsGIrl8NFpT2gQ==", - "requires": { - "get-intrinsic": "^1.2.4" - } + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", + "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==" }, "es-errors": { "version": "1.3.0", @@ -29017,25 +29277,27 @@ "dev": true }, "es-iterator-helpers": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.1.0.tgz", - "integrity": "sha512-/SurEfycdyssORP/E+bj4sEu1CWw4EmLDsHynHwSXQ7utgbrMRWW195pTrCjFgFCddf/UkYm3oqKPRq5i8bJbw==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz", + "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "es-abstract": "^1.23.3", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", "es-set-tostringtag": "^2.0.3", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.4", + "get-intrinsic": "^1.2.6", "globalthis": "^1.0.4", + "gopd": "^1.2.0", "has-property-descriptors": "^1.0.2", - "has-proto": "^1.0.3", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "iterator.prototype": "^1.1.3", - "safe-array-concat": "^1.1.2" + "has-proto": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "iterator.prototype": "^1.1.4", + "safe-array-concat": "^1.1.3" } }, "es-module-lexer": { @@ -29047,20 +29309,20 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.0.0.tgz", "integrity": "sha512-MZ4iQ6JwHOBQjahnjwaC1ZtIBH+2ohjamzAO3oaHcXYup7qxjF2fixyH+Q71voWHeOkI2q/TnJao/KfXYIZWbw==", - "dev": true, "requires": { "es-errors": "^1.3.0" } }, "es-set-tostringtag": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.0.3.tgz", - "integrity": "sha512-3T8uNMC3OQTHkFUsFq8r/BwAXLHvU/9O9mE0fBc/MY5iq/8H7ncvO947LmYA6ldWw9Uh8Yhf25zu6n7nML5QWQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", + "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", "dev": true, "requires": { - "get-intrinsic": "^1.2.4", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.6", "has-tostringtag": "^1.0.2", - "hasown": "^2.0.1" + "hasown": "^2.0.2" } }, "es-shim-unscopables": { @@ -29073,14 +29335,14 @@ } }, "es-to-primitive": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", - "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", + "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", "dev": true, "requires": { - "is-callable": "^1.1.4", - "is-date-object": "^1.0.1", - "is-symbol": "^1.0.2" + "is-callable": "^1.2.7", + "is-date-object": "^1.0.5", + "is-symbol": "^1.0.4" } }, "es5-ext": { @@ -29587,28 +29849,28 @@ } }, "eslint-plugin-react": { - "version": "7.37.2", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.2.tgz", - "integrity": "sha512-EsTAnj9fLVr/GZleBLFbj/sSuXeWmp1eXIN60ceYnZveqEaUCyW4X+Vh4WTdUhCkW4xutXYqTXCUSyqD4rB75w==", + "version": "7.37.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz", + "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==", "dev": true, "requires": { "array-includes": "^3.1.8", "array.prototype.findlast": "^1.2.5", - "array.prototype.flatmap": "^1.3.2", + "array.prototype.flatmap": "^1.3.3", "array.prototype.tosorted": "^1.1.4", "doctrine": "^2.1.0", - "es-iterator-helpers": "^1.1.0", + "es-iterator-helpers": "^1.2.1", "estraverse": "^5.3.0", "hasown": "^2.0.2", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.1.2", "object.entries": "^1.1.8", "object.fromentries": "^2.0.8", - "object.values": "^1.2.0", + "object.values": "^1.2.1", "prop-types": "^15.8.1", "resolve": "^2.0.0-next.5", "semver": "^6.3.1", - "string.prototype.matchall": "^4.0.11", + "string.prototype.matchall": "^4.0.12", "string.prototype.repeat": "^1.0.0" }, "dependencies": { @@ -30392,15 +30654,17 @@ "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==" }, "function.prototype.name": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.6.tgz", - "integrity": "sha512-Z5kx79swU5P27WEayXM1tBi5Ze/lbIyiNgU3qyXUOf9b2rgXYyF9Dy9Cx+IQv/Lc8WCG6L82zwUPpSS9hGehIg==", + "version": "1.1.8", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", + "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "define-properties": "^1.2.0", - "es-abstract": "^1.22.1", - "functions-have-names": "^1.2.3" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "define-properties": "^1.2.1", + "functions-have-names": "^1.2.3", + "hasown": "^2.0.2", + "is-callable": "^1.2.7" } }, "functions-have-names": { @@ -30420,15 +30684,20 @@ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, "get-intrinsic": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.4.tgz", - "integrity": "sha512-5uYhsJH8VJBTv7oslg4BznJYhDoRI6waYCxMmCdnTrcCrHA/fCFKoTFz2JKKE0HdDFUF7/oQuhzumXJK7paBRQ==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.7.tgz", + "integrity": "sha512-VW6Pxhsrk0KAOqs3WEd0klDiF/+V7gQOpAvY1jVU/LHmaD/kQO4523aiJuikX/QAKYiW6x8Jh+RJej1almdtCA==", "requires": { + "call-bind-apply-helpers": "^1.0.1", + "es-define-property": "^1.0.1", "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0", "function-bind": "^1.1.2", - "has-proto": "^1.0.1", - "has-symbols": "^1.0.3", - "hasown": "^2.0.0" + "get-proto": "^1.0.0", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "hasown": "^2.0.2", + "math-intrinsics": "^1.1.0" } }, "get-object": { @@ -30478,20 +30747,29 @@ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==" }, + "get-proto": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", + "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", + "requires": { + "dunder-proto": "^1.0.1", + "es-object-atoms": "^1.0.0" + } + }, "get-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==" }, "get-symbol-description": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.2.tgz", - "integrity": "sha512-g0QYk1dZBxGwk+Ngc+ltRH2IBp2f7zBkBMBJZCDerh6EhlhSR6+9irMCuT/09zD6qkarHUSn529sK/yL4S27mg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", + "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", "dev": true, "requires": { - "call-bind": "^1.0.5", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4" + "get-intrinsic": "^1.2.6" } }, "get-value": { @@ -30582,12 +30860,9 @@ } }, "gopd": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.0.1.tgz", - "integrity": "sha512-d65bNlIadxvpb/A2abVdlqKqV563juRnZ1Wtk6s1sIR8uNsXR70xqIzVqxVf1eTqDunwT2MkczEeaezCKTZhwA==", - "requires": { - "get-intrinsic": "^1.1.3" - } + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", + "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==" }, "graceful-fs": { "version": "4.2.11", @@ -30848,9 +31123,9 @@ } }, "has-bigints": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.0.2.tgz", - "integrity": "sha512-tSvCKtBr9lkF0Ex0aQiP9N+OpV4zi2r/Nee5VkRDbaqv35RLYMzbwQfFSZZH0kR+Rd6302UJZ2p/bJCEoR3VoQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", + "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", "dev": true }, "has-flag": { @@ -30867,14 +31142,18 @@ } }, "has-proto": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.0.3.tgz", - "integrity": "sha512-SJ1amZAJUiZS+PhsVLf5tGydlaVB8EdFpaSO4gmiUKUOxk8qzn5AIy4ZeJUmh22znIdk/uMAUT2pl3FxzVUH+Q==" + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", + "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", + "dev": true, + "requires": { + "dunder-proto": "^1.0.0" + } }, "has-symbols": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", + "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==" }, "has-tostringtag": { "version": "1.0.2", @@ -31389,14 +31668,14 @@ } }, "internal-slot": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz", - "integrity": "sha512-NGnrKwXzSms2qUUih/ILZ5JBqNTSa1+ZmP6flaIp6KmSElgE9qdndzS3cqjrDovwFdmwsGsLdeFgB6suw+1e9g==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", + "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", "dev": true, "requires": { "es-errors": "^1.3.0", - "hasown": "^2.0.0", - "side-channel": "^1.0.4" + "hasown": "^2.0.2", + "side-channel": "^1.1.0" } }, "ip": { @@ -31424,13 +31703,14 @@ "integrity": "sha512-gxiZ+y/u67AzpeFmAmo4CbtME/bs7J2C++su5zQzvQyaxUqVzkh69DI+jN+KZuSO6JaH6TIIU6M6LhqxMjxEpw==" }, "is-array-buffer": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.4.tgz", - "integrity": "sha512-wcjaerHw0ydZwfhiKbXJWLDY8A7yV7KhjQOpb83hGgGfId/aQa4TOvwyzn2PuswW2gPCYEL/nEAiSVpdOj1lXw==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", + "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "get-intrinsic": "^1.2.1" + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" } }, "is-arrayish": { @@ -31439,21 +31719,24 @@ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" }, "is-async-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.0.0.tgz", - "integrity": "sha512-Y1JXKrfykRJGdlDwdKlLpLyMIiWqWvuSd17TvZk68PLAOGOoF4Xyav1z0Xhoi+gCYjZVeC5SI+hYFOfvXmGRCA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.0.tgz", + "integrity": "sha512-GExz9MtyhlZyXYLxzlJRj5WUCE661zhDa1Yna52CN57AJsymh+DvXXjyveSioqSRdxvUrdKdvqB1b5cVKsNpWQ==", "dev": true, "requires": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.1", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" } }, "is-bigint": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.4.tgz", - "integrity": "sha512-zB9CruMamjym81i2JZ3UMn54PKGsQzsJeo6xvN3HJJ4CAsQNB6iRutp2To77OfCNuoxspsIhzaPoO1zyCEhFOg==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", + "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", "dev": true, "requires": { - "has-bigints": "^1.0.1" + "has-bigints": "^1.0.2" } }, "is-binary-path": { @@ -31465,13 +31748,13 @@ } }, "is-boolean-object": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.1.2.tgz", - "integrity": "sha512-gDYaKHJmnj4aWxyj6YHyXVpdQawtVLHU5cb+eztPGczf6cjuTdwve5ZIEfgXqH4e57An1D1AKf8CZ3kYrQRqYA==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.1.tgz", + "integrity": "sha512-l9qO6eFlUETHtuihLcYOaLKByJ1f+N4kthcU9YjHy3N+B3hWv0y/2Nd0mu/7lTFnRQHTrSdXF50HQ3bl5fEnng==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" } }, "is-callable": { @@ -31498,21 +31781,24 @@ } }, "is-data-view": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.1.tgz", - "integrity": "sha512-AHkaJrsUVW6wq6JS8y3JnM/GJF/9cf+k20+iDzlSaJrinEo5+7vRiteOSwBhHRiAyQATN1AmY4hwzxJKPmYf+w==", + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", + "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", "dev": true, "requires": { + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", "is-typed-array": "^1.1.13" } }, "is-date-object": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", - "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", + "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", "dev": true, "requires": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "has-tostringtag": "^1.0.2" } }, "is-descriptor": { @@ -31551,12 +31837,12 @@ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" }, "is-finalizationregistry": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.0.2.tgz", - "integrity": "sha512-0by5vtUJs8iFQb5TYUHHPudOR+qXYIMKtiUzvLIZITZUjknFmziyBJuLhVRc+Ds0dREFlskDNJKYIdIzu/9pfw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", + "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", "dev": true, "requires": { - "call-bind": "^1.0.2" + "call-bound": "^1.0.3" } }, "is-fullwidth-code-point": { @@ -31565,12 +31851,15 @@ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" }, "is-generator-function": { - "version": "1.0.10", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.0.10.tgz", - "integrity": "sha512-jsEjy9l3yiXEQ+PsXdmBwEPcOxaXWLspKdplFUVI9vq1iZgIekeC0L167qeu86czQaxed3q/Uzuw0swL0irL8A==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz", + "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==", "dev": true, "requires": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "get-proto": "^1.0.0", + "has-tostringtag": "^1.0.2", + "safe-regex-test": "^1.1.0" } }, "is-glob": { @@ -31597,12 +31886,6 @@ "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", "dev": true }, - "is-negative-zero": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", - "dev": true - }, "is-number": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz", @@ -31610,12 +31893,13 @@ "dev": true }, "is-number-object": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.0.7.tgz", - "integrity": "sha512-k1U0IRzLMo7ZlYIfzRu23Oh6MiIFasgpb9X76eqfFZAqwH44UI4KTBvBYIZ1dSL9ZzChTB9ShHfLkR4pdW5krQ==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", + "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", "dev": true, "requires": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" } }, "is-odd": { @@ -31668,13 +31952,15 @@ } }, "is-regex": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", - "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", + "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", "dev": true, "requires": { - "call-bind": "^1.0.2", - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.2", + "gopd": "^1.2.0", + "has-tostringtag": "^1.0.2", + "hasown": "^2.0.2" } }, "is-self-closing": { @@ -31693,12 +31979,12 @@ "dev": true }, "is-shared-array-buffer": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.3.tgz", - "integrity": "sha512-nA2hv5XIhLR3uVzDDfCIknerhx8XUKnstuOERPNNIinXG7v9u+ohXF67vxm4TPTEPU6lm61ZkwP3c9PCB97rhg==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", + "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", "dev": true, "requires": { - "call-bind": "^1.0.7" + "call-bound": "^1.0.3" } }, "is-stream": { @@ -31707,30 +31993,33 @@ "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==" }, "is-string": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.7.tgz", - "integrity": "sha512-tE2UXzivje6ofPW7l23cjDOMa09gb7xlAqG6jG5ej6uPV32TlWP3NKPigtaGeHNu9fohccRYvIiZMfOOnOYUtg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", + "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", "dev": true, "requires": { - "has-tostringtag": "^1.0.0" + "call-bound": "^1.0.3", + "has-tostringtag": "^1.0.2" } }, "is-symbol": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.4.tgz", - "integrity": "sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", + "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", "dev": true, "requires": { - "has-symbols": "^1.0.2" + "call-bound": "^1.0.2", + "has-symbols": "^1.1.0", + "safe-regex-test": "^1.1.0" } }, "is-typed-array": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.13.tgz", - "integrity": "sha512-uZ25/bUAlUY5fR4OKT4rZQEBrzQWYV9ZJYGGsUmEJ6thodVJ1HX64ePQ6Z0qPWP+m+Uq6e9UugrE38jeYsDSMw==", + "version": "1.1.15", + "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", + "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", "dev": true, "requires": { - "which-typed-array": "^1.1.14" + "which-typed-array": "^1.1.16" } }, "is-unicode-supported": { @@ -31745,22 +32034,22 @@ "dev": true }, "is-weakref": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.0.2.tgz", - "integrity": "sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.0.tgz", + "integrity": "sha512-SXM8Nwyys6nT5WP6pltOwKytLV7FqQ4UiibxVmW+EIosHcmCqkkjViTb5SNssDlkCiEYRP1/pdWUKVvZBmsR2Q==", "dev": true, "requires": { - "call-bind": "^1.0.2" + "call-bound": "^1.0.2" } }, "is-weakset": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.3.tgz", - "integrity": "sha512-LvIm3/KWzS9oRFHugab7d+M/GcBXuXX5xZkzPmN+NxihdQlZUQ4dWuSV1xR/sq6upL1TJEDrfBgRepHFdBtSNQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", + "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4" + "call-bound": "^1.0.3", + "get-intrinsic": "^1.2.6" } }, "is-what": { @@ -31907,16 +32196,17 @@ } }, "iterator.prototype": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.3.tgz", - "integrity": "sha512-FW5iMbeQ6rBGm/oKgzq2aW4KvAGpxPzYES8N4g4xNXUKpL1mclMvOe+76AcLDTvD+Ze+sOpVhgdAQEKF4L9iGQ==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz", + "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==", "dev": true, "requires": { - "define-properties": "^1.2.1", - "get-intrinsic": "^1.2.1", - "has-symbols": "^1.0.3", - "reflect.getprototypeof": "^1.0.4", - "set-function-name": "^2.0.1" + "define-data-property": "^1.1.4", + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.6", + "get-proto": "^1.0.0", + "has-symbols": "^1.1.0", + "set-function-name": "^2.0.2" } }, "jackspeak": { @@ -32849,6 +33139,11 @@ "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz", "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==" }, + "math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", + "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==" + }, "mdx-embed": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/mdx-embed/-/mdx-embed-1.1.2.tgz", @@ -33173,9 +33468,9 @@ "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==" }, "moment-timezone": { - "version": "0.5.46", - "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.46.tgz", - "integrity": "sha512-ZXm9b36esbe7OmdABqIWJuBBiLLwAjrN7CE+7sYdCCx82Nabt1wHDj8TVseS59QIlfFPbOoiBPm6ca9BioG4hw==", + "version": "0.5.47", + "resolved": "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz", + "integrity": "sha512-UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==", "requires": { "moment": "^2.29.4" } @@ -33785,9 +34080,9 @@ } }, "object-inspect": { - "version": "1.13.1", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.1.tgz", - "integrity": "sha512-5qoj1RUiKOMsCCNLV1CBiPYE10sziTsnmNxkAI/rZhiD63CF7IqdFGC/XzjWjpSgLf0LxXX3bDFIh0E18f6UhQ==" + "version": "1.13.3", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.3.tgz", + "integrity": "sha512-kDCGIbxkDSXE3euJZZXzc6to7fCrKHNI/hSRQnRuQ+BWjFNzZwiFF8fj/6o2t2G9/jTj8PSIYTfCLelLZEeRpA==" }, "object-keys": { "version": "1.1.1", @@ -33805,14 +34100,16 @@ } }, "object.assign": { - "version": "4.1.5", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.5.tgz", - "integrity": "sha512-byy+U7gp+FVwmyzKPYhW2h5l3crpmGsxl7X2s8y43IgxvG4g3QZ6CffDtsNQy1WsmZpQbO+ybo0AlW7TY6DcBQ==", + "version": "4.1.7", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", + "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", "dev": true, "requires": { - "call-bind": "^1.0.5", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "has-symbols": "^1.0.3", + "es-object-atoms": "^1.0.0", + "has-symbols": "^1.1.0", "object-keys": "^1.1.1" } }, @@ -33860,12 +34157,13 @@ } }, "object.values": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.0.tgz", - "integrity": "sha512-yBYjY9QX2hnRmZHAjG/f13MzmBzxzYgQhFrke06TTyKY5zSTEqkOeukBzIdVA3j3ulu8Qa3MbVFShV7T2RmGtQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz", + "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" } @@ -34010,6 +34308,17 @@ "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==" }, + "own-keys": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", + "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", + "dev": true, + "requires": { + "get-intrinsic": "^1.2.6", + "object-keys": "^1.1.1", + "safe-push-apply": "^1.0.0" + } + }, "p-limit": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", @@ -34746,18 +35055,19 @@ "integrity": "sha512-ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==" }, "reflect.getprototypeof": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.6.tgz", - "integrity": "sha512-fmfw4XgoDke3kdI6h4xcUz1dG8uaiv5q9gcEwLS4Pnth2kxT+GZ7YehS1JTMGBQmtV7Y4GFGbs2re2NqhdozUg==", + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", + "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", - "es-abstract": "^1.23.1", + "es-abstract": "^1.23.9", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "globalthis": "^1.0.3", - "which-builtin-type": "^1.1.3" + "es-object-atoms": "^1.0.0", + "get-intrinsic": "^1.2.7", + "get-proto": "^1.0.1", + "which-builtin-type": "^1.2.1" } }, "regenerate": { @@ -34823,15 +35133,17 @@ "integrity": "sha512-jbD/FT0+9MBU2XAZluI7w2OBs1RBi6p9M83nkoZayQXXU9e8Robt69FcZc7wU4eJD/YFTjn1JdCk3rbMJajz8Q==" }, "regexp.prototype.flags": { - "version": "1.5.2", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.2.tgz", - "integrity": "sha512-NcDiDkTLuPR+++OCKB0nWafEmhg/Da8aUPLPMQbK+bxKKCm1/S5he+AqYa4PlMCVBalb4/yxIRub6qkEx5yJbw==", + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", + "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", "dev": true, "requires": { - "call-bind": "^1.0.6", + "call-bind": "^1.0.8", "define-properties": "^1.2.1", "es-errors": "^1.3.0", - "set-function-name": "^2.0.1" + "get-proto": "^1.0.1", + "gopd": "^1.2.0", + "set-function-name": "^2.0.2" } }, "regexpu-core": { @@ -35081,14 +35393,15 @@ } }, "safe-array-concat": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.2.tgz", - "integrity": "sha512-vj6RsCsWBCf19jIeHEfkRMw8DPiBb+DMXklQ/1SGDHOMlHdPUkZXFQ2YdplS23zESTijAcurb1aSgJA3AgMu1Q==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", + "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", "dev": true, "requires": { - "call-bind": "^1.0.7", - "get-intrinsic": "^1.2.4", - "has-symbols": "^1.0.3", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "get-intrinsic": "^1.2.6", + "has-symbols": "^1.1.0", "isarray": "^2.0.5" } }, @@ -35097,6 +35410,16 @@ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "safe-push-apply": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", + "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", + "dev": true, + "requires": { + "es-errors": "^1.3.0", + "isarray": "^2.0.5" + } + }, "safe-regex": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", @@ -35107,14 +35430,14 @@ } }, "safe-regex-test": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.0.3.tgz", - "integrity": "sha512-CdASjNJPvRa7roO6Ra/gLYBTzYzzPyyBXxIMdGW3USQLyjWEls2RgW5UBTXaQVp+OrpeCK3bLem8smtmheoRuw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", + "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", "dev": true, "requires": { - "call-bind": "^1.0.6", + "call-bound": "^1.0.2", "es-errors": "^1.3.0", - "is-regex": "^1.1.4" + "is-regex": "^1.2.1" } }, "safer-buffer": { @@ -35423,16 +35746,16 @@ } }, "set-function-length": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.1.tgz", - "integrity": "sha512-j4t6ccc+VsKwYHso+kElc5neZpjtq9EnRICFZtWyBsLojhmeF/ZBd/elqm22WJh/BziDe/SBiOeAt0m2mfLD0g==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", + "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "requires": { - "define-data-property": "^1.1.2", + "define-data-property": "^1.1.4", "es-errors": "^1.3.0", "function-bind": "^1.1.2", - "get-intrinsic": "^1.2.3", + "get-intrinsic": "^1.2.4", "gopd": "^1.0.1", - "has-property-descriptors": "^1.0.1" + "has-property-descriptors": "^1.0.2" } }, "set-function-name": { @@ -35456,6 +35779,17 @@ "to-object-path": "^0.3.0" } }, + "set-proto": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", + "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", + "dev": true, + "requires": { + "dunder-proto": "^1.0.1", + "es-errors": "^1.3.0", + "es-object-atoms": "^1.0.0" + } + }, "set-value": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", @@ -35500,14 +35834,47 @@ "integrity": "sha512-6j1W9l1iAs/4xYBI1SYOVZyFcCis9b4KCLQ8fgAGG07QvzaRLVVRQvAy85yNmmZSjYjg4MWh4gNvlPujU/5LpA==" }, "side-channel": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.6.tgz", - "integrity": "sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", + "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "requires": { - "call-bind": "^1.0.7", "es-errors": "^1.3.0", - "get-intrinsic": "^1.2.4", - "object-inspect": "^1.13.1" + "object-inspect": "^1.13.3", + "side-channel-list": "^1.0.0", + "side-channel-map": "^1.0.1", + "side-channel-weakmap": "^1.0.2" + } + }, + "side-channel-list": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", + "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "requires": { + "es-errors": "^1.3.0", + "object-inspect": "^1.13.3" + } + }, + "side-channel-map": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", + "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3" + } + }, + "side-channel-weakmap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", + "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "requires": { + "call-bound": "^1.0.2", + "es-errors": "^1.3.0", + "get-intrinsic": "^1.2.5", + "object-inspect": "^1.13.3", + "side-channel-map": "^1.0.1" } }, "signal-exit": { @@ -36127,23 +36494,24 @@ } }, "string.prototype.matchall": { - "version": "4.0.11", - "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.11.tgz", - "integrity": "sha512-NUdh0aDavY2og7IbBPenWqR9exH+E26Sv8e0/eTe1tltDGZL+GtBkDAnnyBtmekfK6/Dq3MkcGtzXFEd1LQrtg==", + "version": "4.0.12", + "resolved": "https://registry.npmjs.org/string.prototype.matchall/-/string.prototype.matchall-4.0.12.tgz", + "integrity": "sha512-6CC9uyBL+/48dYizRf7H7VAYCMCNTBeM78x/VTUe9bFEaxBepPJDa1Ow99LqI/1yF7kuy7Q3cQsYMrcjGUcskA==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "define-properties": "^1.2.1", - "es-abstract": "^1.23.2", + "es-abstract": "^1.23.6", "es-errors": "^1.3.0", "es-object-atoms": "^1.0.0", - "get-intrinsic": "^1.2.4", - "gopd": "^1.0.1", - "has-symbols": "^1.0.3", - "internal-slot": "^1.0.7", - "regexp.prototype.flags": "^1.5.2", + "get-intrinsic": "^1.2.6", + "gopd": "^1.2.0", + "has-symbols": "^1.1.0", + "internal-slot": "^1.1.0", + "regexp.prototype.flags": "^1.5.3", "set-function-name": "^2.0.2", - "side-channel": "^1.0.6" + "side-channel": "^1.1.0" } }, "string.prototype.repeat": { @@ -36157,24 +36525,28 @@ } }, "string.prototype.trim": { - "version": "1.2.9", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.9.tgz", - "integrity": "sha512-klHuCNxiMZ8MlsOihJhJEBJAiMVqU3Z2nEXWfWnIqjN0gEFS9J9+IxKozWWtQGcgoa1WUZzLjKPTr4ZHNFTFxw==", + "version": "1.2.10", + "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", + "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", + "define-data-property": "^1.1.4", "define-properties": "^1.2.1", - "es-abstract": "^1.23.0", - "es-object-atoms": "^1.0.0" + "es-abstract": "^1.23.5", + "es-object-atoms": "^1.0.0", + "has-property-descriptors": "^1.0.2" } }, "string.prototype.trimend": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.8.tgz", - "integrity": "sha512-p73uL5VCHCO2BZZ6krwwQE3kCzM7NKmis8S//xEC6fQonchbum4eP6kR4DLEjQFO3Wnj3Fuo8NM0kOSjVdHjZQ==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", + "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.2", "define-properties": "^1.2.1", "es-object-atoms": "^1.0.0" } @@ -36955,55 +37327,56 @@ } }, "typed-array-buffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.2.tgz", - "integrity": "sha512-gEymJYKZtKXzzBzM4jqa9w6Q1Jjm7x2d+sh19AdsD4wqnMPDYyvwpsIc2Q/835kHuo3BEQ7CjelGhfTsoBb2MQ==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", + "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bound": "^1.0.3", "es-errors": "^1.3.0", - "is-typed-array": "^1.1.13" + "is-typed-array": "^1.1.14" } }, "typed-array-byte-length": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.1.tgz", - "integrity": "sha512-3iMJ9q0ao7WE9tWcaYKIptkNBuOIcZCCT0d4MRvuuH88fEoEH62IuQe0OtraD3ebQEoTRk8XCBoknUNc1Y67pw==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", "dev": true, "requires": { - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" } }, "typed-array-byte-offset": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.2.tgz", - "integrity": "sha512-Ous0vodHa56FviZucS2E63zkgtgrACj7omjwd/8lTEMEPFFyjfixMZ1ZXenpgCFBBt4EC1J2XsyVS2gkG0eTFA==", + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", + "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", "dev": true, "requires": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", "for-each": "^0.3.3", - "gopd": "^1.0.1", - "has-proto": "^1.0.3", - "is-typed-array": "^1.1.13" + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.15", + "reflect.getprototypeof": "^1.0.9" } }, "typed-array-length": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.6.tgz", - "integrity": "sha512-/OxDN6OtAk5KBpGb28T+HZc2M+ADtvRxXrKKbUwtsLgdoxgX13hyy7ek6bFRl5+aBs2yZzB0c4CnQfAtVypW/g==", + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", + "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "dev": true, "requires": { "call-bind": "^1.0.7", "for-each": "^0.3.3", "gopd": "^1.0.1", - "has-proto": "^1.0.3", "is-typed-array": "^1.1.13", - "possible-typed-array-names": "^1.0.0" + "possible-typed-array-names": "^1.0.0", + "reflect.getprototypeof": "^1.0.6" } }, "typed-assert": { @@ -37070,15 +37443,15 @@ "optional": true }, "unbox-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.0.2.tgz", - "integrity": "sha512-61pPlCD9h51VoreyJ0BReideM3MDKMKnh6+V9L08331ipq6Q8OFXZYiqP6n/tbHx4s5I9uRhcye6BrbkizkBDw==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", "dev": true, "requires": { - "call-bind": "^1.0.2", + "call-bound": "^1.0.3", "has-bigints": "^1.0.2", - "has-symbols": "^1.0.3", - "which-boxed-primitive": "^1.0.2" + "has-symbols": "^1.1.0", + "which-boxed-primitive": "^1.1.1" } }, "undici": { @@ -37808,36 +38181,37 @@ } }, "which-boxed-primitive": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz", - "integrity": "sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", + "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", "dev": true, "requires": { - "is-bigint": "^1.0.1", - "is-boolean-object": "^1.1.0", - "is-number-object": "^1.0.4", - "is-string": "^1.0.5", - "is-symbol": "^1.0.3" + "is-bigint": "^1.1.0", + "is-boolean-object": "^1.2.1", + "is-number-object": "^1.1.1", + "is-string": "^1.1.1", + "is-symbol": "^1.1.1" } }, "which-builtin-type": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.1.4.tgz", - "integrity": "sha512-bppkmBSsHFmIMSl8BO9TbsyzsvGjVoppt8xUiGzwiu/bhDCGxnpOKCxgqj6GuyHE0mINMDecBFPlOm2hzY084w==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", + "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", "dev": true, "requires": { + "call-bound": "^1.0.2", "function.prototype.name": "^1.1.6", "has-tostringtag": "^1.0.2", "is-async-function": "^2.0.0", - "is-date-object": "^1.0.5", - "is-finalizationregistry": "^1.0.2", + "is-date-object": "^1.1.0", + "is-finalizationregistry": "^1.1.0", "is-generator-function": "^1.0.10", - "is-regex": "^1.1.4", + "is-regex": "^1.2.1", "is-weakref": "^1.0.2", "isarray": "^2.0.5", - "which-boxed-primitive": "^1.0.2", + "which-boxed-primitive": "^1.1.0", "which-collection": "^1.0.2", - "which-typed-array": "^1.1.15" + "which-typed-array": "^1.1.16" } }, "which-collection": { @@ -37853,15 +38227,16 @@ } }, "which-typed-array": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.15.tgz", - "integrity": "sha512-oV0jmFtUky6CXfkqehVvBP/LSWJ2sy4vWMioiENyJLePrBO/yKyV9OyJySfAKosh+RYkIl5zJCNZ8/4JncrpdA==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz", + "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==", "dev": true, "requires": { "available-typed-arrays": "^1.0.7", - "call-bind": "^1.0.7", + "call-bind": "^1.0.8", + "call-bound": "^1.0.3", "for-each": "^0.3.3", - "gopd": "^1.0.1", + "gopd": "^1.2.0", "has-tostringtag": "^1.0.2" } }, diff --git a/frontend/package.json b/frontend/package.json index 7dc207a71bfe..50b5b770449b 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -77,6 +77,7 @@ "@appsignal/javascript": "^1.3.28", "@appsignal/plugin-breadcrumbs-console": "^1.1.29", "@appsignal/plugin-breadcrumbs-network": "^1.1.22", + "@braintree/sanitize-url": "^7.1.1", "@datorama/akita": "^8.0.1", "@floating-ui/dom": "^1.2.1", "@fullcalendar/angular": "^6.1.10", @@ -99,11 +100,11 @@ "@ngneat/content-loader": "^7.0.0", "@ngx-formly/core": "^6.1.4", "@openproject/octicons-angular": "^19.20.0", - "@openproject/primer-view-components": "^0.52.0", + "@openproject/primer-view-components": "^0.54.0", "@openproject/reactivestates": "^3.0.1", "@primer/css": "^21.5.0", "@primer/primitives": "^9.1.2", - "@primer/view-components": "npm:@openproject/primer-view-components@^0.52.0", + "@primer/view-components": "npm:@openproject/primer-view-components@^0.54.0", "@types/hotwired__turbo": "^8.0.1", "@uirouter/angular": "^13.0.0", "@uirouter/core": "^6.1.0", @@ -167,6 +168,7 @@ "build:fast": "OPENPROJECT_ANGULAR_BUILD=fast node --max_old_space_size=8192 ./node_modules/@angular/cli/bin/ng build --configuration production", "build": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build --configuration production --named-chunks --source-map", "build:watch": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build --watch --named-chunks", + "ci:plugins:register_frontend": "node ci-plugins-generator.js", "tokens:generate": "theo src/app/spot/styles/tokens/tokens.yml --transform web --format sass,json --dest src/app/spot/styles/tokens/dist", "serve": "node --max_old_space_size=8192 ./node_modules/@angular/cli/bin/ng serve --host ${FE_HOST:-localhost} --port ${FE_PORT:-4200} --public-host http://${PROXY_HOSTNAME:-localhost}:${FE_PORT:-4200}", "serve:test": "node --max_old_space_size=8192 ./node_modules/@angular/cli/bin/ng serve --host ${FE_HOST:-localhost} --port ${FE_PORT:-4200} --disable-host-check --public-host http://frontend-test:${FE_PORT:-4200}", diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 51d140173014..76e5546d8339 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -53,7 +53,6 @@ import { OpenprojectDashboardsModule } from 'core-app/features/dashboards/openpr import { OpenprojectWorkPackageGraphsModule, } from 'core-app/shared/components/work-package-graphs/openproject-work-package-graphs.module'; -import { HoverCardTriggerService } from 'core-app/core/setup/globals/global-listeners/hover-card-trigger.service'; import { OpenprojectOverviewModule } from 'core-app/features/overview/openproject-overview.module'; import { OpenprojectMyPageModule } from 'core-app/features/my-page/openproject-my-page.module'; import { OpenprojectProjectsModule } from 'core-app/features/projects/openproject-projects.module'; @@ -76,7 +75,6 @@ import { DynamicContentModalComponent } from 'core-app/shared/components/modals/ import { PasswordConfirmationModalComponent, } from 'core-app/shared/components/modals/request-for-confirmation/password-confirmation.modal'; -import { HoverCardComponent } from 'core-app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal'; import { OpHeaderProjectSelectComponent, } from 'core-app/shared/components/header-project-select/header-project-select.component'; @@ -123,9 +121,6 @@ import { import { ProjectAutocompleterComponent, } from 'core-app/shared/components/autocompleter/project-autocompleter/project-autocompleter.component'; -import { - AutocompleteSelectDecorationComponent, -} from 'core-app/shared/components/autocompleter/autocomplete-select-decoration/autocomplete-select-decoration.component'; import { MembersAutocompleterComponent, } from 'core-app/shared/components/autocompleter/members-autocompleter/members-autocompleter.component'; @@ -237,10 +232,12 @@ import { appBaseSelector, ApplicationBaseComponent } from 'core-app/core/routing import { SpotSwitchComponent } from 'core-app/spot/components/switch/switch.component'; import { OPContextMenuService } from 'core-app/shared/components/op-context-menu/op-context-menu.service'; import { CurrentProjectService } from 'core-app/core/current-project/current-project.service'; +import { + TimeEntriesWorkPackageAutocompleterComponent, +} from 'core-app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter.component'; export function initializeServices(injector:Injector) { return () => { - const PreviewTrigger = injector.get(HoverCardTriggerService); const topMenuService = injector.get(TopMenuService); const keyboardShortcuts = injector.get(KeyboardShortcutService); const contextMenu = injector.get(OPContextMenuService); @@ -250,13 +247,11 @@ export function initializeServices(injector:Injector) { injector.get(RevitAddInSettingsButtonService); topMenuService.register(); - PreviewTrigger.setupListener(); contextMenu.register(); // Re-register on turbo:load document.addEventListener('turbo:load', () => { topMenuService.register(); - PreviewTrigger.setupListener(); contextMenu.register(); currentProject.detect(); }); @@ -381,7 +376,6 @@ export function initializeServices(injector:Injector) { ConfirmDialogModalComponent, DynamicContentModalComponent, PasswordConfirmationModalComponent, - HoverCardComponent, // Main menu MainMenuResizerComponent, @@ -426,9 +420,9 @@ export class OpenProjectModule implements DoBootstrap { registerCustomElement('opce-global-search', GlobalSearchInputComponent, { injector }); registerCustomElement('opce-autocompleter', OpAutocompleterComponent, { injector }); registerCustomElement('opce-project-autocompleter', ProjectAutocompleterComponent, { injector }); - registerCustomElement('opce-select-decoration', AutocompleteSelectDecorationComponent, { injector }); registerCustomElement('opce-members-autocompleter', MembersAutocompleterComponent, { injector }); registerCustomElement('opce-user-autocompleter', UserAutocompleterComponent, { injector }); + registerCustomElement('opce-time-entries-work-package-autocompleter', TimeEntriesWorkPackageAutocompleterComponent, { injector }); registerCustomElement('opce-macro-attribute-value', AttributeValueMacroComponent, { injector }); registerCustomElement('opce-macro-attribute-label', AttributeLabelMacroComponent, { injector }); registerCustomElement('opce-macro-wp-quickinfo', WorkPackageQuickinfoMacroComponent, { injector }); diff --git a/frontend/src/app/core/global_search/input/global-search-input.component.html b/frontend/src/app/core/global_search/input/global-search-input.component.html index 0419ceecb2e0..f91c06749560 100644 --- a/frontend/src/app/core/global_search/input/global-search-input.component.html +++ b/frontend/src/app/core/global_search/input/global-search-input.component.html @@ -59,7 +59,7 @@
    diff --git a/frontend/src/app/core/loading-indicator/loading-indicator.service.ts b/frontend/src/app/core/loading-indicator/loading-indicator.service.ts index 40cab7fb20bf..c2665bb00399 100644 --- a/frontend/src/app/core/loading-indicator/loading-indicator.service.ts +++ b/frontend/src/app/core/loading-indicator/loading-indicator.service.ts @@ -38,11 +38,11 @@ export function withLoadingIndicator(indicator:LoadingIndicator, delayStopTim indicator.start(); return source$.pipe( - tap( - () => indicator.delayedStop(delayStopTime), - () => indicator.stop(), - () => indicator.stop(), - ), + tap({ + next: () => indicator.delayedStop(delayStopTime), + error: () => indicator.stop(), + complete: () => indicator.stop(), + }), ); }; } @@ -52,11 +52,11 @@ export function withDelayedLoadingIndicator(indicator:() => LoadingIndicator) setTimeout(() => indicator().start()); return source$.pipe( - tap( - () => undefined, - () => indicator().stop(), - () => indicator().stop(), - ), + tap({ + next: () => undefined, + error: () => indicator().stop(), + complete: () => indicator().stop(), + }), ); }; } diff --git a/frontend/src/app/core/main-menu/main-menu-toggle.service.ts b/frontend/src/app/core/main-menu/main-menu-toggle.service.ts index f98505cc2413..3c2904e769d7 100644 --- a/frontend/src/app/core/main-menu/main-menu-toggle.service.ts +++ b/frontend/src/app/core/main-menu/main-menu-toggle.service.ts @@ -55,8 +55,6 @@ export class MainMenuToggleService { private mainMenu = jQuery('#main-menu')[0]; // main menu, containing sidebar and resizer - private hideElements = jQuery('.can-hide-navigation'); - // Title needs to be sync in main-menu-toggle.component.ts and main-menu-resizer.component.ts private titleData = new BehaviorSubject(''); @@ -203,6 +201,7 @@ export class MainMenuToggleService { private toggleClassHidden():void { const isHidden = this.elementWidth < this.elementMinWidth; - this.hideElements.toggleClass('hidden-navigation', isHidden); + const hideElements = jQuery('.can-hide-navigation'); + hideElements.toggleClass('hidden-navigation', isHidden); } } diff --git a/frontend/src/app/core/path-helper/path-helper.service.ts b/frontend/src/app/core/path-helper/path-helper.service.ts index b39afd827d8f..af2408a19e4d 100644 --- a/frontend/src/app/core/path-helper/path-helper.service.ts +++ b/frontend/src/app/core/path-helper/path-helper.service.ts @@ -304,6 +304,10 @@ export class PathHelperService { return `${this.workPackagePath(workPackageId)}/split_view/update_counter?counter=${counter}`; } + public workPackageGetRelationsCounterPath(workPackageId:string|number) { + return `${this.workPackagePath(workPackageId)}/split_view/get_relations_counter`; + } + // Work Package Bulk paths public workPackagesBulkEditPath() { @@ -329,4 +333,28 @@ export class PathHelperService { public jobStatusModalPath(jobId:string) { return `${this.staticBase}/job_statuses/${jobId}/dialog`; } + + public timeEntriesUserTimezoneCaption(userId:string) { + return `${this.staticBase}/time_entries/users/${userId}/tz_caption`; + } + + public timeEntriesWorkPackageActivity(workPackageId:string) { + return `${this.staticBase}/time_entries/work_packages/${workPackageId}/time_entry_activities`; + } + + public timeEntryDialog() { + return `${this.staticBase}/time_entries/dialog`; + } + + public timeEntryEditDialog(timeEntryId:string) { + return `${this.staticBase}/time_entries/${timeEntryId}/dialog`; + } + + public timeEntryWorkPackageDialog(workPackageId:string) { + return `${this.workPackagePath(workPackageId)}/time_entries/dialog`; + } + + public timeEntryProjectDialog(projectId:string) { + return `${this.projectPath(projectId)}/time_entries/dialog`; + } } diff --git a/frontend/src/app/core/routing/openproject.routes.ts b/frontend/src/app/core/routing/openproject.routes.ts index ebb4709e386d..f49f0ce12c26 100644 --- a/frontend/src/app/core/routing/openproject.routes.ts +++ b/frontend/src/app/core/routing/openproject.routes.ts @@ -181,6 +181,9 @@ export function initializeUiRouterListeners(injector:Injector) { // Re-find the current app-base openprojectBaseApp = document.querySelector(appBaseSelector); uiRouter.urlService.sync(); + + // Re-apply the body classes + bodyClass(_.get(uiRouter.globals.current, 'data.bodyClasses'), 'add'); }); // Uncomment to trace route changes diff --git a/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts b/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts deleted file mode 100644 index 6edea8a379ff..000000000000 --- a/frontend/src/app/core/setup/globals/global-listeners/hover-card-trigger.service.ts +++ /dev/null @@ -1,170 +0,0 @@ -//-- copyright -// OpenProject is an open source project management software. -// Copyright (C) the OpenProject GmbH -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License version 3. -// -// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -// Copyright (C) 2006-2013 Jean-Philippe Lang -// Copyright (C) 2010-2013 the ChiliProject Team -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// See COPYRIGHT and LICENSE files for more details. -//++ - -import { Injectable, Injector, NgZone } from '@angular/core'; -import { OpModalService } from 'core-app/shared/components/modal/modal.service'; -import { HoverCardComponent } from 'core-app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal'; -import { PortalOutletTarget } from 'core-app/shared/components/modal/portal-outlet-target.enum'; - -@Injectable({ providedIn: 'root' }) -export class HoverCardTriggerService { - private modalElement:HTMLElement; - - private mouseInModal = false; - private hoverTimeout:number|null = null; - private closeTimeout:number|null = null; - // Set to custom when opening the hover card on top of another modal - private modalTarget:PortalOutletTarget = PortalOutletTarget.Default; - private previousTarget:HTMLElement|null = null; - - // The time you need to keep hovering over a trigger before the hover card is shown - OPEN_DELAY_IN_MS = 1000; - // The time you need to keep away from trigger/hover card before an opened card is closed - CLOSE_DELAY_IN_MS = 250; - - constructor( - readonly opModalService:OpModalService, - readonly ngZone:NgZone, - readonly injector:Injector, - ) { - } - - setupListener() { - jQuery(document.body).on('mouseover', '.op-hover-card--preview-trigger', (e) => { - e.preventDefault(); - e.stopPropagation(); - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment - const el = e.target as HTMLElement; - if (!el) { return; } - - if (this.previousTarget && this.previousTarget === el) { - // Re-entering the trigger counts as hovering over the card: - this.mouseInModal = true; - // But we will not re-render the same card, abort here - return; - } - - // Hovering over a new target. Close the old one (if any). - this.close(true); - this.previousTarget = el; - - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment - const turboFrameUrl = el.getAttribute('data-hover-card-url'); - if (!turboFrameUrl) { return; } - - // Reset close timer for when hovering over multiple triggers in quick succession. - // A timer from a previous hover card might still be running. We do not want it to - // close the new (i.e. this) hover card. - if (this.closeTimeout) { - clearTimeout(this.closeTimeout); - this.closeTimeout = null; - } - - // Set a delay before showing the hover card - this.hoverTimeout = window.setTimeout(() => { - this.showHoverCard(el, turboFrameUrl, e); - }, this.OPEN_DELAY_IN_MS); - }); - - jQuery(document.body).on('mouseleave', '.op-hover-card--preview-trigger', () => { - this.clearHoverTimer(); - this.mouseInModal = false; - this.closeAfterTimeout(); - }); - - jQuery(document.body).on('mouseleave', '.op-hover-card', () => { - this.clearHoverTimer(); - this.mouseInModal = false; - this.closeAfterTimeout(); - }); - - jQuery(document.body).on('mouseenter', '.op-hover-card', () => { - this.mouseInModal = true; - }); - } - - private showHoverCard(el:HTMLElement, turboFrameUrl:string, e:JQuery.MouseOverEvent) { - // Abort if the element is no longer present in the DOM. This can happen when this method is called after a delay. - if (!document.body.contains(el)) { return; } - - this.parseHoverCardOptions(el); - - // There is only one possible slot to insert a modal. If that slot is taken, we assume the other modal - // to be more important than a hover card and give up. - const modal = this.opModalService.showIfNotActive( - HoverCardComponent, - this.injector, - { turboFrameSrc: turboFrameUrl, event: e }, - true, - false, - this.modalTarget, - ); - - modal?.subscribe((previewModal) => { - this.modalElement = previewModal.elementRef.nativeElement as HTMLElement; - previewModal.alignment = 'top'; - - void previewModal.reposition(this.modalElement, el); - }); - } - - // Should be called when the mouse leaves the hover-zone so that we no longer attempt ot display the hover card. - private clearHoverTimer() { - if (this.hoverTimeout) { - clearTimeout(this.hoverTimeout); - this.hoverTimeout = null; - } - } - - private closeAfterTimeout() { - this.ngZone.runOutsideAngular(() => { - this.closeTimeout = window.setTimeout(() => { - this.close(); - }, this.CLOSE_DELAY_IN_MS); - }); - } - - private close(forceClose=false) { - if (forceClose) { - this.mouseInModal = false; - } - - if (!this.mouseInModal) { - this.opModalService.close(); - // Allow opening this target once more, since it has been orderly closed - this.previousTarget = null; - } - } - - private parseHoverCardOptions(el:HTMLElement) { - const modalTarget = el.getAttribute('data-hover-card-target'); - if (modalTarget) { - this.modalTarget = parseInt(modalTarget, 10); - } - } -} diff --git a/frontend/src/app/core/state/file-links/file-links.service.ts b/frontend/src/app/core/state/file-links/file-links.service.ts index c2626f87c193..b046af2e3ed6 100644 --- a/frontend/src/app/core/state/file-links/file-links.service.ts +++ b/frontend/src/app/core/state/file-links/file-links.service.ts @@ -77,7 +77,7 @@ export class FileLinksResourceService extends ResourceStoreService { switchMap((collection) => from(collection._embedded.elements)), groupBy( (fileLink) => fileLink._links.storage.href, - (fileLink) => fileLink, + { element: (fileLink) => fileLink }, ), mergeMap((group$) => { const seed = { storage: group$.key, fileLinks: [] as IFileLink[] }; diff --git a/frontend/src/app/core/turbo/turbo-requests.service.ts b/frontend/src/app/core/turbo/turbo-requests.service.ts index fdef90241755..0c8ab601d497 100644 --- a/frontend/src/app/core/turbo/turbo-requests.service.ts +++ b/frontend/src/app/core/turbo/turbo-requests.service.ts @@ -10,7 +10,10 @@ export class TurboRequestsService { } - public request(url:string, init:RequestInit = {}, suppressErrorToast = false):Promise<{ html:string, headers:Headers }> { + public request(url:string, init:RequestInit = {}, suppressErrorToast = false):Promise<{ + html:string, + headers:Headers + }> { return fetch(url, init) .then((response) => { return response.text().then((html) => ({ @@ -42,6 +45,26 @@ export class TurboRequestsService { }); } + public submitForm( + form:HTMLFormElement, + params:URLSearchParams|null = null, + url = form.action, + ):Promise<{ html:string, headers:Headers }> { + const formData = new FormData(form); + const requestParams = params ? `?${params.toString()}` : ''; + return this.request( + `${url}${requestParams}`, + { + method: form.method, + body: formData, + headers: { + 'X-CSRF-Token': (document.querySelector('meta[name="csrf-token"]') as HTMLMetaElement).content, + }, + }, + true, + ); + } + public requestStream(url:string):Promise<{ html:string, headers:Headers }> { return this.request(url, { method: 'GET', diff --git a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts index 8634c3795442..b0da09260f0b 100644 --- a/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts +++ b/frontend/src/app/features/calendar/te-calendar/te-calendar.component.ts @@ -1,10 +1,12 @@ import { + AfterViewInit, ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Injector, Input, + OnDestroy, Output, SecurityContext, ViewChild, @@ -34,11 +36,7 @@ import { ConfigurationService } from 'core-app/core/config/configuration.service import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource'; import { CollectionResource } from 'core-app/features/hal/resources/collection-resource'; import interactionPlugin from '@fullcalendar/interaction'; -import { - HalResourceEditingService, -} from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service'; -import { TimeEntryEditService } from 'core-app/shared/components/time_entries/edit/edit.service'; -import { TimeEntryCreateService } from 'core-app/shared/components/time_entries/create/create.service'; +import { HalResourceEditingService } from 'core-app/shared/components/fields/edit/services/hal-resource-editing.service'; import { ColorsService } from 'core-app/shared/components/colors/colors.service'; import { BrowserDetector } from 'core-app/core/browser/browser-detector.service'; import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; @@ -51,12 +49,13 @@ import { OpCalendarService } from 'core-app/features/calendar/op-calendar.servic import { SchemaResource } from 'core-app/features/hal/resources/schema-resource'; import { IFieldSchema } from 'core-app/shared/components/fields/field.base'; import { VerboseFormattingArg } from '@fullcalendar/common'; -import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource'; import { firstValueFrom, Subject } from 'rxjs'; import { WeekdayService } from 'core-app/core/days/weekday.service'; import { IDay } from 'core-app/core/state/days/day.model'; import { DayResourceService } from 'core-app/core/state/days/day.service'; import allLocales from '@fullcalendar/core/locales-all'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; +import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; interface TimeEntrySchema extends SchemaResource { activity:IFieldSchema; @@ -83,7 +82,15 @@ interface CalendarOptionsWithDayGrid extends CalendarOptions { dayGridClassNames:(data:DayCellMountArg) => void; } // An array of all the days that are displayed. The zero index represents Monday. -export type DisplayedDays = [boolean, boolean, boolean, boolean, boolean, boolean, boolean]; +export type DisplayedDays = [ + boolean, + boolean, + boolean, + boolean, + boolean, + boolean, + boolean, +]; const TIME_ENTRY_CLASS_NAME = 'te-calendar--time-entry'; const DAY_SUM_CLASS_NAME = 'te-calendar--day-sum'; @@ -99,12 +106,12 @@ const ADD_ENTRY_PROHIBITED_CLASS_NAME = '-prohibited'; changeDetection: ChangeDetectionStrategy.OnPush, providers: [ OpCalendarService, - TimeEntryEditService, - TimeEntryCreateService, HalResourceEditingService, + TurboRequestsService, + PathHelperService, ], }) -export class TimeEntryCalendarComponent { +export class TimeEntryCalendarComponent implements AfterViewInit, OnDestroy { @ViewChild(FullCalendarComponent) ucCalendar:FullCalendarComponent; @Input() projectIdentifier:string; @@ -126,7 +133,7 @@ export class TimeEntryCalendarComponent { public scaleRatio = 1; - protected memoizedTimeEntries:{ start:Moment, end:Moment, entries:Promise> }; + protected memoizedTimeEntries:{ start:Moment; end:Moment; entries:Promise>; }; public memoizedCreateAllowed = false; @@ -139,6 +146,8 @@ export class TimeEntryCalendarComponent { public nonWorkingDays:IDay[] = []; + private closeDialogHandler:EventListener = this.handleDialogClose.bind(this); + public additionalOptions:CalendarOptionsWithDayGrid = { editable: false, locales: allLocales, @@ -185,9 +194,7 @@ export class TimeEntryCalendarComponent { const endOfWeek = moment().endOf('week').format('YYYY-MM-DD'); await this.requireNonWorkingDays(startOfWeek, endOfWeek); this.additionalOptions.hiddenDays = this.setHiddenDays(displayedDayss); - this.calendarOptions$.next( - this.additionalOptions, - ); + this.calendarOptions$.next(this.additionalOptions); }); } @@ -202,18 +209,28 @@ export class TimeEntryCalendarComponent { private sanitizer:DomSanitizer, private configuration:ConfigurationService, private timezone:TimezoneService, - private timeEntryEdit:TimeEntryEditService, - private timeEntryCreate:TimeEntryCreateService, private schemaCache:SchemaCacheService, private colors:ColorsService, private browserDetector:BrowserDetector, private calendar:OpCalendarService, readonly weekdayService:WeekdayService, readonly dayService:DayResourceService, - ) {} + readonly turboRequests:TurboRequestsService, + readonly pathHelper:PathHelperService, + ) { } + + ngAfterViewInit():void { + document.addEventListener('dialog:close', this.closeDialogHandler); + } + + ngOnDestroy():void { + document.removeEventListener('dialog:close', this.closeDialogHandler); + } - async requireNonWorkingDays(start:Date|string, end:Date|string) { - this.nonWorkingDays = await firstValueFrom(this.dayService.requireNonWorkingYears$(start, end)); + async requireNonWorkingDays(start:Date | string, end:Date | string) { + this.nonWorkingDays = await firstValueFrom( + this.dayService.requireNonWorkingYears$(start, end), + ); } public calendarEventsFunction( @@ -238,15 +255,14 @@ export class TimeEntryCalendarComponent { || this.memoizedTimeEntries.end.valueOf() !== end.valueOf()) { const promise = firstValueFrom( this - .apiV3Service - .time_entries - .list({ filters: this.dmFilters(start, end), pageSize: 500 }), - ) - .then((collection) => { - this.memoizedCreateAllowed = !!collection.createTimeEntry; - - return collection; - }); + .apiV3Service + .time_entries + .list({ filters: this.dmFilters(start, end), pageSize: 500 }), + ).then((collection) => { + this.memoizedCreateAllowed = !!collection.createTimeEntry; + + return collection; + }); this.memoizedTimeEntries = { start, end, entries: promise }; } @@ -254,7 +270,7 @@ export class TimeEntryCalendarComponent { return this.memoizedTimeEntries.entries; } - private async buildEntries(entries:TimeEntryResource[], fetchInfo:{ start:Date, end:Date }):Promise { + private async buildEntries(entries:TimeEntryResource[], fetchInfo:{ start:Date; end:Date }):Promise { this.setRatio(entries); await this.requireNonWorkingDays(fetchInfo.start, fetchInfo.end); return this.buildTimeEntryEntries(entries) @@ -280,9 +296,9 @@ export class TimeEntryCalendarComponent { // But it will trigger repainting the calendar. // Weirdly, this.ucCalendar.getApi().rerender() does not. this.ucCalendar.getApi().setOption('slotLabelFormat', (info:VerboseFormattingArg) => { - const val = (this.maxHour - info.date.hour) / this.scaleRatio; - return val.toString(); - }); + const val = (this.maxHour - info.date.hour) / this.scaleRatio; + return val.toString(); + }); } } @@ -293,7 +309,7 @@ export class TimeEntryCalendarComponent { let start:Moment; let end:Moment; const hours = this.timezone.toHours(entry.hours) * this.scaleRatio; - const spentOn = entry.spentOn as string; + const spentOn = entry.spentOn; if (hoursDistribution[spentOn]) { start = hoursDistribution[spentOn].clone().subtract(hours, 'h'); @@ -309,7 +325,7 @@ export class TimeEntryCalendarComponent { }); } - private buildAuxEntries(entries:TimeEntryResource[], fetchInfo:{ start:Date, end:Date }):EventInput[] { + private buildAuxEntries(entries:TimeEntryResource[], fetchInfo:{ start:Date; end:Date }):EventInput[] { const dateSums = this.calculateDateSums(entries); const calendarEntries:EventInput[] = []; @@ -327,12 +343,12 @@ export class TimeEntryCalendarComponent { return calendarEntries; } - private calculateDateSums(entries:TimeEntryResource[]):{ [p:string]:number } { + private calculateDateSums(entries:TimeEntryResource[]):{ [p:string]:number; } { const dateSums:{ [key:string]:number } = {}; entries.forEach((entry) => { const hours = this.timezone.toHours(entry.hours); - const spentOn = entry.spentOn as string; + const spentOn = entry.spentOn; if (dateSums[spentOn]) { dateSums[spentOn] += hours; @@ -370,7 +386,7 @@ export class TimeEntryCalendarComponent { protected sumEntry(date:Moment, duration:number):EventInput { return { start: date.clone().add(this.maxHour - Math.min(duration * this.scaleRatio, this.maxHour - 0.5) - 0.5, 'h').format(), - end: date.clone().add(this.maxHour - Math.min(((duration + 0.05) * this.scaleRatio), this.maxHour - 0.5), 'h').format(), + end: date.clone().add(this.maxHour - Math.min((duration + 0.05) * this.scaleRatio, this.maxHour - 0.5), 'h').format(), classNames: DAY_SUM_CLASS_NAME, rendering: 'background' as const, startEditable: false, @@ -397,8 +413,10 @@ export class TimeEntryCalendarComponent { protected dmFilters(start:Moment, end:Moment):Array<[string, FilterOperator, string[]]> { const startDate = start.format('YYYY-MM-DD'); const endDate = end.subtract(1, 'd').format('YYYY-MM-DD'); - return [['spentOn', '<>d', [startDate, endDate]] as [string, FilterOperator, string[]], - ['user_id', '=', ['me']] as [string, FilterOperator, [string]]]; + return [ + ['spentOn', '<>d', [startDate, endDate]] as [ string, FilterOperator, string[] ], + ['user_id', '=', ['me']] as [string, FilterOperator, [string]], + ]; } private dispatchEventClick(event:CalendarViewEvent):void { @@ -410,15 +428,10 @@ export class TimeEntryCalendarComponent { } private editEvent(entry:TimeEntryResource):void { - this - .timeEntryEdit - .edit(entry, { showUserField: false }) - .then((modificationAction) => { - this.updateEventSet(modificationAction.entry, modificationAction.action); - }) - .catch(() => { - // do nothing, the user closed without changes - }); + void this.turboRequests.request( + `${this.pathHelper.timeEntryEditDialog(entry.id as string)}?onlyMe=true`, + { method: 'GET' }, + ); } private moveEvent(event:CalendarMoveEvent):void { @@ -428,23 +441,18 @@ export class TimeEntryCalendarComponent { // on the day before by fullcalendar. entry.spentOn = moment(event.event.endStr).format('YYYY-MM-DD'); - void this - .schemaCache - .ensureLoaded(entry) - .then((schema) => { - this - .apiV3Service - .time_entries - .id(entry) - .patch(entry, schema) - .subscribe( - (updated) => this.updateEventSet(updated, 'update'), - (e) => { - this.notifications.handleRawError(e); - event.revert(); - }, - ); - }); + void this.schemaCache.ensureLoaded(entry).then((schema) => { + this.apiV3Service.time_entries + .id(entry) + .patch(entry, schema) + .subscribe( + (updated) => this.updateEventSet(updated, 'update'), + (e) => { + this.notifications.handleRawError(e); + event.revert(); + }, + ); + }); } public addEventToday():void { @@ -456,18 +464,13 @@ export class TimeEntryCalendarComponent { return; } - this - .timeEntryCreate - .create(date, undefined, { showUserField: false }) - .then((modificationAction) => { - this.updateEventSet(modificationAction.entry, modificationAction.action); - }) - .catch(() => { - // do nothing, the user closed without changes - }); + void this.turboRequests.request( + `${this.pathHelper.timeEntryDialog()}?date=${date.format('YYYY-MM-DD')}&onlyMe=true`, + { method: 'GET' }, + ); } - private updateEventSet(event:TimeEntryResource, action:'update'|'destroy'|'create'|'unchanged'):void { + private updateEventSet(event:TimeEntryResource, action:'update' | 'destroy' | 'create' | 'unchanged'):void { void this.memoizedTimeEntries.entries.then((collection) => { const foundIndex = collection.elements.findIndex((x) => x.id === event.id); @@ -480,11 +483,7 @@ export class TimeEntryCalendarComponent { collection.elements.splice(foundIndex, 1); break; case 'create': - void this - .apiV3Service - .time_entries - .cache - .updateFor(event); + void this.apiV3Service.time_entries.cache.updateFor(event); collection.elements.push(event); break; @@ -533,7 +532,7 @@ export class TimeEntryCalendarComponent { const { entry } = event.event.extendedProps; - const schema = await this.schemaCache.ensureLoaded(entry as TimeEntryResource) as TimeEntrySchema; + const schema = (await this.schemaCache.ensureLoaded(entry as TimeEntryResource)) as TimeEntrySchema; jQuery(event.el).tooltip({ content: this.tooltipContentString(event.event.extendedProps.entry, schema), @@ -568,13 +567,13 @@ export class TimeEntryCalendarComponent { } /* Fade out event text to the bottom to avoid it being cut of weirdly. - * Multiline ellipsis with an unknown height is not possible, hence we blur the text. - * The gradient needs to take the background color of the element into account (hashed over the event - * title) which is why the style is set in code. - * - * We do not print anything on short entries (< 0.5 hours), - * which leads to the fc-short class not being applied by full calendar. For other short events, the css rules - * need to deactivate the fc-fadeout. + * Multiline ellipsis with an unknown height is not possible, hence we blur the text. + * The gradient needs to take the background color of the element into account (hashed over the event + * title) which is why the style is set in code. + * + * We do not print anything on short entries (< 0.5 hours), + * which leads to the fc-short class not being applied by full calendar. For other short events, the css rules + * need to deactivate the fc-fadeout. */ private appendFadeout(event:CalendarViewEvent):void { const timeEntry = event.event.extendedProps.entry as TimeEntryResource; @@ -591,12 +590,11 @@ export class TimeEntryCalendarComponent { fadeout.css('background', `-webkit-linear-gradient(${hslaStart} 0%, ${hslaEnd} 100%`); - ['-moz-linear-gradient', '-o-linear-gradient', 'linear-gradient', '-ms-linear-gradient'].forEach(((style) => { + ['-moz-linear-gradient', '-o-linear-gradient', 'linear-gradient', '-ms-linear-gradient'].forEach((style) => { fadeout.css('background-image', `${style}(${hslaStart} 0%, ${hslaEnd} 100%`); - })); + }); - $element - .append(fadeout); + $element.append(fadeout); } private beforeEventRemove(event:CalendarViewEvent):void { @@ -617,7 +615,7 @@ export class TimeEntryCalendarComponent { } private workPackageName(entry:TimeEntryResource):string { - const workPackage = entry.workPackage as WorkPackageResource; + const workPackage = entry.workPackage; return `#${idFromLink(workPackage.href)}: ${workPackage.name}`; } @@ -634,7 +632,7 @@ export class TimeEntryCalendarComponent {
  • ${schema.activity.name}: - ${this.sanitizedValue(entry.activity.name)} + ${this.sanitizedValue(entry.activity?.name || '')}
  • ${schema.hours.name}: @@ -677,4 +675,19 @@ export class TimeEntryCalendarComponent { }) .filter((value) => value !== null) as number[]; } + + private handleDialogClose(event:CustomEvent):void { + const { + detail: { dialog, submitted }, + } = event as { detail:{ dialog:HTMLDialogElement; submitted:boolean } }; + if (dialog.id === 'time-entry-dialog' && submitted) { + void this.fetchTimeEntries( + this.memoizedTimeEntries.start, + this.memoizedTimeEntries.end, + ).then(async (collection) => { + this.entries.emit(collection); + this.ucCalendar.getApi().refetchEvents(); + }); + } + } } diff --git a/frontend/src/app/features/hal/resources/time-entry-resource.ts b/frontend/src/app/features/hal/resources/time-entry-resource.ts index b554917315b6..328811b92453 100644 --- a/frontend/src/app/features/hal/resources/time-entry-resource.ts +++ b/frontend/src/app/features/hal/resources/time-entry-resource.ts @@ -35,7 +35,7 @@ import Formattable = api.v3.Formattable; export class TimeEntryResource extends HalResource { project:ProjectResource; - activity:HalResource; + activity:HalResource|null; comment:Formattable; diff --git a/frontend/src/app/features/homescreen/blocks/new-features.component.ts b/frontend/src/app/features/homescreen/blocks/new-features.component.ts index 6cc7053d53e2..fa2edb39ad4d 100644 --- a/frontend/src/app/features/homescreen/blocks/new-features.component.ts +++ b/frontend/src/app/features/homescreen/blocks/new-features.component.ts @@ -33,7 +33,7 @@ import { I18nService } from 'core-app/core/i18n/i18n.service'; import { imagePath } from 'core-app/shared/helpers/images/path-helper'; // The key used in the I18n files to distinguish between versions. -const OpVersionI18n = '15_2'; +const OpVersionI18n = '15_3'; const OpReleaseURL = 'https://www.openproject.org/docs/release-notes'; diff --git a/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts b/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts index 9a511306d103..8c059b2665f1 100644 --- a/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts +++ b/frontend/src/app/features/in-app-notifications/bell/state/ian-bell.service.ts @@ -86,15 +86,15 @@ export class IanBellService { ) .pipe( map((result) => result.total), - tap( - (count) => { + tap({ + next: (count) => { this.store.update({ totalUnread: count }); }, - (error) => { + error: (error) => { console.error('Failed to load notifications: %O', error); this.store.update({ totalUnread: -1 }); }, - ), + }), catchError(() => EMPTY), ); } diff --git a/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts b/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts index 0979826f6503..c5d1eab71307 100644 --- a/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts +++ b/frontend/src/app/features/in-app-notifications/center/state/ian-center.service.ts @@ -37,7 +37,6 @@ import { IToast, ToastService } from 'core-app/shared/components/toaster/toast.s import { centerUpdatedInPlace, markNotificationsAsRead, - notificationCountIncreased, notificationCountChanged, notificationsMarkedRead, } from 'core-app/core/state/in-app-notifications/in-app-notifications.actions'; @@ -63,7 +62,6 @@ import { FrameElement } from '@hotwired/turbo'; import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; import { UrlParamsService } from 'core-app/core/navigation/url-params.service'; import { IanBellService } from 'core-app/features/in-app-notifications/bell/state/ian-bell.service'; -import { ConfigurationService } from 'core-app/core/config/configuration.service'; export interface INotificationPageQueryParameters { filter?:string|null; @@ -159,7 +157,7 @@ export class IanCenterService extends UntilDestroyedMixin { }), switchMap(() => this .resourceService - .fetchCollection(this.params) + .fetchCollection(this.params, { handleErrors: false }) .pipe( switchMap( (results) => from(this.sideLoadInvolvedWorkPackages(results._embedded.elements)) @@ -196,7 +194,6 @@ export class IanCenterService extends UntilDestroyedMixin { readonly deviceService:DeviceService, readonly pathHelper:PathHelperService, readonly ianBellService:IanBellService, - readonly configurationService:ConfigurationService, ) { super(); this.reload.subscribe(); @@ -276,8 +273,6 @@ export class IanCenterService extends UntilDestroyedMixin { */ @EffectCallback(notificationCountChanged) private handleChangedNotificationCount() { - if (!this.primerizedActivitiesEnabled) return; - // update the UI state for increased AND decreased notifications, not only increased count // decreasing the notification count could happen when the user itself // marks notifications as read in the split view or on another tab @@ -290,52 +285,6 @@ export class IanCenterService extends UntilDestroyedMixin { this.reload.next(false); } - /** - * Check for updates after bell count increased - */ - @EffectCallback(notificationCountIncreased) - private checkForNewNotifications() { - // There is a new concept for primerized work package activities bound to notificationCountChanged - // See @EffectCallback(notificationCountChanged) - if (this.primerizedActivitiesEnabled) return; - - this.onReload.pipe(take(1)).subscribe((collection) => { - const { activeCollection } = this.query.getValue(); - const hasNewNotifications = !collection.ids.reduce( - (allInOldCollection, id) => allInOldCollection && activeCollection.ids.includes(id), - true, - ); - - if (!hasNewNotifications) { - return; - } - - if (this.activeReloadToast) { - this.toastService.remove(this.activeReloadToast); - this.activeReloadToast = null; - } - - this.activeReloadToast = this.toastService.add({ - type: 'info', - icon: 'bell', - message: this.I18n.t('js.notifications.center.new_notifications.message'), - link: { - text: this.I18n.t('js.notifications.center.new_notifications.link_text'), - target: () => { - this.store.update({ activeCollection: collection }); - this.actions$.dispatch(centerUpdatedInPlace({ origin: this.id })); - this.activeReloadToast = null; - }, - }, - }); - }); - this.reload.next(false); - } - - private get primerizedActivitiesEnabled():boolean { - return this.configurationService.activeFeatureFlags.includes('primerizedWorkPackageActivities'); - } - /** * Reload after notifications were successfully marked as read */ diff --git a/frontend/src/app/features/invite-user-modal/principal/principal-search.component.html b/frontend/src/app/features/invite-user-modal/principal/principal-search.component.html index 517ffa9af35c..a905438c8720 100644 --- a/frontend/src/app/features/invite-user-modal/principal/principal-search.component.html +++ b/frontend/src/app/features/invite-user-modal/principal/principal-search.component.html @@ -21,7 +21,10 @@ class="ng-option-label" > - {{ item.principal.name }} + {{ item.principal.name }}
    • - +
    |undefined { return this .wpTabs diff --git a/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.html b/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.html index e3adad05d238..c766a1ea00e1 100644 --- a/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.html +++ b/frontend/src/app/features/work-packages/routing/wp-split-view/wp-split-view.html @@ -14,7 +14,6 @@ diff --git a/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts b/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts index a4a19324f13a..7044fb5d3756 100644 --- a/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts +++ b/frontend/src/app/features/work-packages/services/notifications/work-package-notification.service.ts @@ -33,21 +33,15 @@ import { WorkPackageResource } from 'core-app/features/hal/resources/work-packag import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; import { HalResource } from 'core-app/features/hal/resources/hal-resource'; import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; -import { ConfigurationService } from 'core-app/core/config/configuration.service'; @Injectable() export class WorkPackageNotificationService extends HalResourceNotificationService { - primerizedActivitiesEnabled:boolean; - constructor( readonly injector:Injector, readonly apiV3Service:ApiV3Service, readonly turboRequests:TurboRequestsService, - readonly configurationService:ConfigurationService, ) { super(injector); - - this.primerizedActivitiesEnabled = this.configurationService.activeFeatureFlags.includes('primerizedWorkPackageActivities'); } public showSave(resource:HalResource, isCreate = false) { @@ -61,26 +55,12 @@ export class WorkPackageNotificationService extends HalResourceNotificationServi protected showCustomError(errorResource:any, resource:WorkPackageResource):boolean { if (errorResource.errorIdentifier === 'urn:openproject-org:api:v3:errors:UpdateConflict') { - if (this.primerizedActivitiesEnabled) { - // currently we do not have a programmatic way to show the primer flash messages - // so we just do a request to the server to show it - // should be refactored once we have a programmatic way to show the primer flash messages! - void this.turboRequests.request('/work_packages/show_conflict_flash_message?scheme=danger', { - method: 'GET', - }); - } else { - // code from before: - this.ToastService.addError({ - // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access - message: errorResource.message, - type: 'error', - link: { - text: this.I18n.t('js.hal.error.update_conflict_refresh'), - // eslint-disable-next-line @typescript-eslint/no-misused-promises - target: () => this.apiV3Service.work_packages.id(resource).refresh(), - }, - }); - } + // currently we do not have a programmatic way to show the primer flash messages + // so we just do a request to the server to show it + // should be refactored once we have a programmatic way to show the primer flash messages! + void this.turboRequests.request('/work_packages/show_conflict_flash_message?scheme=danger', { + method: 'GET', + }); return true; } diff --git a/frontend/src/app/shared/components/autocompleter/autocomplete-select-decoration/autocomplete-select-decoration.component.ts b/frontend/src/app/shared/components/autocompleter/autocomplete-select-decoration/autocomplete-select-decoration.component.ts deleted file mode 100644 index 583fb147b069..000000000000 --- a/frontend/src/app/shared/components/autocompleter/autocomplete-select-decoration/autocomplete-select-decoration.component.ts +++ /dev/null @@ -1,202 +0,0 @@ -//-- copyright -// OpenProject is an open source project management software. -// Copyright (C) the OpenProject GmbH -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License version 3. -// -// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -// Copyright (C) 2006-2013 Jean-Philippe Lang -// Copyright (C) 2010-2013 the ChiliProject Team -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// See COPYRIGHT and LICENSE files for more details. -//++ - -import { - AfterViewInit, - Component, - OnInit, - ViewChild, -} from '@angular/core'; -import { NgSelectComponent } from '@ng-select/ng-select'; -import { IProjectAutocompleteItem } from 'core-app/shared/components/autocompleter/project-autocompleter/project-autocomplete-item'; -import { - IAutocompleteItem, - OpAutocompleterComponent, -} from 'core-app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component'; - -type SelectItem = { label:string, value:string, selected?:boolean }; - -export const autocompleteSelectDecorationSelector = 'autocomplete-select-decoration'; - -@Component({ - template: ` - - - - - - {{ item.label }} - - - `, - selector: autocompleteSelectDecorationSelector, -}) -export class AutocompleteSelectDecorationComponent extends OpAutocompleterComponent implements OnInit, AfterViewInit { - @ViewChild(NgSelectComponent) public ngSelectComponent:NgSelectComponent; - - public options:SelectItem[]; - - /** Get the selected options */ - public selected:SelectItem|SelectItem[]; - - /** Get the selected options especially for the project autocompleter */ - public currentProjectSelection:{ id:string, name:string }|{ id:string, name:string }[]; - - /** The input name we're syncing selections to */ - private syncInputFieldName:string; - - /** The field key (e.g. status, type, or project) */ - public key:string; - - text = { - placeholder: this.I18n.t('js.placeholders.selection'), - }; - - ngOnInit():void { - const element = this.elementRef.nativeElement as HTMLElement; - - // Set options - this.multiple = element.dataset.multiple === 'true'; - this.labelForId = element.dataset.inputId; - this.key = element.dataset.key!; - this.appendTo = element.dataset.appendTo; - - // Get the sync target - this.syncInputFieldName = element.dataset.inputName!; - // Add Rails multiple identifier if multiple - if (this.multiple) { - this.syncInputFieldName += '[]'; - } - - // Prepare and build the options - // Expected array of objects with id, name, select - const data:SelectItem[] = JSON.parse(element.dataset.options!); - - // Set initial selection - this.setInitialSelection(data); - if (this.isProjectField()) { - this.setInitialProjectSelection(); - } - - if (!this.multiple) { - this.selected = (this.selected as SelectItem[])[0]; - } - - this.options = data; - - // Unhide the parent - element.parentElement!.hidden = false; - } - - // eslint-disable-next-line @angular-eslint/no-empty-lifecycle-method - ngAfterViewInit():void { - // do nothing and prevent the parent hook to be called - } - - setInitialSelection(data:SelectItem[]):void { - this.updateSelection(data.filter((element) => element.selected)); - } - - updateSelection(items:SelectItem|SelectItem[]):void { - this.selected = items; - items = _.castArray(items); - - this.removeCurrentSyncedFields(); - items.forEach((el:SelectItem) => { - this.createSyncedField(el.value); - }); - } - - createSyncedField(value:string):void { - const element = jQuery(this.elementRef.nativeElement); - element - .parent() - .append(``); - } - - removeCurrentSyncedFields():void { - const element = jQuery(this.elementRef.nativeElement); - element - .parent() - .find(`input[name="${this.syncInputFieldName}"]`) - .remove(); - } - - updateProjectSelection(items:IProjectAutocompleteItem|IProjectAutocompleteItem[]):void { - items = _.castArray(items); - const mappedItems = items.map(item => { - const selectedItem:SelectItem = { - label: item.name, - value: item.id.toString(), - selected: true, - }; - - return selectedItem; - }); - - this.updateSelection(mappedItems); - } - - setInitialProjectSelection():void { - const items = _.castArray(this.selected); - if (items.length === 0) return; - - if (this.multiple) { - this.currentProjectSelection = items.map((item:SelectItem) => ({ - id: item.value, - name: item.label, - })); - } else { - this.currentProjectSelection = { - id: items[0].value, - name: items[0].label, - }; - } - } - - isProjectField():boolean { - return this.key === 'project'; - } -} diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.html b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.html index 6c0a78b56768..e6067ca49e54 100644 --- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.html +++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.html @@ -4,6 +4,7 @@ *ngIf="inputName && !(multiple && multipleAsSeparateInputs)" type="hidden" [attr.name]="inputName" + [value]="mappedInputValue" [attr.data-action]="hiddenFieldAction"> - {{ item.name }} + {{ item.name }} + {{ item.name }} diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts index 86696c1e2c30..7ef6f296e564 100644 --- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts +++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component.ts @@ -20,11 +20,11 @@ import { TemplateRef, Type, ViewChild, - ViewContainerRef, + ViewContainerRef, ViewEncapsulation, } from '@angular/core'; import { DropdownPosition, NgSelectComponent } from '@ng-select/ng-select'; import { BehaviorSubject, merge, NEVER, Observable, of, Subject } from 'rxjs'; -import { debounceTime, distinctUntilChanged, filter, switchMap, tap, map } from 'rxjs/operators'; +import { debounceTime, distinctUntilChanged, filter, map, switchMap, tap } from 'rxjs/operators'; import { AddTagFn, GroupValueFn } from '@ng-select/ng-select/lib/ng-select.component'; import { HalResource } from 'core-app/features/hal/resources/hal-resource'; @@ -53,6 +53,11 @@ import { HalResourceService } from 'core-app/features/hal/services/hal-resource. import { CollectionResource } from 'core-app/features/hal/resources/collection-resource'; import { ApiV3FilterBuilder } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder'; import { addFiltersToPath } from 'core-app/core/apiv3/helpers/add-filters-to-path'; +import { + IAPIFilter, + IOPAutocompleterOption, + TOpAutocompleterResource, +} from 'core-app/shared/components/autocompleter/op-autocompleter/typings'; export interface IAutocompleteItem { id:ID; @@ -69,6 +74,7 @@ export interface IAutocompleterTemplateComponent { @Component({ selector: 'op-autocompleter', changeDetection: ChangeDetectionStrategy.OnPush, + encapsulation: ViewEncapsulation.None, templateUrl: './op-autocompleter.component.html', styleUrls: ['./op-autocompleter.component.sass'], providers: [ @@ -114,6 +120,8 @@ export class OpAutocompleterComponent(null); @Input() public clearSearchOnAdd?:boolean = true; @@ -193,7 +201,7 @@ export class OpAutocompleterComponent boolean; + @Input() public searchFn:(term:string, item:unknown) => boolean; @Input() public trackByFn = this.defaultTrackByFunction(); @@ -286,7 +294,7 @@ export class OpAutocompleterComponent; - private opAutocompleterService = new OpAutocompleterService(this.apiV3Service); + readonly opAutocompleterService = new OpAutocompleterService(this.apiV3Service); constructor( readonly injector:Injector, @@ -309,22 +317,14 @@ export class OpAutocompleterComponent(''); } - if (this.inputValue && !this.model) { - this - .opAutocompleterService - .loadValue(this.inputValue, this.resource, this.multiple) - .subscribe((resource) => { - this.model = resource as unknown as T; - this.syncHiddenField(this.mappedInputValue); - this.cdRef.detectChanges(); - }); + if (this.items) { + this.items$.next(this.items as IOPAutocompleterOption[]); } } ngOnChanges(changes:SimpleChanges):void { if (changes.items) { - // eslint-disable-next-line @typescript-eslint/no-unsafe-argument - this.items$.next(changes.items.currentValue); + this.items$.next(changes.items.currentValue as IOPAutocompleterOption[]); } } @@ -333,6 +333,17 @@ export class OpAutocompleterComponent { + this.model = resource as unknown as T; + this.syncHiddenField(this.mappedInputValue); + this.cdRef.detectChanges(); + }); + } + this.ngZone.runOutsideAngular(() => { setTimeout(() => { this.results$ = merge( @@ -375,7 +386,7 @@ export class OpAutocompleterComponent { + public getOptionsItems(searchKey:string):Observable { return of((this.items as IOPAutocompleterOption[])?.filter((element) => element.name.includes(searchKey))); } @@ -404,6 +415,7 @@ export class OpAutocompleterComponent this.loading$.next(false), - () => this.loading$.next(false), - ), + tap({ + next: () => this.loading$.next(false), + error: () => this.loading$.next(false), + }), ); } @@ -578,13 +590,19 @@ export class OpAutocompleterComponent { diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts index 835d7cd402f5..e6c394e7aa2e 100644 --- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts +++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/services/op-autocompleter.service.ts @@ -10,6 +10,12 @@ import { HalResource } from 'core-app/features/hal/resources/hal-resource'; import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; import { forkJoin, Observable } from 'rxjs'; import { UntilDestroyedMixin } from 'core-app/shared/helpers/angular/until-destroyed.mixin'; +import { + IAPIFilter, + TOpAutocompleterResource, +} from 'core-app/shared/components/autocompleter/op-autocompleter/typings'; +import { ProjectResource } from 'core-app/features/hal/resources/project-resource'; +import { ApiV3ProjectPaths } from 'core-app/core/apiv3/endpoints/projects/apiv3-project-paths'; @Injectable() @@ -45,7 +51,7 @@ export class OpAutocompleterService extends UntilDestroyedMixin { protected loadSingleValue(id:string, resource:TOpAutocompleterResource) { return (this.apiV3Service[resource] as - ApiV3ResourceCollection) + ApiV3ResourceCollection) .id(id) .get(); } diff --git a/frontend/src/app/shared/components/autocompleter/op-autocompleter/typings.d.ts b/frontend/src/app/shared/components/autocompleter/op-autocompleter/typings.d.ts index 4fc08713255f..08d56ff627ec 100644 --- a/frontend/src/app/shared/components/autocompleter/op-autocompleter/typings.d.ts +++ b/frontend/src/app/shared/components/autocompleter/op-autocompleter/typings.d.ts @@ -1,12 +1,14 @@ -interface IAPIFilter { +import { ApiV3FilterValueType, FilterOperator } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder'; + +export interface IAPIFilter { name:string; operator:FilterOperator; values:ApiV3FilterValueType[]; } -interface IOPAutocompleterOption { +export interface IOPAutocompleterOption { id:number; name:string; } -type TOpAutocompleterResource = 'work_packages' | 'users' | 'principals'; +export type TOpAutocompleterResource = 'work_packages' | 'users' | 'principals' | 'projects'; diff --git a/frontend/src/app/shared/components/autocompleter/openproject-autocompleter.module.ts b/frontend/src/app/shared/components/autocompleter/openproject-autocompleter.module.ts index 08f5778d2270..292b7791e217 100644 --- a/frontend/src/app/shared/components/autocompleter/openproject-autocompleter.module.ts +++ b/frontend/src/app/shared/components/autocompleter/openproject-autocompleter.module.ts @@ -15,12 +15,6 @@ import { ColorsAutocompleterComponent } from 'core-app/shared/components/colors/ import { WorkPackageAutocompleterComponent, } from 'core-app/shared/components/autocompleter/work-package-autocompleter/wp-autocompleter.component'; -import { - TimeEntryWorkPackageAutocompleterComponent, -} from 'core-app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component'; -import { - AutocompleteSelectDecorationComponent, -} from 'core-app/shared/components/autocompleter/autocomplete-select-decoration/autocomplete-select-decoration.component'; import { VersionAutocompleterComponent, } from 'core-app/shared/components/autocompleter/version-autocompleter/version-autocompleter.component'; @@ -55,19 +49,21 @@ import { import { ProjectAutocompleterTemplateComponent, } from 'core-app/shared/components/autocompleter/project-autocompleter/project-autocompleter-template.component'; +import { + TimeEntriesWorkPackageAutocompleterComponent, +} from 'core-app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter.component'; export const OPENPROJECT_AUTOCOMPLETE_COMPONENTS = [ CreateAutocompleterComponent, VersionAutocompleterComponent, WorkPackageAutocompleterComponent, - TimeEntryWorkPackageAutocompleterComponent, + TimeEntriesWorkPackageAutocompleterComponent, DraggableAutocompleteComponent, UserAutocompleterComponent, UserAutocompleterTemplateComponent, ProjectAutocompleterComponent, ProjectAutocompleterTemplateComponent, ColorsAutocompleterComponent, - AutocompleteSelectDecorationComponent, OpAutocompleterComponent, OpAutocompleterOptionTemplateDirective, OpAutocompleterLabelTemplateDirective, diff --git a/frontend/src/app/shared/components/autocompleter/project-autocompleter/project-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/project-autocompleter/project-autocompleter.component.ts index 5d603a6900f2..8a1a179737d5 100644 --- a/frontend/src/app/shared/components/autocompleter/project-autocompleter/project-autocompleter.component.ts +++ b/frontend/src/app/shared/components/autocompleter/project-autocompleter/project-autocompleter.component.ts @@ -56,6 +56,7 @@ import { ProjectAutocompleterTemplateComponent, } from 'core-app/shared/components/autocompleter/project-autocompleter/project-autocompleter-template.component'; import { addFiltersToPath } from 'core-app/core/apiv3/helpers/add-filters-to-path'; +import { TOpAutocompleterResource } from 'core-app/shared/components/autocompleter/op-autocompleter/typings'; export const projectsAutocompleterSelector = 'op-project-autocompleter'; @@ -109,6 +110,8 @@ export class ProjectAutocompleterComponent extends OpAutocompleterComponent - -
    -
    - -
    -
    -     - diff --git a/frontend/src/app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component.sass b/frontend/src/app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component.sass deleted file mode 100644 index 7e1acc00cab4..000000000000 --- a/frontend/src/app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component.sass +++ /dev/null @@ -1,2 +0,0 @@ -.ng-dropdown-panel .ng-dropdown-header - padding-bottom: 0 \ No newline at end of file diff --git a/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.html b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.html new file mode 100644 index 000000000000..967cdbad9c49 --- /dev/null +++ b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.html @@ -0,0 +1,32 @@ + +
    +
    + +
    +
    +     diff --git a/frontend/src/app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts similarity index 54% rename from frontend/src/app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component.ts rename to frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts index 2932930c92be..e7e89b1e94cf 100644 --- a/frontend/src/app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component.ts +++ b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component.ts @@ -26,44 +26,30 @@ // See COPYRIGHT and LICENSE files for more details. //++ +import { ChangeDetectionStrategy, Component, Injector, Input, TemplateRef, ViewChild } from '@angular/core'; import { - AfterViewInit, - Component, - EventEmitter, - Injector, - Output, - ViewEncapsulation, -} from '@angular/core'; -import { WorkPackageAutocompleterComponent } from 'core-app/shared/components/autocompleter/work-package-autocompleter/wp-autocompleter.component'; - -export type TimeEntryWorkPackageAutocompleterMode = 'all'|'recent'; + IAutocompleterTemplateComponent, + OpAutocompleterComponent, +} from 'core-app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component'; +import { + TimeEntriesWorkPackageAutocompleterComponent, +} from 'core-app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter.component'; @Component({ - templateUrl: './te-work-package-autocompleter.component.html', - styleUrls: [ - './te-work-package-autocompleter.component.sass', - ], - selector: 'te-work-package-autocompleter', - encapsulation: ViewEncapsulation.None, + templateUrl: './time-entries-work-package-autocompleter-template.component.html', + changeDetection: ChangeDetectionStrategy.OnPush, }) -export class TimeEntryWorkPackageAutocompleterComponent extends WorkPackageAutocompleterComponent implements AfterViewInit { - @Output() modeSwitch = new EventEmitter(); +export class TimeEntriesWorkPackageAutocompleterTemplateComponent implements IAutocompleterTemplateComponent { + @Input() public mode:string|undefined; + @Input() public isOpenedInModal:boolean = false; + @Input() public hoverCards:boolean = true; + + @ViewChild('headerTemplate') headerTemplate:TemplateRef; + + autocompleter:TimeEntriesWorkPackageAutocompleterComponent = this.injector.get(OpAutocompleterComponent) as TimeEntriesWorkPackageAutocompleterComponent; constructor( readonly injector:Injector, ) { - super(injector); - - this.text.all = this.I18n.t('js.label_all'); - this.text.recent = this.I18n.t('js.label_recent'); - } - - public mode:TimeEntryWorkPackageAutocompleterMode = 'all'; - - public setMode(value:TimeEntryWorkPackageAutocompleterMode) { - if (value !== this.mode) { - this.modeSwitch.emit(value); - } - this.mode = value; } } diff --git a/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter.component.ts b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter.component.ts new file mode 100644 index 000000000000..1c556f037d28 --- /dev/null +++ b/frontend/src/app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter.component.ts @@ -0,0 +1,156 @@ +//-- copyright +// OpenProject is an open source project management software. +// Copyright (C) the OpenProject GmbH +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License version 3. +// +// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +// Copyright (C) 2006-2013 Jean-Philippe Lang +// Copyright (C) 2010-2013 the ChiliProject Team +// +// This program is free software; you can redistribute it and/or +// modify it under the terms of the GNU General Public License +// as published by the Free Software Foundation; either version 2 +// of the License, or (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program; if not, write to the Free Software +// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +// +// See COPYRIGHT and LICENSE files for more details. +//++ + +import { ChangeDetectionStrategy, Component, forwardRef, OnInit } from '@angular/core'; +import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; +import { OpInviteUserModalService } from 'core-app/features/invite-user-modal/invite-user-modal.service'; +import { + OpAutocompleterComponent, +} from 'core-app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component'; +import { HalResource } from 'core-app/features/hal/resources/hal-resource'; +import { map, switchMap } from 'rxjs/operators'; +import { Observable } from 'rxjs'; +import idFromLink from 'core-app/features/hal/helpers/id-from-link'; +import { CollectionResource } from 'core-app/features/hal/resources/collection-resource'; +import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource'; +import { IAPIFilter } from 'core-app/shared/components/autocompleter/op-autocompleter/typings'; +import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; +import { HalResourceSortingService } from 'core-app/features/hal/services/hal-resource-sorting.service'; +import { + TimeEntriesWorkPackageAutocompleterTemplateComponent, +} from 'core-app/shared/components/autocompleter/time-entries-work-package-autocompleter/time-entries-work-package-autocompleter-template.component'; + +export type TimeEntryWorkPackageAutocompleterMode = 'all'|'recent'; + +const RECENT_TIME_ENTRIES_MAGIC_NUMBER = 30; + +@Component({ + templateUrl: '../op-autocompleter/op-autocompleter.component.html', + selector: 'op-time-entries-work-package-autocompleter', + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [ + { + provide: NG_VALUE_ACCESSOR, + useExisting: forwardRef(() => TimeEntriesWorkPackageAutocompleterComponent), + multi: true, + }, + // Provide a new version of the modal invite service, + // as otherwise the close event will be shared across all instances + OpInviteUserModalService, + ], +}) +export class TimeEntriesWorkPackageAutocompleterComponent extends OpAutocompleterComponent implements OnInit, ControlValueAccessor { + public mode:TimeEntryWorkPackageAutocompleterMode = 'all'; + + @InjectField() halSorting:HalResourceSortingService; + + labelAll = this.I18n.t('js.label_all'); + labelRecent = this.I18n.t('js.label_recent'); + + private recentWorkPackageIds:string[]; + + getOptionsFn = this.loadAllowedValues.bind(this); + + ngOnInit():void { + super.ngOnInit(); + this.applyTemplates(TimeEntriesWorkPackageAutocompleterTemplateComponent); + } + + changeMode(newMode:TimeEntryWorkPackageAutocompleterMode) { + this.mode = newMode; + + if (this.typeahead) { + const lastValue = this.typeahead?.value; + this.typeahead?.next(' '); // Reset value + this.typeahead?.next(lastValue); + } + + this.cdRef.detectChanges(); + } + + // We fetch the last RECENT_TIME_ENTRIES_MAGIC_NUMBER time entries by that user. We then use it to fetch the work packages + // associated with the time entries so that we have the most recent work packages the user logged time on. + // As a worst case, the user logged RECENT_TIME_ENTRIES_MAGIC_NUMBER times on one work package so we can not guarantee to actually have + // a fixed number returned. + protected loadAllowedValues(query:string):Observable { + if (!this.recentWorkPackageIds) { + return this + .apiV3Service + .time_entries + .list({ + filters: [['user_id', '=', ['me']]], + sortBy: [['updated_at', 'desc']], + pageSize: RECENT_TIME_ENTRIES_MAGIC_NUMBER, + }) + .pipe( + switchMap((collection:CollectionResource) => { + this.recentWorkPackageIds = collection + .elements + .filter((timeEntry) => timeEntry.workPackage?.href) + .map((timeEntry) => idFromLink(timeEntry.workPackage.href)) + .filter((v, i, a) => a.indexOf(v) === i); + + return this.loadWorkPackages(query); + }), + ); + } + + return this.loadWorkPackages(query); + } + + protected get modeSpecificFilters():IAPIFilter[] { + const base = this.filters ?? []; + const isRecent = this.mode === 'recent'; + if (isRecent && this.recentWorkPackageIds.length > 0) { + return [...base, { name: 'id', operator: '=', values: this.recentWorkPackageIds } as IAPIFilter]; + } + + return base; + } + + protected loadWorkPackages(query:string):Observable { + return this + .opAutocompleterService + .loadData(query, this.resource, this.modeSpecificFilters, this.searchKey) + .pipe( + map((workPackages) => this.sortValues(workPackages)), + ); + } + + protected sortValues(availableValues:HalResource[]) { + if (this.mode === 'recent') { + return this.sortValuesByRecentIds(availableValues); + } + return this.halSorting.sort(availableValues); + } + + protected sortValuesByRecentIds(availableValues:HalResource[]) { + return availableValues + .sort((a, b) => this.recentWorkPackageIds.indexOf(a.id!) - this.recentWorkPackageIds.indexOf(b.id!)); + } +} diff --git a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html index e7753cd2dfa6..1820675eb252 100644 --- a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html +++ b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.html @@ -8,10 +8,11 @@ [principal]="item" [hideName]="true" [hoverCard]="hoverCards" - [hoverCardModalTarget]="isOpenedInModal ? 'custom' : 'default'" size="mini" > {{ item.name }} diff --git a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts index 8861ebdca3cf..961470fff0d7 100644 --- a/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts +++ b/frontend/src/app/shared/components/autocompleter/user-autocompleter/user-autocompleter-template.component.ts @@ -26,14 +26,13 @@ // See COPYRIGHT and LICENSE files for more details. //++ +import { ChangeDetectionStrategy, Component, Input, TemplateRef, ViewChild } from '@angular/core'; import { - ChangeDetectionStrategy, - Component, - Input, - TemplateRef, - ViewChild, -} from '@angular/core'; -import { IAutocompleterTemplateComponent } from 'core-app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component'; + IAutocompleterTemplateComponent, +} from 'core-app/shared/components/autocompleter/op-autocompleter/op-autocompleter.component'; +import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; +import { PrincipalLike } from 'core-app/shared/components/principal/principal-types'; +import { hrefFromPrincipal, typeFromHref } from 'core-app/shared/components/principal/principal-helper'; @Component({ templateUrl: './user-autocompleter-template.component.html', @@ -45,6 +44,19 @@ export class UserAutocompleterTemplateComponent implements IAutocompleterTemplat @Input() public isOpenedInModal:boolean = false; @Input() public hoverCards:boolean = true; + constructor(private readonly pathHelperService:PathHelperService) {} + @ViewChild('optionTemplate') optionTemplate:TemplateRef; @ViewChild('footerTemplate') footerTemplate?:TemplateRef; + + public getHoverCardUrl(principal:PrincipalLike) { + if (!this.hoverCards || !principal.id) { return ''; } + + const type = typeFromHref(hrefFromPrincipal(principal)); + if (!type || type !== 'user') { + return ''; + } + + return this.pathHelperService.userHoverCardPath(principal.id); + } } diff --git a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html index e083c264ab13..05fe101b3ce4 100644 --- a/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html +++ b/frontend/src/app/shared/components/datepicker/basic-range-date-picker/basic-range-date-picker.component.html @@ -16,6 +16,7 @@ [ngModel]="stringValue" (ngModelChange)="changeValueFromInputDebounced($event)" (focus)="showDatePicker()" + (click)="sentCalendarToTopLayer()" /> { + this.sentCalendarToTopLayer(); + }, onDayCreate: async (dObj:Date[], dStr:string, fp:flatpickr.Instance, dayElem:DayElement) => { onDayCreate( dayElem, @@ -203,7 +209,8 @@ export class OpBasicRangeDatePickerComponent implements OnInit, ControlValueAcce !!this.minimalDate && dayElem.dateObj <= this.minimalDate, ); }, - static: this.inDialog, + static: false, + appendTo: this.appendToBodyOrDialog(), }, this.input.nativeElement as HTMLInputElement, ); @@ -234,4 +241,31 @@ export class OpBasicRangeDatePickerComponent implements OnInit, ControlValueAcce private resolveDateArrayToString(dates:string[]):string { return dates.join(` ${rangeSeparator} `); } + + // In case the date picker is opened in a dialog, it needs to be in the top layer + // since the dialog is also there. This method is called in two cases: + // 1. When the date picker is opened + // 2. When the date picker is already opened and the user clicks on the input + // The later is necessary as otherwise the date picker would be removed from the top layer + // when the user clicks on the input. That is because the input is not part of the date picker + // so clicking on it would be considered a click on the backdrop which removes an item from + // the top layer again. + public sentCalendarToTopLayer() { + if (!this.datePickerInstance.isOpen || !this.inDialog) { + return; + } + + const calendarContainer = this.datePickerInstance.datepickerInstance.calendarContainer; + calendarContainer.setAttribute('popover', ''); + calendarContainer.showPopover(); + calendarContainer.style.marginTop = '0'; + } + + private appendToBodyOrDialog():HTMLElement|undefined { + if (this.inDialog) { + return document.querySelector(`#${this.inDialog}`) as HTMLElement; + } + + return undefined; + } } diff --git a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html index 436cf1bccd7b..3e7fe6910308 100644 --- a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html +++ b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.html @@ -16,6 +16,7 @@ [disabled]="disabled" (input)="changeValueFromInput($event.target.value)" (focus)="showDatePicker()" + (click)="sentCalendarToTopLayer()" [attr.data-remote-field-key]="remoteFieldKey" /> diff --git a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts index 1ecc03b2fe52..b73dd1a714bb 100644 --- a/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts +++ b/frontend/src/app/shared/components/datepicker/basic-single-date-picker/basic-single-date-picker.component.ts @@ -95,7 +95,7 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O @Input() remoteFieldKey = null; - @Input() inDialog = false; + @Input() inDialog:string; @Input() dataAction = ''; @@ -146,7 +146,10 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O } showDatePicker():void { - this.datePickerInstance?.show(); + if (!this.datePickerInstance?.isOpen) { + this.datePickerInstance?.show(); + this.sentCalendarToTopLayer(); + } } private initializeDatePicker() { @@ -174,6 +177,9 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O this.cdRef.detectChanges(); }, + onOpen: () => { + this.sentCalendarToTopLayer(); + }, onDayCreate: async (_dObj:Date[], _dStr:string, _fp:flatpickr.Instance, dayElem:DayElement) => { onDayCreate( dayElem, @@ -182,7 +188,8 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O !!this.minimalDate && dayElem.dateObj <= this.minimalDate, ); }, - static: this.inDialog, + static: false, + appendTo: this.appendToBodyOrDialog(), }, this.input.nativeElement as HTMLInputElement, ); @@ -204,4 +211,31 @@ export class OpBasicSingleDatePickerComponent implements ControlValueAccessor, O registerOnTouched(fn:(_:string) => void):void { this.onTouched = fn; } + + // In case the date picker is opened in a dialog, it needs to be in the top layer + // since the dialog is also there. This method is called in two cases: + // 1. When the date picker is opened + // 2. When the date picker is already opened and the user clicks on the input + // The later is necessary as otherwise the date picker would be removed from the top layer + // when the user clicks on the input. That is because the input is not part of the date picker + // so clicking on it would be considered a click on the backdrop which removes an item from + // the top layer again. + public sentCalendarToTopLayer() { + if (!this.datePickerInstance.isOpen || !this.inDialog) { + return; + } + + const calendarContainer = this.datePickerInstance.datepickerInstance.calendarContainer; + calendarContainer.setAttribute('popover', ''); + calendarContainer.showPopover(); + calendarContainer.style.marginTop = '0'; + } + + private appendToBodyOrDialog():HTMLElement|undefined { + if (this.inDialog) { + return document.querySelector(`#${this.inDialog}`) as HTMLElement; + } + + return undefined; + } } diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts index d61174105d78..f169bdef59c6 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-form/dynamic-form.component.spec.ts @@ -41,6 +41,7 @@ import { SpotFormFieldComponent } from 'core-app/spot/components/form-field/form import { HttpClientTestingModule } from '@angular/common/http/testing'; import { DynamicFieldWrapperComponent } from 'core-app/shared/components/dynamic-forms/components/dynamic-field-wrapper/dynamic-field-wrapper.component'; import { ConfirmDialogService } from "core-app/shared/components/modals/confirm-dialog/confirm-dialog.service"; +import { IOPDynamicFormSettings } from 'core-app/shared/components/dynamic-forms/typings'; @Component({ template: ` @@ -112,7 +113,7 @@ describe('DynamicFormComponent', () => { }, }, }; - const dynamicFormSettings:any = { + const dynamicFormSettings:IOPDynamicFormSettings = { fields: [ { type: 'textInput', @@ -388,7 +389,7 @@ describe('DynamicFormComponent', () => { expect(fixture.debugElement.query(By.css('[data-qa="op-form--container"]'))).toBeTruthy(); expect(fixture.debugElement.queryAll(By.css('formly-form')).length).toEqual(1); - expect(fixture.debugElement.queryAll(By.css('formly-field')).length).toEqual(10); + expect(fixture.debugElement.queryAll(By.css('formly-field * > formly-field')).length).toEqual(10); expect(fixture.debugElement.queryAll(By.css('op-text-input')).length).toEqual(2); expect(fixture.debugElement.queryAll(By.css('op-formattable-textarea-input')).length).toEqual(2); expect(fixture.debugElement.queryAll(By.css('op-select-input')).length).toEqual(2); @@ -416,7 +417,7 @@ describe('DynamicFormComponent', () => { expect(fixture.debugElement.query(By.css('[data-qa="op-form--container"]'))).toBeTruthy(); expect(fixture.debugElement.queryAll(By.css('formly-form')).length).toEqual(1); - expect(fixture.debugElement.queryAll(By.css('formly-field')).length).toEqual(10); + expect(fixture.debugElement.queryAll(By.css('formly-field * > formly-field')).length).toEqual(10); expect(fixture.debugElement.queryAll(By.css('op-text-input')).length).toEqual(2); expect(fixture.debugElement.queryAll(By.css('op-formattable-textarea-input')).length).toEqual(2); expect(fixture.debugElement.queryAll(By.css('op-select-input')).length).toEqual(2); diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/boolean-input/boolean-input.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/boolean-input/boolean-input.component.spec.ts index 6c75036d2cc4..0b5bcab14558 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/boolean-input/boolean-input.component.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/boolean-input/boolean-input.component.spec.ts @@ -3,12 +3,13 @@ import { createDynamicInputFixture, testDynamicInputControValueAccessor, } from 'core-app/shared/components/dynamic-forms/spec/helpers'; +import { IOPFormlyFieldSettings } from 'core-app/shared/components/dynamic-forms/typings'; describe('BooleanInputComponent', () => { it('should load the field', fakeAsync(() => { - const fieldsConfig = [ + const fieldsConfig:IOPFormlyFieldSettings[] = [ { - type: 'booleanInput' as const, + type: 'booleanInput', key: 'testControl', templateOptions: { required: true, @@ -16,7 +17,7 @@ describe('BooleanInputComponent', () => { }, }, ]; - const formModel = { + const formModel:IOPFormModel = { testControl: true, }; const testModel = { diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/components/formattable-control/formattable-control.component.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/components/formattable-control/formattable-control.component.ts index 5a9ef021fd0f..f6ec6c3d48f1 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/components/formattable-control/formattable-control.component.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/components/formattable-control/formattable-control.component.ts @@ -1,13 +1,12 @@ import { Component, forwardRef, Input, OnInit, ViewChild } from '@angular/core'; import { I18nService } from 'core-app/core/i18n/i18n.service'; -import { FormlyTemplateOptions } from '@ngx-formly/core'; import { ControlValueAccessor, NG_VALUE_ACCESSOR } from '@angular/forms'; import { OpCkeditorComponent } from 'core-app/shared/components/editor/components/ckeditor/op-ckeditor.component'; import { ICKEditorContext, ICKEditorInstance, } from 'core-app/shared/components/editor/components/ckeditor/ckeditor.types'; -import { ICKEditorType } from 'core-app/shared/components/editor/components/ckeditor/ckeditor-setup.service'; +import { IOPFormlyTemplateOptions } from 'core-app/shared/components/dynamic-forms/typings'; @Component({ selector: 'op-formattable-control', @@ -22,7 +21,7 @@ import { ICKEditorType } from 'core-app/shared/components/editor/components/cked ], }) export class FormattableControlComponent implements ControlValueAccessor, OnInit { - @Input() templateOptions:FormlyTemplateOptions; + @Input() templateOptions:IOPFormlyTemplateOptions; @ViewChild(OpCkeditorComponent, { static: true }) editor:OpCkeditorComponent; @@ -43,13 +42,13 @@ export class FormattableControlComponent implements ControlValueAccessor, OnInit public get ckEditorContext():ICKEditorContext { return { - type: this.templateOptions.editorType as ICKEditorType, - field: this.templateOptions.name as string, + type: this.templateOptions.editorType!, + field: this.templateOptions.name, // This is a very project resource specific hack to allow macros on description and statusExplanation but // disable it for custom fields. As the formly based approach is currently limited to projects, and that is to be removed, // such a "pragmatic" approach should be ok. - macros: (this.templateOptions.property as string).startsWith('customField') ? 'none' : 'resource', - options: { rtl: this.templateOptions?.rtl }, + macros: this.templateOptions.property?.startsWith('customField') ? 'none' : 'resource', + options: { rtl: this.templateOptions.rtl }, }; } @@ -61,8 +60,8 @@ export class FormattableControlComponent implements ControlValueAccessor, OnInit ngOnInit():void { this.text = { attachmentLabel: this.I18n.t('js.label_formattable_attachment_hint'), - save: this.I18n.t('js.inplace.button_save', { attribute: this.templateOptions?.name }), - cancel: this.I18n.t('js.inplace.button_cancel', { attribute: this.templateOptions?.name }), + save: this.I18n.t('js.inplace.button_save', { attribute: this.templateOptions.name }), + cancel: this.I18n.t('js.inplace.button_cancel', { attribute: this.templateOptions.name }), }; } diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/formattable-textarea-input.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/formattable-textarea-input.component.spec.ts index ec7f034ebe74..59228b4d1852 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/formattable-textarea-input.component.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/formattable-textarea-input/formattable-textarea-input.component.spec.ts @@ -1,14 +1,13 @@ import { discardPeriodicTasks, fakeAsync, flush, tick } from '@angular/core/testing'; import { createDynamicInputFixture } from 'core-app/shared/components/dynamic-forms/spec/helpers'; import { By } from '@angular/platform-browser'; -// @ts-ignore -import(/* webpackChunkName: "ckeditor-augmented-textarea" */ 'core-vendor/ckeditor/ckeditor.js'); +import { IOPFormlyFieldSettings } from 'core-app/shared/components/dynamic-forms/typings'; describe('FormattableTextareaInputComponent', () => { it('should load the field', fakeAsync(() => { - const fieldsConfig = [ + const fieldsConfig:IOPFormlyFieldSettings[] = [ { - type: 'formattableInput' as const, + type: 'formattableInput', key: 'testControl', templateOptions: { required: true, @@ -19,10 +18,11 @@ describe('FormattableTextareaInputComponent', () => { bindLabel: 'name', bindValue: 'value', noWrapLabel: true, + editorType: 'full' }, }, ]; - const formModel = { + const formModel:IOPFormModel = { testControl: { html: '

    tesValue

    ', raw: 'tesValue', diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/integer-input/integer-input.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/integer-input/integer-input.component.spec.ts index a7f45e259d09..ba71742457bd 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/integer-input/integer-input.component.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/integer-input/integer-input.component.spec.ts @@ -3,12 +3,13 @@ import { createDynamicInputFixture, testDynamicInputControValueAccessor, } from 'core-app/shared/components/dynamic-forms/spec/helpers'; +import { IOPFormlyFieldSettings } from 'core-app/shared/components/dynamic-forms/typings'; describe('IntegerInputComponent', () => { it('should load the field', fakeAsync(() => { - const fieldsConfig = [ + const fieldsConfig:IOPFormlyFieldSettings[] = [ { - type: 'integerInput' as const, + type: 'integerInput', key: 'testControl', templateOptions: { required: true, @@ -16,7 +17,7 @@ describe('IntegerInputComponent', () => { }, }, ]; - const formModel = { + const formModel:IOPFormModel = { testControl: 'testValue', }; const testModel = { diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/select-input/select-input.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/select-input/select-input.component.spec.ts index 781f645b83cc..9169a7fb236f 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/select-input/select-input.component.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/select-input/select-input.component.spec.ts @@ -2,6 +2,7 @@ import { fakeAsync, flush } from '@angular/core/testing'; import { createDynamicInputFixture } from 'core-app/shared/components/dynamic-forms/spec/helpers'; import { By } from '@angular/platform-browser'; import { of } from 'rxjs'; +import { IOPFormlyFieldSettings } from 'core-app/shared/components/dynamic-forms/typings'; describe('SelectInputComponent', () => { it('should load the field', fakeAsync(() => { @@ -15,9 +16,9 @@ describe('SelectInputComponent', () => { value: 2, }, ]; - const fieldsConfig = [ + const fieldsConfig:IOPFormlyFieldSettings[] = [ { - type: 'selectInput' as const, + type: 'selectInput', key: 'testControl', templateOptions: { required: true, @@ -31,7 +32,7 @@ describe('SelectInputComponent', () => { }, }, ]; - const formModel = { + const formModel:IOPFormModel = { testControl: selectOptions[0], }; const testModel = { diff --git a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/text-input/text-input.component.spec.ts b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/text-input/text-input.component.spec.ts index f7e434231845..83ea9ce9e427 100644 --- a/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/text-input/text-input.component.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/components/dynamic-inputs/text-input/text-input.component.spec.ts @@ -3,12 +3,13 @@ import { createDynamicInputFixture, testDynamicInputControValueAccessor, } from 'core-app/shared/components/dynamic-forms/spec/helpers'; +import { IOPFormlyFieldSettings } from 'core-app/shared/components/dynamic-forms/typings'; describe('TextInputComponent', () => { it('should load the field', fakeAsync(() => { - const fieldsConfig = [ + const fieldsConfig:IOPFormlyFieldSettings[] = [ { - type: 'textInput' as const, + type: 'textInput', key: 'testControl', templateOptions: { required: true, @@ -19,7 +20,7 @@ describe('TextInputComponent', () => { }, }, ]; - const formModel = { + const formModel:IOPFormModel = { testControl: 'testValue', }; const testModel = { diff --git a/frontend/src/app/shared/components/dynamic-forms/services/dynamic-fields/dynamic-fields.service.spec.ts b/frontend/src/app/shared/components/dynamic-forms/services/dynamic-fields/dynamic-fields.service.spec.ts index 15e772f2cef2..5729d200fb22 100644 --- a/frontend/src/app/shared/components/dynamic-forms/services/dynamic-fields/dynamic-fields.service.spec.ts +++ b/frontend/src/app/shared/components/dynamic-forms/services/dynamic-fields/dynamic-fields.service.spec.ts @@ -29,7 +29,7 @@ describe('DynamicFieldsService', () => { }); it('should generate a proper dynamic form schema', () => { - const formPayload = { + const formPayload:IOPFormModel = { name: 'Project 1', _links: { parent: { @@ -38,7 +38,7 @@ describe('DynamicFieldsService', () => { }, }, }; - const formSchema = { + const formSchema:IOPFormSchema = { name: { type: 'String', name: 'Name', @@ -82,7 +82,7 @@ describe('DynamicFieldsService', () => { }); it('should format the form model (add the name property to resources (_links: single and multiple))', () => { - const formPayload = { + const formPayload:IOPFormModel = { title: 'Project 1', _links: { parent: { @@ -101,44 +101,6 @@ describe('DynamicFieldsService', () => { ], }, }; - const formSchema = { - title: { - type: 'String', - name: 'Name', - required: true, - hasDefault: false, - writable: true, - minLength: 1, - maxLength: 255, - options: {}, - }, - parent: { - type: 'Project', - name: 'Subproject of', - required: false, - hasDefault: false, - writable: true, - location: '_links', - _links: { - allowedValues: { - href: '/api/v3/projects/available_parent_projects?of=25', - }, - }, - }, - children: { - type: 'Project', - name: "Project's children", - required: false, - hasDefault: false, - writable: true, - _links: { - allowedValues: { - href: '/api/v3/projects/available_parent_projects?of=25', - }, - }, - }, - _dependencies: [], - }; // @ts-ignore const formModel = service.getModel(formPayload); @@ -152,7 +114,7 @@ describe('DynamicFieldsService', () => { }); it('should generate a proper dynamic form config', () => { - const formPayload = { + const formPayload:IOPFormModel = { name: 'Project 1', _links: { parent: { @@ -161,7 +123,7 @@ describe('DynamicFieldsService', () => { }, }, }; - const formSchema = { + const formSchema:IOPFormSchema = { parent: { type: 'Project', name: 'Subproject of', @@ -197,7 +159,7 @@ describe('DynamicFieldsService', () => { }; // @ts-ignore const formlyConfig = service.getConfig(formSchema, formPayload); - const formlyFields = formlyConfig.reduce((result, formlyField) => (formlyField.fieldGroup ? [...result, ...formlyField.fieldGroup] : [...result, formlyField]), [] as IOPFormlyFieldSettings[]); + const formlyFields = formlyConfig.reduce((result:IOPFormSettings[], formlyField) => (formlyField.fieldGroup ? [...result, ...formlyField.fieldGroup] : [...result, formlyField]), []); const formGroup = formlyConfig[1]; expect(formlyFields[1].templateOptions!.label).toBe('Name', 'should set the correct label'); diff --git a/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts b/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts index 272f0ee3267e..94f3676fe031 100644 --- a/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts +++ b/frontend/src/app/shared/components/dynamic-forms/spec/helpers.ts @@ -22,8 +22,44 @@ import { ConfigurationService } from 'core-app/core/config/configuration.service import { CKEditorSetupService } from 'core-app/shared/components/editor/components/ckeditor/ckeditor-setup.service'; import { ToastService } from 'core-app/shared/components/toaster/toast.service'; import { SpotFormFieldComponent } from 'core-app/spot/components/form-field/form-field.component'; +import { ICKEditorInstance, ICKEditorWatchdog } from '../../editor/components/ckeditor/ckeditor.types'; + +const ickEditorInstanceStub:ICKEditorInstance = { + id: 'test-id', + state: 'test-state', + getData(options) { return 'test-data' }, + setData(content) { }, + destroy() { }, + enableReadOnlyMode(lockId) { }, + disableReadOnlyMode(lockId) { }, + on(event, callback) { }, + listenTo(node, key, callback, options) { }, + model: { + on(ev, callback) { }, + fire(ev, data) { }, + document: { on(ev, callback) { } } + }, + editing: { + view: { focus() { }, document } + }, + config: undefined, + ui: { + focusTracker: { on() { } } + }, + element: document.createElement("test-ick-editor-element") +} + +const ickEditorWatchdogStub:ICKEditorWatchdog = { + setCreator(callback) { }, + setDestructor(callback) { }, + create(elementOrData, editorConfig) { return Promise.resolve(ickEditorInstanceStub) }, + destroy() { }, + on(listener, callback) { }, + editor: ickEditorInstanceStub, + state: 'ready' +} -export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model:any, providers?:any[]):ComponentFixture { +export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model:IOPFormModel):ComponentFixture { @Component({ template: `
    @@ -32,8 +68,7 @@ export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model [fields]="fields">
    - `, - providers, + ` }) class DynamicInputsTestingComponent { form = new UntypedFormGroup({}); @@ -45,7 +80,8 @@ export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model @ViewChild(FormlyForm) dynamicForm:FormlyForm; } - const toastServiceSpy = jasmine.createSpyObj('ToastService', ['addError', 'addSuccess']); + const toastServiceSpy:jasmine.SpyObj = jasmine.createSpyObj('ToastService', ['addError', 'addSuccess']); + const ckEditorSetupServiceSpy:jasmine.SpyObj = jasmine.createSpyObj('CKEditorSetupService', ['create']); TestBed .configureTestingModule({ @@ -92,7 +128,7 @@ export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model { set: { providers: [ - CKEditorSetupService, + { provide: CKEditorSetupService, useValue: ckEditorSetupServiceSpy }, { provide: ToastService, useValue: toastServiceSpy }, { provide: NG_VALUE_ACCESSOR, @@ -110,6 +146,8 @@ export function createDynamicInputFixture(fields:IOPFormlyFieldSettings[], model TestBed.compileComponents(); + ckEditorSetupServiceSpy.create.and.resolveTo(ickEditorWatchdogStub); + const fixture = TestBed.createComponent(DynamicInputsTestingComponent); fixture.detectChanges(); diff --git a/frontend/src/app/shared/components/dynamic-forms/typings.d.ts b/frontend/src/app/shared/components/dynamic-forms/typings.d.ts index e499e2f1c67e..f6a5a3bf1869 100644 --- a/frontend/src/app/shared/components/dynamic-forms/typings.d.ts +++ b/frontend/src/app/shared/components/dynamic-forms/typings.d.ts @@ -1,5 +1,6 @@ -import { FormlyFieldConfig, FormlyTemplateOptions } from '@ngx-formly/core'; +import { FormlyFieldConfig, FormlyFieldProps } from '@ngx-formly/core'; import { FormGroup } from '@angular/forms'; +import { ICKEditorType } from '../editor/components/ckeditor/ckeditor-setup.service'; export interface IOPDynamicFormSettings { fields:IOPFormlyFieldSettings[]; @@ -15,9 +16,10 @@ export interface IOPFormlyFieldSettings extends FormlyFieldConfig { [key:string]:any; } -export interface IOPFormlyTemplateOptions extends FormlyTemplateOptions { +export interface IOPFormlyTemplateOptions extends FormlyFieldProps { + type?:'checkbox' | 'number' | 'password' | 'selectInput' | 'text'; + name?:string; property?:string; - label?:string; hasDefault?:boolean; fieldGroup?:string; isFieldGroup?:boolean; @@ -25,6 +27,23 @@ export interface IOPFormlyTemplateOptions extends FormlyTemplateOptions { collapsibleFieldGroupsCollapsed?:boolean; helpTextAttributeScope?:string; showValidationErrorOn?:'change' | 'blur' | 'submit' | 'never'; + payloadValue?:{ href?:string|null }; + rtl?:boolean; + locale?:string; + bindLabel?:string; + bindValue?:string; + searchable?:boolean; + editorType?:ICKEditorType; + noWrapLabel?:boolean; + virtualScroll?:boolean; + clearOnBackspace?:boolean; + clearSearchOnAdd?:boolean; + hideSelected?:boolean; + text?:Record; + typeahead?:boolean; + inlineLabel?:boolean; + clearable?:boolean; + multiple?:boolean; } type OPInputType = 'formattableInput'|'selectInput'|'textInput'|'integerInput'| diff --git a/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts b/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts index be98750c1cdc..7c69cf4385d5 100644 --- a/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts +++ b/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.component.ts @@ -26,7 +26,16 @@ // See COPYRIGHT and LICENSE files for more details. //++ -import { ChangeDetectionStrategy, Component, ElementRef, EventEmitter, Input, Output, OnInit, ViewChild } from '@angular/core'; +import { + ChangeDetectionStrategy, + Component, + ElementRef, + EventEmitter, + Input, + OnInit, + Output, + ViewChild, +} from '@angular/core'; import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; import { HalResource } from 'core-app/features/hal/resources/hal-resource'; import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service'; @@ -166,10 +175,6 @@ export class CkeditorAugmentedTextareaComponent extends UntilDestroyedMixin impl }); } - public markEdited() { - window.OpenProject.pageWasEdited = true; - } - public async saveForm(evt?:SubmitEvent):Promise { this.saveRequested.emit(); // Provide a hook for the parent component to do something before the form is submitted this.inFlight = true; @@ -209,7 +214,9 @@ export class CkeditorAugmentedTextareaComponent extends UntilDestroyedMixin impl return editor; } - private syncToTextarea() { + public syncToTextarea() { + window.OpenProject.pageWasEdited = true; + try { this.wrappedTextArea.value = this.ckEditorInstance.getTransformedContent(true); } catch (e) { diff --git a/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.html b/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.html index 4aa304fe891b..93476d85c557 100644 --- a/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.html +++ b/frontend/src/app/shared/components/editor/components/ckeditor-augmented-textarea/ckeditor-augmented-textarea.html @@ -3,7 +3,7 @@ [context]="context" [content]="initialContent" (initializeDone)="setup($event)" - (contentChanged)="markEdited()" + (contentChanged)="syncToTextarea()" (saveRequested)="saveForm()" (editorKeyup)="editorKeyup.emit()" (editorBlur)="editorBlur.emit()" @@ -12,7 +12,7 @@
    diff --git a/frontend/src/app/shared/components/fields/display/field-types/wp-spent-time-display-field.module.ts b/frontend/src/app/shared/components/fields/display/field-types/wp-spent-time-display-field.module.ts index df24f681b9bb..75c98348ee2f 100644 --- a/frontend/src/app/shared/components/fields/display/field-types/wp-spent-time-display-field.module.ts +++ b/frontend/src/app/shared/components/fields/display/field-types/wp-spent-time-display-field.module.ts @@ -30,11 +30,11 @@ import { PathHelperService } from 'core-app/core/path-helper/path-helper.service import { ProjectResource } from 'core-app/features/hal/resources/project-resource'; import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; import * as URI from 'urijs'; -import { TimeEntryCreateService } from 'core-app/shared/components/time_entries/create/create.service'; import { WorkPackageResource } from 'core-app/features/hal/resources/work-package-resource'; import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; import { WorkDisplayField } from 'core-app/shared/components/fields/display/field-types/work-display-field.module'; import * as moment from 'moment-timezone'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; export class WorkPackageSpentTimeDisplayField extends WorkDisplayField { public text = { @@ -44,10 +44,13 @@ export class WorkPackageSpentTimeDisplayField extends WorkDisplayField { @InjectField() PathHelper:PathHelperService; - @InjectField(TimeEntryCreateService, null) timeEntryCreateService:TimeEntryCreateService; - @InjectField() apiV3Service:ApiV3Service; + @InjectField() TurboRequests:TurboRequestsService; + + private closeDialogHandler:EventListener = this.handleDialogClose.bind(this); + private workPackageForHandler:WorkPackageResource; + public render(element:HTMLElement, displayText:string):void { if (!this.value) { return; @@ -58,22 +61,29 @@ export class WorkPackageSpentTimeDisplayField extends WorkDisplayField { link.setAttribute('title', this.text.linkTitle); if (displayText === this.placeholder) { - link.setAttribute('class', 'time-logging--value time-logging--value_empty'); + link.setAttribute( + 'class', + 'time-logging--value time-logging--value_empty', + ); } else { link.setAttribute('class', 'time-logging--value'); } if (this.resource.project && this.resource.id) { const wpID = this.resource.id.toString(); - this - .apiV3Service - .projects + this.apiV3Service.projects .id(this.resource.project as ProjectResource) .get() .subscribe((project:ProjectResource) => { // Link to the cost report having the work package filter preselected. No grouping. - const href = URI(this.PathHelper.projectTimeEntriesPath(project.identifier as string)) - .search(`fields[]=WorkPackageId&operators[WorkPackageId]=%3D&values[WorkPackageId]=${wpID}&set_filter=1`) + const href = URI( + this.PathHelper.projectTimeEntriesPath( + project.identifier as string, + ), + ) + .search( + `fields[]=WorkPackageId&operators[WorkPackageId]=%3D_child_work_packages&values[WorkPackageId]=${wpID}&set_filter=1`, + ) .toString(); link.href = href; @@ -87,7 +97,7 @@ export class WorkPackageSpentTimeDisplayField extends WorkDisplayField { } private appendTimelogLink(element:HTMLElement) { - if (this.timeEntryCreateService && this.resource.logTime) { + if (this.resource.logTime) { const timelogElement = document.createElement('a'); timelogElement.setAttribute('class', 'icon icon-time'); timelogElement.setAttribute('href', ''); @@ -95,15 +105,33 @@ export class WorkPackageSpentTimeDisplayField extends WorkDisplayField { element.appendChild(timelogElement); - timelogElement.addEventListener('click', this.showTimelogWidget.bind(this, this.resource)); + timelogElement.addEventListener( + 'click', + this.showTimelogWidget.bind(this, this.resource), + ); } } private showTimelogWidget(wp:WorkPackageResource) { - this.timeEntryCreateService - .create(moment(new Date()), wp, { showWorkPackageField: false }) - .catch(() => { - // do nothing, the user closed without changes - }); + document.addEventListener('dialog:close', this.closeDialogHandler); + this.workPackageForHandler = wp; + + void this.TurboRequests.request( + `${this.PathHelper.timeEntryWorkPackageDialog(wp.id as string)}?date=${moment().format('YYYY-MM-DD')}`, + { method: 'GET' }, + ); + } + + private handleDialogClose(event:CustomEvent):void { + document.removeEventListener('dialog:close', this.closeDialogHandler); + + const { + detail: { dialog, submitted }, + } = event as { detail:{ dialog:HTMLDialogElement; submitted:boolean } }; + if (dialog.id === 'time-entry-dialog' && submitted) { + void this.apiV3Service.work_packages + .id(this.workPackageForHandler.id!) + .refresh(); + } } } diff --git a/frontend/src/app/shared/components/fields/edit/edit-field.initializer.ts b/frontend/src/app/shared/components/fields/edit/edit-field.initializer.ts index 4164daa06fb6..ee82ecebce5f 100644 --- a/frontend/src/app/shared/components/fields/edit/edit-field.initializer.ts +++ b/frontend/src/app/shared/components/fields/edit/edit-field.initializer.ts @@ -61,9 +61,6 @@ import { import { PlainFormattableEditFieldComponent, } from 'core-app/shared/components/fields/edit/field-types/plain-formattable-edit-field.component'; -import { - TimeEntryWorkPackageEditFieldComponent, -} from 'core-app/shared/components/fields/edit/field-types/te-work-package-edit-field.component'; import { CombinedDateEditFieldComponent, } from 'core-app/shared/components/fields/edit/field-types/combined-date-edit-field.component'; @@ -73,9 +70,6 @@ import { import { WorkPackageAutocompleterComponent, } from 'core-app/shared/components/autocompleter/work-package-autocompleter/wp-autocompleter.component'; -import { - WorkPackageCommentFieldComponent, -} from 'core-app/features/work-packages/components/work-package-comment/wp-comment-field.component'; import { ProjectEditFieldComponent } from './field-types/project-edit-field.component'; import { HoursDurationEditFieldComponent, @@ -117,8 +111,7 @@ export function initializeCoreEditFields(editFieldService:EditFieldService, sele .addFieldType(WorkPackageEditFieldComponent, 'workPackage', ['WorkPackage']) .addFieldType(BooleanEditFieldComponent, 'boolean', ['Boolean']) .addFieldType(DateEditFieldComponent, 'date', ['Date']) - .addFieldType(FormattableEditFieldComponent, 'wiki-textarea', ['Formattable']) - .addFieldType(WorkPackageCommentFieldComponent, '_comment', ['comment']); + .addFieldType(FormattableEditFieldComponent, 'wiki-textarea', ['Formattable']); editFieldService .addSpecificFieldType( @@ -141,7 +134,6 @@ export function initializeCoreEditFields(editFieldService:EditFieldService, sele ) .addSpecificFieldType('Project', ProjectStatusEditFieldComponent, 'status', ['status']) .addSpecificFieldType('TimeEntry', PlainFormattableEditFieldComponent, 'comment', ['comment']) - .addSpecificFieldType('TimeEntry', TimeEntryWorkPackageEditFieldComponent, 'workPackage', ['WorkPackage']) .addSpecificFieldType('TimeEntry', HoursDurationEditFieldComponent, 'hours', ['hours']); selectAutocompleterRegisterService.register(VersionAutocompleterComponent, 'Version'); diff --git a/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts index 8abf179696ee..bfe9678b2099 100644 --- a/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts +++ b/frontend/src/app/shared/components/fields/edit/field-types/progress-popover-edit-field.component.ts @@ -79,6 +79,8 @@ export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponen opened = false; + private boundListener = this.contextBasedListener.bind(this); + constructor( readonly I18n:I18nService, readonly elementRef:ElementRef, @@ -111,7 +113,7 @@ export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponen this .frameElement .nativeElement - .addEventListener('turbo:submit-end', this.contextBasedListener.bind(this)); + .addEventListener('turbo:submit-end', this.boundListener); } ngOnDestroy() { @@ -120,7 +122,7 @@ export class ProgressPopoverEditFieldComponent extends ProgressEditFieldComponen this .frameElement .nativeElement - .removeEventListener('turbo:submit-end', this.contextBasedListener.bind(this)); + .removeEventListener('turbo:submit-end', this.boundListener); } public get asHoursOrPercent():string { diff --git a/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts index a1f10065762f..721ffe353dd4 100644 --- a/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts +++ b/frontend/src/app/shared/components/fields/edit/field-types/project-edit-field.component.ts @@ -52,12 +52,11 @@ import { ResourceChangeset } from '../../changeset/resource-changeset'; import { IFieldSchema } from '../../field.base'; import { EditFieldHandler } from '../editing-portal/edit-field-handler'; import { HalResourceService } from 'core-app/features/hal/services/hal-resource.service'; -import { - take, - tap, -} from 'rxjs/operators'; +import { take, tap } from 'rxjs/operators'; import isNewResource from 'core-app/features/hal/helpers/is-new-resource'; import idFromLink from 'core-app/features/hal/helpers/id-from-link'; +import { IAPIFilter } from 'core-app/shared/components/autocompleter/op-autocompleter/typings'; +import { FilterOperator } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder'; @Component({ templateUrl: './project-edit-field.component.html', @@ -117,12 +116,12 @@ export class ProjectEditFieldComponent extends EditFieldComponent implements OnI public get APIFilters():IAPIFilter[] { const filters = [ - { name: 'active', operator: '=', values: ['t'] }, + { name: 'active', operator: '=' as FilterOperator, values: ['t'] }, ]; if (isNewResource(this.resource) && this.change.value('type')) { const typeId = idFromLink((this.change.value('type') as HalResource).href); - filters.push({ name: 'type_id', operator: '=', values: [typeId] }); + filters.push({ name: 'type_id', operator: '=' as FilterOperator, values: [typeId] }); } return filters; diff --git a/frontend/src/app/shared/components/fields/edit/field-types/te-work-package-edit-field.component.ts b/frontend/src/app/shared/components/fields/edit/field-types/te-work-package-edit-field.component.ts deleted file mode 100644 index 2b850bad15db..000000000000 --- a/frontend/src/app/shared/components/fields/edit/field-types/te-work-package-edit-field.component.ts +++ /dev/null @@ -1,137 +0,0 @@ -//-- copyright -// OpenProject is an open source project management software. -// Copyright (C) the OpenProject GmbH -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License version 3. -// -// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -// Copyright (C) 2006-2013 Jean-Philippe Lang -// Copyright (C) 2010-2013 the ChiliProject Team -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// See COPYRIGHT and LICENSE files for more details. -//++ - -import { Component } from '@angular/core'; -import { WorkPackageEditFieldComponent } from 'core-app/shared/components/fields/edit/field-types/work-package-edit-field.component'; -import { HalResource } from 'core-app/features/hal/resources/hal-resource'; -import idFromLink from 'core-app/features/hal/helpers/id-from-link'; -import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; -import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; -import { - TimeEntryWorkPackageAutocompleterComponent, - TimeEntryWorkPackageAutocompleterMode, -} from 'core-app/shared/components/autocompleter/te-work-package-autocompleter/te-work-package-autocompleter.component'; -import { ApiV3FilterBuilder } from 'core-app/shared/helpers/api-v3/api-v3-filter-builder'; -import { firstValueFrom } from 'rxjs'; - -const RECENT_TIME_ENTRIES_MAGIC_NUMBER = 30; - -@Component({ - templateUrl: './work-package-edit-field.component.html', -}) -export class TimeEntryWorkPackageEditFieldComponent extends WorkPackageEditFieldComponent { - @InjectField() apiV3Service:ApiV3Service; - - private recentWorkPackageIds:string[]; - - protected initialize() { - super.initialize(); - - // For reasons beyond me, the referenceOutputs variable is not defined at first when editing - // existing values. - if (this.referenceOutputs) { - this.referenceOutputs.modeSwitch = (mode:TimeEntryWorkPackageAutocompleterMode) => { - this.valuesLoaded = false; - const lastValue = this.requests.lastRequestedValue!; - - // Hack to provide a new value to "reset" the input. - // Only the second input is actually processed as the input is debounced. - this.requests.input$.next('_/&"()____'); - this.requests.input$.next(lastValue); - }; - } - } - - public autocompleterComponent() { - return TimeEntryWorkPackageAutocompleterComponent; - } - - // Although the schema states the work packages to not be required, - // as time entries can also be assigned to a project, we want to only assign - // time entries to work packages and thus require a value. - // The back end will have to be changed in due time but not as long as there is still a rails based - // time entry view in the application. - protected isRequired() { - return true; - } - - // We fetch the last RECENT_TIME_ENTRIES_MAGIC_NUMBER time entries by that user. We then use it to fetch the work packages - // associated with the time entries so that we have the most recent work packages the user logged time on. - // As a worst case, the user logged RECENT_TIME_ENTRIES_MAGIC_NUMBER times on one work package so we can not guarantee to actually have - // a fixed number returned. - protected loadAllowedValues(query?:string) { - if (!this.recentWorkPackageIds) { - return firstValueFrom( - this - .apiV3Service - .time_entries - .list({ - filters: [['user_id', '=', ['me']]], - sortBy: [['updated_at', 'desc']], - pageSize: RECENT_TIME_ENTRIES_MAGIC_NUMBER, - }), - ).then((collection) => { - this.recentWorkPackageIds = collection - .elements - .filter((timeEntry) => timeEntry.workPackage?.href) - .map((timeEntry) => idFromLink(timeEntry.workPackage.href)) - .filter((v, i, a) => a.indexOf(v) === i); - - return this.fetchAllowedValueQuery(query); - }); - } - return this.fetchAllowedValueQuery(query); - } - - protected allowedValuesFilter(query?:string):{} { - const filters:ApiV3FilterBuilder = new ApiV3FilterBuilder(); - - const isRecent = (this._autocompleterComponent as TimeEntryWorkPackageAutocompleterComponent).mode === 'recent'; - if (isRecent && this.recentWorkPackageIds.length > 0) { - filters.add('id', '=', this.recentWorkPackageIds); - } - - if (query) { - filters.add('subjectOrId', '**', [query]); - } - - return { filters: filters.toJson() }; - } - - protected sortValues(availableValues:HalResource[]) { - if ((this._autocompleterComponent as TimeEntryWorkPackageAutocompleterComponent).mode === 'recent') { - return this.sortValuesByRecentIds(availableValues); - } - return super.sortValues(availableValues); - } - - protected sortValuesByRecentIds(availableValues:HalResource[]) { - return availableValues - .sort((a, b) => this.recentWorkPackageIds.indexOf(a.id!) - this.recentWorkPackageIds.indexOf(b.id!)); - } -} diff --git a/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts b/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts index acdaa830097a..f001f0109158 100644 --- a/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts +++ b/frontend/src/app/shared/components/fields/edit/field/editable-attribute-field.component.ts @@ -184,6 +184,10 @@ export class EditableAttributeFieldComponent extends UntilDestroyedMixin impleme } public activateOnForm(noWarnings = false):Promise { + if (!this.isEditable) { + return Promise.reject(); + } + // Activate the field this.setActive(true); diff --git a/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts b/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts index 3e82790c099f..808efe5a46d3 100644 --- a/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts +++ b/frontend/src/app/shared/components/fields/macros/attribute-model-loader.service.ts @@ -99,7 +99,7 @@ export class AttributeModelLoaderService { .values$() .pipe( take(1), - tap((val) => console.log(`VAL ${val}`), (err) => console.error(`ERR ${err}`)), + tap({ next: (val) => console.log(`VAL ${val}`), error: (err) => console.error(`ERR ${err}`) }), ); } diff --git a/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.html b/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.html index 32fd8bd05d3f..0c8abdb01a0f 100644 --- a/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.html +++ b/frontend/src/app/shared/components/fields/macros/work-package-quickinfo-macro.html @@ -9,7 +9,7 @@ [displayFieldOptions]="{ writable: false }" fieldName="type"> - { - this.timeEntryEditService - .edit(loadedEntry) - .then((changedEntry) => { - const oldEntryIndex:number = this.entries.findIndex((el) => el.id === changedEntry.entry.id); - const newEntries = this.entries; - newEntries[oldEntryIndex] = changedEntry.entry; - - this.buildEntries(newEntries); - }) - .catch(() => { - // User canceled the modal - }); - }); + void this.turboRequests.request( + `${this.pathHelper.timeEntryEditDialog(entry.id as string)}`, + { method: 'GET' }, + ); } public deleteIfConfirmed(event:Event, entry:TimeEntryResource):void { @@ -184,7 +186,7 @@ export abstract class WidgetTimeEntriesListComponent extends AbstractWidgetCompo const sortedEntries = entries.sort((a, b) => b.spentOn.localeCompare(a.spentOn)); this.rows = []; - let currentDate:string|null = null; + let currentDate:string | null = null; sortedEntries.forEach((entry) => { if (entry.spentOn !== currentDate) { currentDate = entry.spentOn; @@ -214,4 +216,11 @@ export abstract class WidgetTimeEntriesListComponent extends AbstractWidgetCompo .schema .get(); } + + private handleDialogClose(event:CustomEvent):void { + const { detail: { dialog, submitted } } = event as { detail:{ dialog:HTMLDialogElement; submitted:boolean } }; + if (dialog.id === 'time-entry-dialog' && submitted) { + this.loadTimeEntries(); + } + } } diff --git a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html deleted file mode 100644 index 21552890a44e..000000000000 --- a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.html +++ /dev/null @@ -1,11 +0,0 @@ -
    - - -
    diff --git a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass deleted file mode 100644 index 0e0081401739..000000000000 --- a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.sass +++ /dev/null @@ -1,18 +0,0 @@ -@import "helpers" - -@keyframes fade-in-hover-card - from - opacity: 0 - to - opacity: 1 - -.op-hover-card - animation: fade-in-hover-card .25s ease-in - position: absolute - background-color: var(--body-background) - z-index: 5000 - width: 500px - box-shadow: var(--shadow-floating-medium) - pointer-events: all - padding: var(--overlay-paddingBlock-normal) - border-radius: var(--overlay-borderRadius) diff --git a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts b/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts deleted file mode 100644 index 619d9a7cbfab..000000000000 --- a/frontend/src/app/shared/components/modals/preview-modal/hover-card-modal/hover-card.modal.ts +++ /dev/null @@ -1,124 +0,0 @@ -//-- copyright -// OpenProject is an open source project management software. -// Copyright (C) the OpenProject GmbH -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License version 3. -// -// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -// Copyright (C) 2006-2013 Jean-Philippe Lang -// Copyright (C) 2010-2013 the ChiliProject Team -// -// This program is free software; you can redistribute it and/or -// modify it under the terms of the GNU General Public License -// as published by the Free Software Foundation; either version 2 -// of the License, or (at your option) any later version. -// -// This program is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// -// See COPYRIGHT and LICENSE files for more details. -//++ - -import { - ChangeDetectionStrategy, - ChangeDetectorRef, - Component, - ElementRef, - Inject, - Input, - OnInit, - ViewChild, -} from '@angular/core'; -import { OpModalComponent } from 'core-app/shared/components/modal/modal.component'; -import { OpModalLocalsToken } from 'core-app/shared/components/modal/modal.service'; -import { OpModalLocalsMap } from 'core-app/shared/components/modal/modal.types'; -import { - computePosition, - flip, - limitShift, - Placement, - shift, -} from '@floating-ui/dom'; -import { WorkPackageIsolatedQuerySpaceDirective } from 'core-app/features/work-packages/directives/query-space/wp-isolated-query-space.directive'; - -@Component({ - templateUrl: './hover-card.modal.html', - styleUrls: ['./hover-card.modal.sass'], - changeDetection: ChangeDetectionStrategy.OnPush, - hostDirectives: [WorkPackageIsolatedQuerySpaceDirective], -}) -export class HoverCardComponent extends OpModalComponent implements OnInit { - @ViewChild('turboFrame') - set turboFrame(frame:ElementRef|undefined) { - if (frame !== undefined) { - // When a new turbo frame is set, hide the modal until the frame is loaded. - // Since the size of the new content is unknown in advance, showing a loading indicator within the hover card - // leads to a bumpy result once the actual content is inserted and the card extends its dimensions. - this.setOpacity(this.elementRef, 0); - - frame.nativeElement?.addEventListener('turbo:frame-load', () => { - const modal = this.elementRef.nativeElement as HTMLElement; - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-explicit-any - void this.reposition(modal, this.locals.event.target as HTMLElement); - - // Content has been loaded, card has been positioned. Show it! - this.setOpacity(this.elementRef, 1); - }); - } - } - - turboFrameSrc:string; - - @Input() public alignment?:Placement = 'bottom-end'; - - @Input() public allowRepositioning? = true; - - constructor( - readonly elementRef:ElementRef, - @Inject(OpModalLocalsToken) readonly locals:OpModalLocalsMap, - readonly cdRef:ChangeDetectorRef, - ) { - super(locals, cdRef, elementRef); - } - - ngOnInit() { - super.ngOnInit(); - this.turboFrameSrc = this.locals.turboFrameSrc as string; - } - - public async reposition(element:HTMLElement, target:HTMLElement) { - const floatingEl = element.children[0] as HTMLElement; - const { x, y } = await computePosition( - target, - floatingEl, - { - placement: this.alignment, - middleware: this.allowRepositioning ? [ - flip({ - mainAxis: true, - crossAxis: true, - fallbackAxisSideDirection: 'start', - }), - shift({ limiter: limitShift() }), - ] : [], - }, - ); - Object.assign(floatingEl.style, { - left: `${x}px`, - top: `${y}px`, - }); - } - - private setOpacity(elementRef:ElementRef, opacity:number) { - const element = elementRef.nativeElement as HTMLElement; - - element.style.opacity = opacity.toString(); - } -} diff --git a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts index 89a8259fc5f0..c6561f7397e6 100644 --- a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts +++ b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-single-context-menu.ts @@ -1,6 +1,4 @@ -import { - Directive, ElementRef, Injector, Input, -} from '@angular/core'; +import { AfterViewInit, Directive, ElementRef, Injector, Input, OnDestroy } from '@angular/core'; import { StateService } from '@uirouter/core'; import { isClickedWithModifier } from 'core-app/shared/helpers/link-handling/link-handling'; import { AuthorisationService } from 'core-app/core/model-auth/model-auth.service'; @@ -14,28 +12,26 @@ import { PERMITTED_CONTEXT_MENU_ACTIONS } from 'core-app/shared/components/op-co import { OpModalService } from 'core-app/shared/components/modal/modal.service'; import { CopyToClipboardService } from 'core-app/shared/components/copy-to-clipboard/copy-to-clipboard.service'; import { WorkPackageAction } from 'core-app/features/work-packages/components/wp-table/context-menu-helper/wp-context-menu-helper.service'; -import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; -import { TimeEntryCreateService } from 'core-app/shared/components/time_entries/create/create.service'; import { WpDestroyModalComponent } from 'core-app/shared/components/modals/wp-destroy-modal/wp-destroy.modal'; import { WorkPackageAuthorization } from 'core-app/features/work-packages/services/work-package-authorization.service'; -import * as moment from 'moment-timezone'; import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; +import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; @Directive({ selector: '[wpSingleContextMenu]', }) -export class WorkPackageSingleContextMenuDirective extends OpContextMenuTrigger { +export class WorkPackageSingleContextMenuDirective extends OpContextMenuTrigger implements AfterViewInit, OnDestroy { @Input('wpSingleContextMenu-workPackage') public workPackage:WorkPackageResource; - @InjectField() public timeEntryCreateService:TimeEntryCreateService; - - constructor(readonly HookService:HookService, + constructor( + readonly HookService:HookService, readonly $state:StateService, readonly injector:Injector, readonly PathHelper:PathHelperService, readonly elementRef:ElementRef, readonly opModalService:OpModalService, readonly turboRequests:TurboRequestsService, + readonly apiV3Service:ApiV3Service, readonly opContextMenuService:OPContextMenuService, readonly authorisationService:AuthorisationService, protected copyToClipboardService:CopyToClipboardService, @@ -43,6 +39,17 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTrigger super(elementRef, opContextMenuService); } + private closeDialogHandler:EventListener = this.handleTimeEntryDialogClose.bind(this); + + ngAfterViewInit():void { + super.ngAfterViewInit(); + document.addEventListener('dialog:close', this.closeDialogHandler); + } + + ngOnDestroy():void { + document.removeEventListener('dialog:close', this.closeDialogHandler); + } + protected open(evt:JQuery.TriggeredEvent) { this.workPackage.project.$load().then(() => { this.authorisationService.initModelAuth('work_package', this.workPackage.$links); @@ -70,11 +77,7 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTrigger this.opModalService.show(WpDestroyModalComponent, this.injector, { workPackages: [this.workPackage] }); break; case 'log_time': - this.timeEntryCreateService - .create(moment(new Date()), this.workPackage, { showWorkPackageField: false }) - .catch(() => { - // do nothing, the user closed without changes - }); + void this.turboRequests.request(this.PathHelper.timeEntryWorkPackageDialog(this.workPackage.id as string), { method: 'GET' }); break; case 'generate_pdf': void this.turboRequests.requestStream(link as string); @@ -158,4 +161,15 @@ export class WorkPackageSingleContextMenuDirective extends OpContextMenuTrigger return this.items; } + + private handleTimeEntryDialogClose(event:CustomEvent):void { + const { detail: { dialog, submitted } } = event as { detail:{ dialog:HTMLDialogElement, submitted:boolean } }; + + if (dialog.id === 'time-entry-dialog' && submitted) { + void this.apiV3Service + .work_packages + .id(this.workPackage.id!) + .refresh(); + } + } } diff --git a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-view-context-menu.directive.ts b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-view-context-menu.directive.ts index 51357461b0c0..88a02f3050c5 100644 --- a/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-view-context-menu.directive.ts +++ b/frontend/src/app/shared/components/op-context-menu/wp-context-menu/wp-view-context-menu.directive.ts @@ -23,7 +23,7 @@ import { splitViewRoute } from 'core-app/features/work-packages/routing/split-vi import { WpDestroyModalComponent } from 'core-app/shared/components/modals/wp-destroy-modal/wp-destroy.modal'; import isNewResource from 'core-app/features/hal/helpers/is-new-resource'; import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; -import * as moment from 'moment-timezone'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; export class WorkPackageViewContextMenu extends OpContextMenuHandler { @InjectField() protected states!:States; @@ -42,6 +42,8 @@ export class WorkPackageViewContextMenu extends OpContextMenuHandler { @InjectField() protected pathHelper:PathHelperService; + @InjectField() protected turboRequests:TurboRequestsService; + protected workPackage = this.states.workPackages.get(this.workPackageId).value!; protected selectedWorkPackages = this.getSelectedWorkPackages(); @@ -160,11 +162,7 @@ export class WorkPackageViewContextMenu extends OpContextMenuHandler { } private logTimeForSelectedWorkPackage() { - this.timeEntryCreateService - .create(moment(new Date()), this.workPackage) - .catch(() => { - // do nothing, the user closed without changes - }); + void this.turboRequests.request(this.pathHelper.timeEntryWorkPackageDialog(this.workPackage.id as string), { method: 'GET' }); } private getSelectedWorkPackages() { @@ -183,7 +181,7 @@ export class WorkPackageViewContextMenu extends OpContextMenuHandler { protected buildItems():OpContextMenuItem[] { const items = this.permittedActions.map((action:WorkPackageAction) => ({ - class: undefined as string|undefined, + class: undefined as string | undefined, disabled: false, linkText: action.text, href: action.href, diff --git a/frontend/src/app/shared/components/principal/principal-renderer.service.ts b/frontend/src/app/shared/components/principal/principal-renderer.service.ts index 8c7565d15edf..13ba2461c891 100644 --- a/frontend/src/app/shared/components/principal/principal-renderer.service.ts +++ b/frontend/src/app/shared/components/principal/principal-renderer.service.ts @@ -118,6 +118,7 @@ export class PrincipalRendererService { if (!name.hide) { const el = this.renderName(principal, type, name.link, title || principal.name, name.classes); + this.setHoverCardAttributes(el, avatar, principal); container.appendChild(el); } } @@ -267,9 +268,7 @@ export class PrincipalRendererService { } } - element.classList.add('op-hover-card--preview-trigger'); - + element.setAttribute('data-hover-card-trigger-target', 'trigger'); element.setAttribute('data-hover-card-url', hoverCard.url); - element.setAttribute('data-hover-card-target', String(hoverCard.modalTarget || PortalOutletTarget.Default)); } } diff --git a/frontend/src/app/shared/components/principal/principal.component.ts b/frontend/src/app/shared/components/principal/principal.component.ts index 3d521120a7f1..4858f431bd5e 100644 --- a/frontend/src/app/shared/components/principal/principal.component.ts +++ b/frontend/src/app/shared/components/principal/principal.component.ts @@ -45,7 +45,6 @@ import { PrincipalLike } from './principal-types'; import { populateInputsFromDataset } from 'core-app/shared/components/dataset-inputs'; import { PrincipalType } from 'core-app/shared/components/principal/principal-helper'; import { PrincipalsResourceService } from 'core-app/core/state/principals/principals.service'; -import { PortalOutletTarget } from 'core-app/shared/components/modal/portal-outlet-target.enum'; export const principalSelector = 'op-principal'; @@ -78,7 +77,6 @@ export class OpPrincipalComponent implements OnInit { @Input() hoverCard= true; @Input() hoverCardUrl= ''; - @Input() hoverCardModalTarget:'default'|'custom' = 'default'; @Input() title = ''; @@ -105,8 +103,6 @@ export class OpPrincipalComponent implements OnInit { if (this.hoverCard) { avatarOptions.hoverCard = { url: this.hoverCardUrl, - modalTarget: this.hoverCardModalTarget === 'custom' - ? PortalOutletTarget.Custom : PortalOutletTarget.Default, }; } diff --git a/frontend/src/app/shared/components/time_entries/create/create.modal.ts b/frontend/src/app/shared/components/time_entries/create/create.modal.ts index 50d90c4493e6..2c6af23fb454 100644 --- a/frontend/src/app/shared/components/time_entries/create/create.modal.ts +++ b/frontend/src/app/shared/components/time_entries/create/create.modal.ts @@ -11,7 +11,6 @@ export const SHOW_USER_HOVER_CARD = new InjectionToken('SHOW_USER_HOVER_CARD'); changeDetection: ChangeDetectionStrategy.OnPush, providers: [ HalResourceEditingService, - { provide: SHOW_USER_HOVER_CARD, useValue: false }, ], }) export class TimeEntryCreateModalComponent extends TimeEntryBaseModal { diff --git a/frontend/src/app/shared/components/time_entries/create/create.service.ts b/frontend/src/app/shared/components/time_entries/create/create.service.ts index 607f27213a11..53021101da2c 100644 --- a/frontend/src/app/shared/components/time_entries/create/create.service.ts +++ b/frontend/src/app/shared/components/time_entries/create/create.service.ts @@ -67,6 +67,7 @@ export class TimeEntryCreateService { public createNewTimeEntry(date:Moment, wp?:WorkPackageResource, ongoing = false):Observable { const payload:any = { spentOn: date.format('YYYY-MM-DD'), + hours: null, ongoing, }; diff --git a/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts b/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts index 8f8a6b83795f..1d4bde0ea50e 100644 --- a/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts +++ b/frontend/src/app/shared/components/time_entries/edit/trigger-actions-entry.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Injector } from '@angular/core'; import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; -import { TimeEntryEditService } from 'core-app/shared/components/time_entries/edit/edit.service'; import { I18nService } from 'core-app/core/i18n/i18n.service'; import { ToastService } from 'core-app/shared/components/toaster/toast.service'; import { @@ -9,6 +8,8 @@ import { import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; import { TimeEntryResource } from 'core-app/features/hal/resources/time-entry-resource'; import { Observable, switchMap } from 'rxjs'; +import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; @Component({ selector: 'opce-time-entry-trigger-actions', @@ -27,12 +28,11 @@ import { Observable, switchMap } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, providers: [ HalResourceEditingService, - TimeEntryEditService, + PathHelperService, + TurboRequestsService, ], }) export class TriggerActionsEntryComponent { - @InjectField() readonly timeEntryEditService:TimeEntryEditService; - @InjectField() readonly apiv3Service:ApiV3Service; @InjectField() readonly toastService:ToastService; @@ -43,6 +43,10 @@ export class TriggerActionsEntryComponent { @InjectField() readonly cdRef:ChangeDetectorRef; + @InjectField() readonly pathHelper:PathHelperService; + + @InjectField() readonly turboRequestService:TurboRequestsService; + public text = { edit: this.i18n.t('js.button_edit'), delete: this.i18n.t('js.button_delete'), @@ -54,18 +58,18 @@ export class TriggerActionsEntryComponent { } editTimeEntry() { - void this - .loadEntry() - .subscribe((entry) => { - this.timeEntryEditService - .edit(entry) - .then(() => { - window.location.reload(); - }) - .catch(() => { - // User canceled the modal - }); + void this.loadEntry().subscribe((entry:TimeEntryResource) => { + document.addEventListener('dialog:close', (event:CustomEvent) => { + const { detail: { dialog, submitted } } = event as { detail:{ dialog:HTMLDialogElement, submitted:boolean } }; + if (dialog.id === 'time-entry-dialog' && submitted) { + window.location.reload(); + } }); + void this.turboRequestService.request( + this.pathHelper.timeEntryEditDialog(entry.id as string), + { method: 'GET' }, + ); + }); } deleteTimeEntry() { diff --git a/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts b/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts index 995078e0ab6d..b6a99581400f 100644 --- a/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts +++ b/frontend/src/app/shared/components/time_entries/timer/timer-account-menu.component.ts @@ -4,6 +4,7 @@ import { Component, ElementRef, HostBinding, + Injector, OnInit, ViewEncapsulation, } from '@angular/core'; @@ -27,6 +28,9 @@ import { HalResourceEditingService } from '../../fields/edit/services/hal-resour import { SchemaCacheService } from 'core-app/core/schemas/schema-cache.service'; import { TimezoneService } from 'core-app/core/datetime/timezone.service'; import { ToastService } from 'core-app/shared/components/toaster/toast.service'; +import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; +import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; export const timerAccountSelector = 'op-timer-account-menu'; @@ -41,6 +45,8 @@ export const timerAccountSelector = 'op-timer-account-menu'; }) export class TimerAccountMenuComponent extends UntilDestroyedMixin implements OnInit { @HostBinding('class.op-timer-account-menu') className = true; + @InjectField() PathHelper:PathHelperService; + @InjectField() TurboRequests:TurboRequestsService; timer$ = this.timeEntryService.activeTimer$; @@ -58,6 +64,7 @@ export class TimerAccountMenuComponent extends UntilDestroyedMixin implements On }; constructor( + readonly injector:Injector, readonly elementRef:ElementRef, readonly timeEntryService:TimeEntryTimerService, readonly cdRef:ChangeDetectorRef, @@ -84,10 +91,14 @@ export class TimerAccountMenuComponent extends UntilDestroyedMixin implements On public async stopTimer():Promise { const active = await firstValueFrom(this.timeEntryService.refresh()); + if (!active) { return this.toastService.addWarning(this.text.timer_already_stopped); } - return this.timeEntryEditService.stopTimerAndEdit(active); + return this.TurboRequests.request( + `${this.PathHelper.timeEntryEditDialog(active.id as string)}`, + { method: 'GET' }, + ); } } diff --git a/frontend/src/app/shared/components/user-link/user-link.component.ts b/frontend/src/app/shared/components/user-link/user-link.component.ts index 20e51a9fa3d9..e94028078448 100644 --- a/frontend/src/app/shared/components/user-link/user-link.component.ts +++ b/frontend/src/app/shared/components/user-link/user-link.component.ts @@ -29,11 +29,14 @@ import { ChangeDetectionStrategy, Component, Input } from '@angular/core'; import { UserResource } from 'core-app/features/hal/resources/user-resource'; import { I18nService } from 'core-app/core/i18n/i18n.service'; +import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; @Component({ selector: 'op-user-link', template: `     @@ -47,7 +50,7 @@ import { I18nService } from 'core-app/core/i18n/i18n.service'; export class UserLinkComponent { @Input() user:UserResource; - constructor(readonly I18n:I18nService) { + constructor(readonly I18n:I18nService, readonly pathHelperService:PathHelperService) { } public get href() { @@ -61,4 +64,8 @@ export class UserLinkComponent { public get label() { return this.I18n.t('js.label_author', { user: this.name }); } + + public get hoverCardUrl() { + return this.user && this.user.id && this.pathHelperService.userHoverCardPath(this.user.id); + } } diff --git a/frontend/src/app/shared/helpers/chronic_duration.js b/frontend/src/app/shared/helpers/chronic_duration.js index 9689a5390db2..de4fac624ff2 100644 --- a/frontend/src/app/shared/helpers/chronic_duration.js +++ b/frontend/src/app/shared/helpers/chronic_duration.js @@ -143,8 +143,14 @@ function calculateFromWords(string, opts) { } // Parse 3:41:59 and return 3 hours 41 minutes 59 seconds -function filterByType(string) { - const chronoUnitsList = DURATION_UNITS_LIST.filter((v) => v !== 'weeks'); +function filterByType(string, opts) { + const chronoUnitsList = DURATION_UNITS_LIST.filter(function (value) { + if (value === "weeks") { return false } + if (opts.ignoreSecondsWhenColonSeperated && value === "seconds") { return false } + + return true + }); + if ( string .replace(/ +/g, '') @@ -196,7 +202,7 @@ function filterThroughWhiteList(string, opts) { function cleanup(string, opts) { let res = string.toLowerCase(); - res = filterByType(res); + res = filterByType(res, opts); res = res .replace(FLOAT_MATCHER, (n) => ` ${n} `) .replace(/ +/g, ' ') diff --git a/frontend/src/app/shared/helpers/chronic_duration.spec.ts b/frontend/src/app/shared/helpers/chronic_duration.spec.ts index ae44d959927f..8946fbb98484 100644 --- a/frontend/src/app/shared/helpers/chronic_duration.spec.ts +++ b/frontend/src/app/shared/helpers/chronic_duration.spec.ts @@ -151,6 +151,17 @@ describe('parseChronicDuration', () => { ); }); }); + + describe('with .ignoreSecondsWhenColonSeperated param', () => { + it('parses 8:15 to 8 hours 15 minutes when seconds are ignored', () => { + expect(parseChronicDuration('8:15', { ignoreSecondsWhenColonSeperated: true })).toBe(8 * 3600 + 15 * 60); + }); + + it('parses 8:15 to 8 minutes 15 seconds when seconds are not ignored', () => { + expect(parseChronicDuration('8:15')).toBe(8 * 60 + 15); + }); + + }); }); describe('outputChronicDuration', () => { diff --git a/frontend/src/assets/images/15_2_features.svg b/frontend/src/assets/images/15_2_features.svg deleted file mode 100644 index 5916a8359d7f..000000000000 --- a/frontend/src/assets/images/15_2_features.svg +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/frontend/src/assets/images/15_3_features.svg b/frontend/src/assets/images/15_3_features.svg new file mode 100644 index 000000000000..37b9f4bc2814 --- /dev/null +++ b/frontend/src/assets/images/15_3_features.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/frontend/src/global_styles/content/_datepicker.sass b/frontend/src/global_styles/content/_datepicker.sass index 736890379269..dc40f90109d8 100644 --- a/frontend/src/global_styles/content/_datepicker.sass +++ b/frontend/src/global_styles/content/_datepicker.sass @@ -52,10 +52,6 @@ $datepicker--selected-border-radius: 5px .flatpickr-current-month display: flex !important -.flatpickr-calendar .numInputWrapper - position: fixed - left: 65% - .flatpickr-prev-month, .flatpickr-next-month svg:hover fill: var(--control-checked-color) !important diff --git a/frontend/src/global_styles/content/_forms.sass b/frontend/src/global_styles/content/_forms.sass index 6598d59069e5..9fb3f62243a1 100644 --- a/frontend/src/global_styles/content/_forms.sass +++ b/frontend/src/global_styles/content/_forms.sass @@ -967,3 +967,7 @@ input[type=date], input[type=time] display: inline-block width: 100% overflow: auto + +.form-autocompleter-container + display: grid + grid-template-columns: minmax(0, auto) diff --git a/frontend/src/app/features/work-packages/components/work-package-comment/wp-comment-field.component.ts b/frontend/src/global_styles/content/_hover_cards.sass similarity index 59% rename from frontend/src/app/features/work-packages/components/work-package-comment/wp-comment-field.component.ts rename to frontend/src/global_styles/content/_hover_cards.sass index 92cc99d2ea70..6487295d7934 100644 --- a/frontend/src/app/features/work-packages/components/work-package-comment/wp-comment-field.component.ts +++ b/frontend/src/global_styles/content/_hover_cards.sass @@ -26,28 +26,29 @@ // See COPYRIGHT and LICENSE files for more details. //++ -import { ConfigurationService } from 'core-app/core/config/configuration.service'; -import { Component, OnInit } from '@angular/core'; -import { - FormattableEditFieldComponent, -} from 'core-app/shared/components/fields/edit/field-types/formattable-edit-field/formattable-edit-field.component'; -import { InjectField } from 'core-app/shared/helpers/angular/inject-field.decorator'; +#hover-card-overlay + display: none -@Component({ - templateUrl: '../../../../shared/components/fields/edit/field-types/formattable-edit-field/formattable-edit-field.component.html', -}) -export class WorkPackageCommentFieldComponent extends FormattableEditFieldComponent implements OnInit { - public isBusy = false; + &:has(.op-hover-card) + display: flex + flex-direction: column-reverse - public name = 'comment'; +@keyframes fade-in-hover-card + from + opacity: 0 + to + opacity: 1 - @InjectField() public ConfigurationService:ConfigurationService; +.op-hover-card + inset: unset // needed to position the popover freely on the page + border: none // override the default border for popovers + animation: fade-in-hover-card .25s ease-in + background-color: var(--body-background) + width: 500px + box-shadow: var(--shadow-floating-medium) + padding: var(--overlay-paddingBlock-normal) + border-radius: var(--overlay-borderRadius) + opacity: 0 - public get required() { - return true; - } - - ngOnInit() { - super.ngOnInit(); - } -} + &:popover-open + opacity: 1 diff --git a/frontend/src/global_styles/content/_index.sass b/frontend/src/global_styles/content/_index.sass index 5e3ab924f63c..78e2d636c3a8 100644 --- a/frontend/src/global_styles/content/_index.sass +++ b/frontend/src/global_styles/content/_index.sass @@ -2,7 +2,6 @@ @import accounts_mobile @import api_docs @import avatar -@import augmented @import badges @import blockquotes @import context_menu @@ -66,6 +65,7 @@ @import hide_section @import hide_until_initialized @import hidden +@import hover_cards @import search @import security_badge @import contextual diff --git a/frontend/src/global_styles/content/_projects_autocomplete_with_search_icon.sass b/frontend/src/global_styles/content/_projects_autocomplete_with_search_icon.sass index 5217245665e0..432ddf054c75 100644 --- a/frontend/src/global_styles/content/_projects_autocomplete_with_search_icon.sass +++ b/frontend/src/global_styles/content/_projects_autocomplete_with_search_icon.sass @@ -10,3 +10,6 @@ &:before @include icon-font-common padding-left: 10px + // Reduce width of search icon from width of ng-container value which is calc(100% - 30px) + .ng-value-container + width: calc(100% - 60px) diff --git a/frontend/src/global_styles/content/editor/_ckeditor.sass b/frontend/src/global_styles/content/editor/_ckeditor.sass index 4994efe97520..18d19c467b41 100644 --- a/frontend/src/global_styles/content/editor/_ckeditor.sass +++ b/frontend/src/global_styles/content/editor/_ckeditor.sass @@ -10,8 +10,8 @@ @include op-uc-table-header-styles // Wrapper for full text element -opce-ckeditor-augmented-textarea .op-ckeditor--wrapper - margin-bottom: 2rem +opce-ckeditor-augmented-textarea .op-ckeditor--attachments + margin-top: 2rem // Ensure same border and min-height for preview .ck-content, diff --git a/frontend/src/global_styles/openproject.sass b/frontend/src/global_styles/openproject.sass index bcede07f87ec..027aec2d4cf6 100644 --- a/frontend/src/global_styles/openproject.sass +++ b/frontend/src/global_styles/openproject.sass @@ -23,6 +23,7 @@ @import "../../../modules/overviews/app/components/_index.sass" @import "../../../modules/storages/app/components/_index.sass" @import "../../../modules/auth_saml/app/components/_index.sass" +@import "../../../modules/costs/app/components/_index.sass" // Component specific Styles @import "../../../app/components/_index.sass" diff --git a/frontend/src/global_styles/openproject/_forms.sass b/frontend/src/global_styles/openproject/_forms.sass index 7279a9b0b2cf..38c0f64a858d 100644 --- a/frontend/src/global_styles/openproject/_forms.sass +++ b/frontend/src/global_styles/openproject/_forms.sass @@ -163,3 +163,11 @@ select &>option background-color: var(--body-background) + +input[type="number"] + -moz-appearance: textfield + + &::-webkit-inner-spin-button, + &::-webkit-outer-spin-button + -webkit-appearance: none + margin: 0 diff --git a/frontend/src/global_styles/content/_augmented.sass b/frontend/src/global_styles/openproject/_gap.scss similarity index 70% rename from frontend/src/global_styles/content/_augmented.sass rename to frontend/src/global_styles/openproject/_gap.scss index 306dc5d35eb5..9925956de44e 100644 --- a/frontend/src/global_styles/content/_augmented.sass +++ b/frontend/src/global_styles/openproject/_gap.scss @@ -26,5 +26,19 @@ // See COPYRIGHT and LICENSE files for more details. //++ -.autocomplete-select-decoration--wrapper - position: relative +// copied from https://github.com/primer/css/blob/main/src/support/variables/layout.scss +$spacer-map-rem: ( + 0: 0, + 1: var(--base-size-4, 4px), + 2: var(--base-size-8, 8px), + 3: var(--base-size-16, 16px), + 4: var(--base-size-24, 24px), + 5: var(--base-size-32, 32px), + 6: var(--base-size-40, 40px), +) !default; + +@each $scale, $size in $spacer-map-rem { + .gap-#{$scale} { gap: $size !important; } + .row-gap-#{$scale} { row-gap: $size !important; } + .column-gap-#{$scale} { column-gap: $size !important; } +} diff --git a/frontend/src/global_styles/openproject/_index.sass b/frontend/src/global_styles/openproject/_index.sass index 85db8b17cf31..c689b5d4bcf3 100644 --- a/frontend/src/global_styles/openproject/_index.sass +++ b/frontend/src/global_styles/openproject/_index.sass @@ -7,6 +7,7 @@ @import generic @import base @import forms +@import gap @import mixins @import onboarding diff --git a/frontend/src/stimulus/controllers/disable-when-checked.controller.ts b/frontend/src/stimulus/controllers/disable-when-checked.controller.ts index ed67ca2cdf00..716047e7a1fa 100644 --- a/frontend/src/stimulus/controllers/disable-when-checked.controller.ts +++ b/frontend/src/stimulus/controllers/disable-when-checked.controller.ts @@ -13,12 +13,14 @@ export default class OpDisableWhenCheckedController extends ApplicationControlle declare readonly effectTargets:HTMLInputElement[]; + private boundListener = this.toggleDisabled.bind(this); + causeTargetConnected(target:HTMLElement) { - target.addEventListener('change', this.toggleDisabled.bind(this)); + target.addEventListener('change', this.boundListener); } causeTargetDisconnected(target:HTMLElement) { - target.removeEventListener('change', this.toggleDisabled.bind(this)); + target.removeEventListener('change', this.boundListener); } private toggleDisabled(evt:InputEvent):void { diff --git a/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts b/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts index 661600cbf038..fb3705db770a 100644 --- a/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts +++ b/frontend/src/stimulus/controllers/dynamic/filter/filters-form.controller.ts @@ -88,9 +88,11 @@ export default class FiltersFormController extends Controller { declare performTurboRequestsValue:boolean; declare readonly clearButtonIdValue:string; + private boundListener = this.sendForm.bind(this); + initialize() { // Initialize runs anytime an element with a controller connected to the DOM for the first time - this.sendForm = debounce(this.sendForm.bind(this), 300); + this.sendForm = debounce(this.boundListener, 300); this.autoReloadTargets = [ ...this.simpleValueTargets, ...this.operatorTargets, @@ -113,9 +115,9 @@ export default class FiltersFormController extends Controller { if (this.performTurboRequestsValue) { this.autoReloadTargets.forEach((target) => { if (target instanceof HTMLInputElement) { - target.addEventListener('input', this.sendForm.bind(this)); + target.addEventListener('input', this.boundListener); } else { - target.addEventListener('change', this.sendForm.bind(this)); + target.addEventListener('change', this.boundListener); } }); } @@ -130,9 +132,9 @@ export default class FiltersFormController extends Controller { if (this.performTurboRequestsValue) { this.autoReloadTargets.forEach((target) => { if (target instanceof HTMLInputElement) { - target.removeEventListener('input', this.sendForm.bind(this)); + target.removeEventListener('input', this.boundListener); } else { - target.removeEventListener('change', this.sendForm.bind(this)); + target.removeEventListener('change', this.boundListener); } }); } diff --git a/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts b/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts index 09c51ef995f0..6b525477046f 100644 --- a/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts +++ b/frontend/src/stimulus/controllers/dynamic/overview/project-life-cycles-form.controller.ts @@ -28,25 +28,16 @@ * ++ */ -import { Controller } from '@hotwired/stimulus'; - -export default class ProjectLifeCyclesFormController extends Controller { - static targets = ['form']; - - declare readonly formTarget:HTMLFormElement; +import FormPreviewController from '../../form-preview.controller'; +export default class ProjectLifeCyclesFormController extends FormPreviewController { previewForm(event:Event) { const target = event.target as HTMLElement; - const previewUrl = this.formTarget.dataset.previewUrl; - - if (!previewUrl || this.datePickerVisible(target)) { + if (this.datePickerVisible(target)) { return; // flatpickr is still open, do not submit yet. } - const form = this.formTarget; - form.action = previewUrl; - - form.requestSubmit(); + void this.submit(); } datePickerVisible(element:HTMLElement) { diff --git a/frontend/src/stimulus/controllers/dynamic/projects/settings/border-box-filter.controller.ts b/frontend/src/stimulus/controllers/dynamic/projects/settings/border-box-filter.controller.ts index 6a6381432926..364d151e1b1a 100644 --- a/frontend/src/stimulus/controllers/dynamic/projects/settings/border-box-filter.controller.ts +++ b/frontend/src/stimulus/controllers/dynamic/projects/settings/border-box-filter.controller.ts @@ -32,10 +32,10 @@ import FilterListController from '../../filter/filter-list.controller'; export default class extends FilterListController { static targets = [ - 'bulkActionContainer', + 'hideWhenFiltering', ]; - declare readonly bulkActionContainerTargets:HTMLInputElement[]; + declare readonly hideWhenFilteringTargets:HTMLInputElement[]; filterLists() { const query = this.filterTarget.value.toLowerCase(); @@ -56,13 +56,13 @@ export default class extends FilterListController { } hideBulkActionContainers() { - this.bulkActionContainerTargets.forEach((item) => { + this.hideWhenFilteringTargets.forEach((item) => { this.setVisibility(item, false); }); } showBulkActionContainers() { - this.bulkActionContainerTargets.forEach((item) => { + this.hideWhenFilteringTargets.forEach((item) => { this.setVisibility(item, true); }); } diff --git a/frontend/src/stimulus/controllers/dynamic/projects/zen-mode.controller.ts b/frontend/src/stimulus/controllers/dynamic/projects/zen-mode.controller.ts index b512dbc6b20f..049063aaac5a 100644 --- a/frontend/src/stimulus/controllers/dynamic/projects/zen-mode.controller.ts +++ b/frontend/src/stimulus/controllers/dynamic/projects/zen-mode.controller.ts @@ -6,13 +6,15 @@ export default class OpProjectsZenModeController extends ApplicationController { declare readonly buttonTarget:HTMLElement; + private boundHandler = this.fullscreenChangeEventHandler.bind(this); + connect() { - document.addEventListener('fullscreenchange', this.fullscreenChangeEventHandler.bind(this)); + document.addEventListener('fullscreenchange', this.boundHandler); } disconnect() { super.disconnect(); - document.removeEventListener('fullscreenchange', this.fullscreenChangeEventHandler.bind(this)); + document.removeEventListener('fullscreenchange', this.boundHandler); } fullscreenChangeEventHandler() { diff --git a/frontend/src/stimulus/controllers/dynamic/shares/user-selected.controller.ts b/frontend/src/stimulus/controllers/dynamic/shares/user-selected.controller.ts index c1a0e0887751..92394ac557ab 100644 --- a/frontend/src/stimulus/controllers/dynamic/shares/user-selected.controller.ts +++ b/frontend/src/stimulus/controllers/dynamic/shares/user-selected.controller.ts @@ -43,12 +43,14 @@ export default class UserSelectedController extends Controller { private selectedValues:IUserAutocompleteItem[] = []; + private boundListener = this.handleValueSelected.bind(this); + connect() { - this.autocompleterElement.addEventListener('change', this.handleValueSelected.bind(this)); + this.autocompleterElement.addEventListener('change', this.boundListener); } disconnect() { - this.autocompleterElement.removeEventListener('change', this.handleValueSelected.bind(this)); + this.autocompleterElement.removeEventListener('change', this.boundListener); } ensureUsersSelected(evt:CustomEvent):void { diff --git a/frontend/src/stimulus/controllers/dynamic/time-entry.controller.ts b/frontend/src/stimulus/controllers/dynamic/time-entry.controller.ts new file mode 100644 index 000000000000..aaa05e598a73 --- /dev/null +++ b/frontend/src/stimulus/controllers/dynamic/time-entry.controller.ts @@ -0,0 +1,199 @@ +/* + * -- copyright + * OpenProject is an open source project management software. + * Copyright (C) the OpenProject GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See COPYRIGHT and LICENSE files for more details. + * ++ + */ + +import { Controller } from '@hotwired/stimulus'; +import { + parseChronicDuration, + outputChronicDuration, +} from 'core-app/shared/helpers/chronic_duration'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; +import { PathHelperService } from 'core-app/core/path-helper/path-helper.service'; + +export default class TimeEntryController extends Controller { + static targets = ['startTimeInput', 'endTimeInput', 'hoursInput', 'form']; + + declare readonly formTarget:HTMLFormElement; + declare readonly startTimeInputTarget:HTMLInputElement; + declare readonly hasStartTimeInputTarget:boolean; + declare readonly endTimeInputTarget:HTMLInputElement; + declare readonly hasEndTimeInputTarget:boolean; + declare readonly hoursInputTarget:HTMLInputElement; + declare oldWorkPackageId:string; + + private turboRequests:TurboRequestsService; + private pathHelper:PathHelperService; + + async connect() { + const context = await window.OpenProject.getPluginContext(); + this.turboRequests = context.services.turboRequests; + this.pathHelper = context.services.pathHelperService; + + const workPackageAutocompleter = document.querySelector('opce-autocompleter[data-input-name*="time_entry[work_package_id]"]'); + if (workPackageAutocompleter) { + this.oldWorkPackageId = (workPackageAutocompleter as HTMLElement).dataset.inputValue || ''; + } + } + + userChanged(event:InputEvent) { + const userId = (event.currentTarget as HTMLInputElement).value; + void this.turboRequests.request( + this.pathHelper.timeEntriesUserTimezoneCaption(userId), + { method: 'GET' }, + ); + } + + workPackageChanged(event:InputEvent) { + const target = event.currentTarget as HTMLInputElement; + const newValue = target.value; + + if (this.oldWorkPackageId !== newValue) { + this.oldWorkPackageId = newValue; + + const url = this.formTarget.dataset.refreshFormUrl as string; + const csrfToken = document.querySelector('meta[name="csrf-token"]')?.content || ''; + const formData = new FormData(this.formTarget); + formData.delete('_method'); // remove the override method as this will submit to the wrong action + void this.turboRequests.request(url, { + method: 'post', + body: formData, + headers: { + 'X-CSRF-Token': csrfToken, + }, + }); + } + } + + timeInputChanged(event:InputEvent) { + this.datesChanged(event.currentTarget as HTMLInputElement); + } + + parsedHourInput():number { + const normalizedValue = this.hoursInputTarget.value.replace(',', '.'); + return parseChronicDuration(normalizedValue, { + defaultUnit: 'hours', + ignoreSecondsWhenColonSeperated: true, + }) || 0; + } + + datesChanged(initiatedBy:HTMLInputElement) { + if (!this.hasStartTimeInputTarget || !this.hasEndTimeInputTarget) { + return; + } + + // The time entry input fields are currently not valid, so we do not need to calculate anything. + // A time entry input field is invalid when it is only partially filled out. + if (!this.startTimeInputTarget.checkValidity() || !this.endTimeInputTarget.checkValidity()) { + return; + } + + // when we have reset one of the input fields for start- or end-time, we want to unset both fields + if ((initiatedBy === this.startTimeInputTarget && this.startTimeInputTarget.value === '') || (initiatedBy === this.endTimeInputTarget && this.endTimeInputTarget.value === '')) { + this.startTimeInputTarget.value = ''; + this.endTimeInputTarget.value = ''; + this.toggleEndTimePlusCaption(0, 0); + return; + } + + const startTimeParts = this.startTimeInputTarget.value.split(':'); + const endTimeParts = this.endTimeInputTarget.value.split(':'); + + const startTimeInMinutes = parseInt(startTimeParts[0], 10) * 60 + parseInt(startTimeParts[1], 10); + const endTimeInMinutes = parseInt(endTimeParts[0], 10) * 60 + parseInt(endTimeParts[1], 10); + let hoursInMinutes = Math.round(this.parsedHourInput() / 60); + + // We calculate the hours field if: + // - We have start & end time and no hours + // - We have start & end time and we have triggered the change from the end time field + if (startTimeInMinutes && endTimeInMinutes && (hoursInMinutes === 0 || initiatedBy === this.endTimeInputTarget)) { + let exisitingDayGap = 0; + + // when we already had hours set, and they were above 24 hours, we would most likely want to stay on that end date + if (hoursInMinutes >= 24 * 60) { + exisitingDayGap = Math.floor(hoursInMinutes / (24 * 60)) * (60 * 24); + } + + hoursInMinutes = endTimeInMinutes - startTimeInMinutes; + if (hoursInMinutes <= 0) { + hoursInMinutes += 24 * 60; + } + + hoursInMinutes += exisitingDayGap; + + const formattedHours = outputChronicDuration(hoursInMinutes * 60, { format: 'hours_only' }) || ''; + this.hoursInputTarget.value = formattedHours; + } else if (startTimeInMinutes && hoursInMinutes) { + const newEndTime = (startTimeInMinutes + hoursInMinutes) % (24 * 60); + + this.endTimeInputTarget.value = [ + Math.floor(newEndTime / 60).toString().padStart(2, '0'), + Math.round(newEndTime % 60).toString().padStart(2, '0'), + ].join(':'); + } else if (endTimeInMinutes && hoursInMinutes) { + const newStartTime = (endTimeInMinutes - hoursInMinutes) % (24 * 60); + + this.startTimeInputTarget.value = [ + Math.floor(newStartTime / 60).toString().padStart(2, '0'), + Math.round(newStartTime % 60).toString().padStart(2, '0'), + ].join(':'); + } + + this.toggleEndTimePlusCaption(startTimeInMinutes, hoursInMinutes); + } + + hoursChanged() { + // Parse input through our chronic duration parser and then reformat as hours that can be nicely parsed on the + // backend + const hours = this.parsedHourInput(); + this.hoursInputTarget.value = outputChronicDuration(hours, { format: 'hours_only' }) || ''; + + this.datesChanged(this.hoursInputTarget); + } + + hoursKeyEnterPress(event:KeyboardEvent) { + if (event.currentTarget instanceof HTMLInputElement) { + event.currentTarget.blur(); + } + } + + toggleEndTimePlusCaption(startTimeInMinutes:number, hoursInMinutes:number) { + const formControl = this.endTimeInputTarget.closest('.FormControl') as HTMLElement; + formControl + .querySelectorAll('.FormControl-caption') + .forEach((caption) => caption.remove()); + + if (startTimeInMinutes + hoursInMinutes >= 24 * 60) { + const diffInDays = Math.floor((startTimeInMinutes + hoursInMinutes) / (60 * 24)); + const span = document.createElement('span'); + span.className = 'FormControl-caption'; + span.innerText = `+${diffInDays === 1 ? I18n.t('js.units.day.one') : I18n.t('js.units.day.other', { count: diffInDays })}`; + formControl.append(span); + } + } +} diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts index 22b425064386..ad250cfe7998 100644 --- a/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts +++ b/frontend/src/stimulus/controllers/dynamic/work-packages/activities-tab/index.controller.ts @@ -5,15 +5,21 @@ import { import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; import { ApiV3Service } from 'core-app/core/apiv3/api-v3.service'; +enum AnchorType { + Comment = 'comment', + Activity = 'activity', +} + interface CustomEventWithIdParam extends Event { params:{ id:string; + anchorName:AnchorType; }; } export default class IndexController extends Controller { static values = { - updateStreamsUrl: String, + updateStreamsPath: String, sorting: String, pollingIntervalInMs: Number, filter: String, @@ -24,15 +30,18 @@ export default class IndexController extends Controller { showConflictFlashMessageUrl: String, }; - static targets = ['journalsContainer', 'buttonRow', 'formRow', 'form', 'reactionButton']; + static targets = ['journalsContainer', 'buttonRow', 'formRow', 'form', 'formSubmitButton', 'reactionButton']; declare readonly journalsContainerTarget:HTMLElement; declare readonly buttonRowTarget:HTMLInputElement; declare readonly formRowTarget:HTMLElement; declare readonly formTarget:HTMLFormElement; + declare readonly formSubmitButtonTarget:HTMLButtonElement; declare readonly reactionButtonTargets:HTMLElement[]; - declare updateStreamsUrlValue:string; + declare readonly hasFormSubmitButtonTarget:boolean; + + declare updateStreamsPathValue:string; declare sortingValue:string; declare lastServerTimestampValue:string; declare intervallId:number; @@ -74,6 +83,7 @@ export default class IndexController extends Controller { this.setLatestKnownChangesetUpdatedAt(); this.startPolling(); + this.setCssClasses(); } disconnect() { @@ -194,7 +204,8 @@ export default class IndexController extends Controller { } private prepareUpdateStreamsUrl():string { - const url = new URL(this.updateStreamsUrlValue); + const baseUrl = window.location.origin; + const url = new URL(this.updateStreamsPathValue, baseUrl); url.searchParams.set('sortBy', this.sortingValue); url.searchParams.set('filter', this.filterValue); url.searchParams.set('last_update_timestamp', this.lastServerTimestampValue); @@ -347,17 +358,19 @@ export default class IndexController extends Controller { } private handleInitialScroll() { - if (window.location.hash.includes('#activity-')) { - const activityId = window.location.hash.replace('#activity-', ''); - this.scrollToActivity(activityId); - } else if (this.sortingValue === 'asc') { + const anchorTypeRegex = new RegExp(`#(${AnchorType.Comment}|${AnchorType.Activity})-(\\d+)`, 'i'); + const activityIdMatch = window.location.hash.match(anchorTypeRegex); // Ex. [ "#comment-80", "comment", "80" ] + + if (activityIdMatch && activityIdMatch.length === 3) { + this.scrollToActivity(activityIdMatch[1] as AnchorType, activityIdMatch[2]); + } else if (this.sortingValue === 'asc' && (!this.isMobile() || this.isWithinNotificationCenter())) { this.scrollToBottom(); } } - private tryScroll(activityId:string, attempts:number, maxAttempts:number) { + private tryScroll(activityAnchorName:AnchorType, activityId:string, attempts:number, maxAttempts:number) { const scrollableContainer = this.getScrollableContainer(); - const activityElement = document.getElementById(`activity-anchor-${activityId}`); + const activityElement = this.getActivityAnchorElement(activityAnchorName, activityId); const topPadding = 70; if (activityElement && scrollableContainer) { @@ -371,16 +384,16 @@ export default class IndexController extends Controller { scrollableContainer.scrollTop = relativeTop - topPadding; }, 50); } else if (attempts < maxAttempts) { - setTimeout(() => this.tryScroll(activityId, attempts + 1, maxAttempts), 1000); + setTimeout(() => this.tryScroll(activityAnchorName, activityId, attempts + 1, maxAttempts), 1000); } } - private scrollToActivity(activityId:string) { + private scrollToActivity(activityAnchorName:AnchorType, activityId:string) { const maxAttempts = 20; // wait max 20 seconds for the activity to be rendered - this.tryScroll(activityId, 0, maxAttempts); + this.tryScroll(activityAnchorName, activityId, 0, maxAttempts); } - private tryScrollToBottom(attempts:number = 0, maxAttempts:number = 20) { + private tryScrollToBottom(attempts:number = 0, maxAttempts:number = 20, behavior:ScrollBehavior = 'smooth') { const scrollableContainer = this.getScrollableContainer(); if (!scrollableContainer) { @@ -402,7 +415,7 @@ export default class IndexController extends Controller { observer.disconnect(); scrollableContainer.scrollTo({ top: scrollableContainer.scrollHeight, - behavior: 'smooth', + behavior, }); }, 100); }); @@ -415,7 +428,7 @@ export default class IndexController extends Controller { } private scrollToBottom() { - this.tryScrollToBottom(); + this.tryScrollToBottom(0, 20, 'auto'); } setFilterToOnlyComments() { this.filterValue = 'only_comments'; } @@ -425,10 +438,23 @@ export default class IndexController extends Controller { setAnchor(event:CustomEventWithIdParam) { // native anchor scroll is causing positioning issues event.preventDefault(); + const activityId = event.params.id; + const anchorName = event.params.anchorName; - this.scrollToActivity(activityId); - window.location.hash = `#activity-${activityId}`; + // not using the scrollToActivity method here as it is causing flickering issues + // in case of a setAnchor click, we can go for a direct scroll approach + const scrollableContainer = this.getScrollableContainer(); + const activityElement = this.getActivityAnchorElement(anchorName, activityId); + + if (scrollableContainer && activityElement) { + scrollableContainer.scrollTo({ + top: activityElement.offsetTop - 90, + behavior: 'smooth', + }); + } + + window.location.hash = `#${anchorName}-${activityId}`; } private getCkEditorElement():HTMLElement | null { @@ -457,8 +483,15 @@ export default class IndexController extends Controller { return document.querySelector('.tabcontent') as HTMLElement; } + private getActivityAnchorElement(activityAnchorName:AnchorType, activityId:string):HTMLElement | null { + return document.querySelector(`[data-anchor-${activityAnchorName}-id="${activityId}"]`); + } + // Code Maintenance: Get rid of this JS based view port checks when activities are rendered in fully primierized activity tab in all contexts private isMobile():boolean { + if (this.isWithinNotificationCenter() || this.isWithinSplitScreen()) { + return window.innerWidth < 1013; + } return window.innerWidth < 1279; } @@ -470,11 +503,25 @@ export default class IndexController extends Controller { return window.location.pathname.includes('work_packages/details'); } + private setCssClasses() { + if (this.isWithinNotificationCenter()) { + this.element.classList.add('work-packages-activities-tab-index-component--within-notification-center'); + } + if (this.isWithinSplitScreen()) { + this.element.classList.add('work-packages-activities-tab-index-component--within-split-screen'); + } + } + private addEventListenersToCkEditorInstance() { this.onSubmitBound = () => { void this.onSubmit(); }; this.adjustMarginBound = () => { void this.adjustJournalContainerMargin(); }; this.onBlurEditorBound = () => { void this.onBlurEditor(); }; - this.onFocusEditorBound = () => { void this.onFocusEditor(); }; + this.onFocusEditorBound = () => { + void this.onFocusEditor(); + if (this.isMobile()) { + void this.scrollInputContainerIntoView(200); + } + }; const editorElement = this.getCkEditorElement(); if (editorElement) { @@ -527,21 +574,14 @@ export default class IndexController extends Controller { } } - private scrollInputContainerIntoView(timeout:number = 0) { + private scrollInputContainerIntoView(timeout:number = 0, behavior:ScrollBehavior = 'smooth') { const inputContainer = this.getInputContainer() as HTMLElement; setTimeout(() => { if (inputContainer) { - if (this.sortingValue === 'desc') { - inputContainer.scrollIntoView({ - behavior: 'smooth', - block: 'nearest', - }); - } else { - inputContainer.scrollIntoView({ - behavior: 'smooth', - block: 'start', - }); - } + inputContainer.scrollIntoView({ + behavior, + block: this.sortingValue === 'desc' ? 'nearest' : 'start', + }); } }, timeout); } @@ -556,9 +596,7 @@ export default class IndexController extends Controller { this.addEventListenersToCkEditorInstance(); if (this.isMobile()) { - // timeout amount tested on mobile devices for best possible user experience - this.scrollInputContainerIntoView(100); // first bring the input container fully into view (before focusing!) - this.focusEditor(400); // wait before focusing to avoid interference with the auto scroll + this.focusEditor(0); } else if (this.sortingValue === 'asc' && journalsContainerAtBottom) { // scroll to (new) bottom if sorting is ascending and journals container was already at bottom before showing the form this.scrollJournalContainer(true); @@ -581,7 +619,13 @@ export default class IndexController extends Controller { const userName = target.dataset.userNameParam as string; const content = target.dataset.contentParam as string; - this.openEditorWithInitialData(this.quotedText(content, userName)); + const quotedText = this.quotedText(content, userName); + const formVisible = !this.formRowTarget.classList.contains('d-none'); + if (formVisible) { + this.insertQuoteOnExistingEditor(quotedText); + } else { + this.openEditorWithInitialData(quotedText); + } } private quotedText(rawComment:string, userName:string) { @@ -592,6 +636,18 @@ export default class IndexController extends Controller { return `${userName}\n${quoted}`; } + insertQuoteOnExistingEditor(quotedText:string) { + const ckEditorInstance = this.getCkEditorInstance(); + if (ckEditorInstance) { + const editorData = ckEditorInstance.getData({ trim: false }); + if (editorData.endsWith('
    ') || editorData.endsWith('\n')) { + ckEditorInstance.setData(`${editorData}${quotedText}`); + } else { + ckEditorInstance.setData(`${editorData}\n\n${quotedText}`); + } + } + } + openEditorWithInitialData(quotedText:string) { this.showForm(); const ckEditorInstance = this.getCkEditorInstance(); @@ -646,11 +702,11 @@ export default class IndexController extends Controller { } async onSubmit(event:Event | null = null) { - if (this.saveInProgress === true) return; + event?.preventDefault(); - this.saveInProgress = true; + if (this.saveInProgress === true) return; - event?.preventDefault(); + this.setFormSubmitInProgress(true); const formData = this.prepareFormData(); void this.submitForm(formData) @@ -661,10 +717,33 @@ export default class IndexController extends Controller { console.error('Error saving activity:', error); }) .finally(() => { - this.saveInProgress = false; + this.setFormSubmitInProgress(false); }); } + private setFormSubmitInProgress(inProgress:boolean) { + this.saveInProgress = inProgress; + + if (this.hasFormSubmitButtonTarget) { + this.formSubmitButtonTarget.disabled = inProgress; + } + + this.setCKEditorReadonlyMode(inProgress); + } + + private setCKEditorReadonlyMode(disabled:boolean) { + const ckEditorInstance = this.getCkEditorInstance(); + const editorLockID = 'work-packages-activities-tab-index-component'; + + if (ckEditorInstance) { + if (disabled) { + ckEditorInstance.enableReadOnlyMode(editorLockID); + } else { + ckEditorInstance.disableReadOnlyMode(editorLockID); + } + } + } + private prepareFormData():FormData { const ckEditorInstance = this.getCkEditorInstance(); const data = ckEditorInstance ? ckEditorInstance.getData({ trim: false }) : ''; @@ -711,7 +790,7 @@ export default class IndexController extends Controller { this.handleStemVisibility(); }, 10); - this.saveInProgress = false; + this.setFormSubmitInProgress(false); } private resetJournalsContainerMargins():void { diff --git a/frontend/src/stimulus/controllers/dynamic/work-packages/create-dialog.controller.ts b/frontend/src/stimulus/controllers/dynamic/work-packages/create-dialog.controller.ts new file mode 100644 index 000000000000..02272e1b235d --- /dev/null +++ b/frontend/src/stimulus/controllers/dynamic/work-packages/create-dialog.controller.ts @@ -0,0 +1,55 @@ +/* + * -- copyright + * OpenProject is an open source project management software. + * Copyright (C) the OpenProject GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See COPYRIGHT and LICENSE files for more details. + * ++ + */ + +import { Controller } from '@hotwired/stimulus'; +import { TurboRequestsService } from 'core-app/core/turbo/turbo-requests.service'; + +export default class CreateDialogController extends Controller { + private turboRequests:TurboRequestsService; + + static values = { + refreshUrl: String, + }; + + declare refreshUrlValue:string; + + async connect() { + const context = await window.OpenProject.getPluginContext(); + this.turboRequests = context.services.turboRequests; + } + + refreshForm() { + void this.turboRequests.submitForm( + this.element, + null, + this.refreshUrlValue, + ); + } +} diff --git a/frontend/src/stimulus/controllers/form-preview.controller.ts b/frontend/src/stimulus/controllers/form-preview.controller.ts new file mode 100644 index 000000000000..cd22b91e15b8 --- /dev/null +++ b/frontend/src/stimulus/controllers/form-preview.controller.ts @@ -0,0 +1,48 @@ +/* + * -- copyright + * OpenProject is an open source project management software. + * Copyright (C) the OpenProject GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See COPYRIGHT and LICENSE files for more details. + * ++ + */ + +import { Controller } from '@hotwired/stimulus'; + +export default class FormPreviewController extends Controller { + static values = { url: String }; + + declare urlValue:string; + + async submit():Promise { + if (!this.urlValue) { + return; + } + + const form = this.element; + form.action = this.urlValue; + + form.requestSubmit(); + } +} diff --git a/frontend/src/stimulus/controllers/hover-card-trigger.controller.ts b/frontend/src/stimulus/controllers/hover-card-trigger.controller.ts new file mode 100644 index 000000000000..8cea1823c525 --- /dev/null +++ b/frontend/src/stimulus/controllers/hover-card-trigger.controller.ts @@ -0,0 +1,293 @@ +/* + * -- copyright + * OpenProject is an open source project management software. + * Copyright (C) the OpenProject GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See COPYRIGHT and LICENSE files for more details. + * ++ + */ + +import { ApplicationController } from 'stimulus-use'; +import { sanitizeUrl } from '@braintree/sanitize-url'; +import { computePosition, flip, limitShift, shift } from '@floating-ui/dom'; + +/** + * This controller is responsible for showing a hover card when hovering over a trigger element. + * + * You can define a trigger element by adding the `data-hover-card-trigger-target="trigger"` to it. + * To have hover cards available everywhere, add this controller to the body tag. + */ +export default class HoverCardTriggerController extends ApplicationController { + static targets = ['trigger', 'card']; + + private mouseInModal = false; + private hoverTimeout:number|null = null; + private closeTimeout:number|null = null; + private previousTarget:HTMLElement|null = null; + + // Track whether we currently show a hover card or not. It is important not to open multiple hover cards at + // the same time, and refrain from closing the wrong kind of modal overlay. + private isShowingHoverCard:boolean = false; + + // The time you need to keep hovering over a trigger before the hover card is shown + OPEN_DELAY_IN_MS = 1000; + // The time you need to keep away from trigger/hover card before an opened card is closed + CLOSE_DELAY_IN_MS = 250; + + private triggerMouseOverBound= this.onMouseOver.bind(this); + private triggerMouseLeaveBound= this.onMouseLeave.bind(this); + private cardMouseLeaveBound= this.onMouseLeave.bind(this); + private cardMouseEnterBound= this.onMouseEnter.bind(this); + + /** + * Attempting to show hover cards on touch-based devices often leads to quirky and unwanted + * behavior. As all information in our hover cards is optional, we'd rather only show them + * on devices that primarily support a mouse cursor. That means that hovering is a reliable + * option for interaction. + */ + shouldRegisterHoverEventListeners() { + const browserSupportsHovering = window.matchMedia('(hover: hover)').matches; + // The browser on the CI claims not to support hovering, so we must detect whether we are in a test environment: + const isTestEnv = window.OpenProject.environment === 'test'; + + return isTestEnv || browserSupportsHovering; + } + + private triggerTargetConnected(trigger:Element) { + if (this.shouldRegisterHoverEventListeners()) { + trigger.addEventListener('mouseover', this.triggerMouseOverBound); + trigger.addEventListener('mouseleave', this.triggerMouseLeaveBound); + } + } + + private triggerTargetDisconnected(trigger:Element) { + trigger.removeEventListener('mouseover', this.triggerMouseOverBound); + trigger.removeEventListener('mouseleave', this.triggerMouseLeaveBound); + } + + private cardTargetConnected(card:Element) { + if (this.shouldRegisterHoverEventListeners()) { + card.addEventListener('mouseleave', this.cardMouseLeaveBound); + card.addEventListener('mouseenter', this.cardMouseEnterBound); + } + } + + private cardTargetDisconnected(card:Element) { + card.removeEventListener('mouseleave', this.cardMouseLeaveBound); + card.removeEventListener('mouseenter', this.cardMouseEnterBound); + } + + private onMouseLeave() { + this.clearHoverTimer(); + this.mouseInModal = false; + this.closeAfterTimeout(); + } + + private onMouseEnter() { + this.mouseInModal = true; + } + + private onMouseOver(e:MouseEvent) { + e.preventDefault(); + e.stopPropagation(); + + // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment + const el = e.target as HTMLElement; + if (!el) { return; } + + if (this.previousTarget && this.previousTarget === el) { + // Re-entering the trigger counts as hovering over the card: + this.mouseInModal = true; + // But we will not re-render the same card, abort here + return; + } + + // Hovering over a new target. Close the old one (if any). + this.close(true); + + const turboFrameUrl = this.parseHoverCardUrl(el); + if (!turboFrameUrl) { return; } + + // Reset close timer for when hovering over multiple triggers in quick succession. + // A timer from a previous hover card might still be running. We do not want it to + // close the new (i.e. this) hover card. + this.clearCloseTimer(); + + // Set a delay before showing the hover card + this.hoverTimeout = window.setTimeout(() => { + this.showHoverCard(el, turboFrameUrl); + }, this.OPEN_DELAY_IN_MS); + } + + private showHoverCard(el:HTMLElement, turboFrameUrl:string) { + // Abort if the element is no longer present in the DOM. This can happen when this method is called after a delay. + if (!this.element.contains(el)) { return; } + // Do not try to show two hover cards at the same time. + if (this.isShowingHoverCard) { return; } + + this.loadAndShowHoverCard(el, turboFrameUrl); + } + + private loadAndShowHoverCard(targetEl:HTMLElement, turboFrameUrl:string) { + const overlay = this.getAndResetOverlay(); + if (!overlay) { return; } + + this.moveOverlayToAppropriateParent(overlay, targetEl); + + const { turboFrame, popover } = this.constructPopover(overlay, turboFrameUrl); + + this.isShowingHoverCard = true; + this.previousTarget = targetEl; + + turboFrame.addEventListener('turbo:frame-load', () => { + void this.reposition(popover, targetEl); + + // Content has been loaded, card has been positioned. Show it! + popover.showPopover(); + }); + } + + // Should be called when the mouse leaves the hover-zone so that we no longer attempt to display the hover card. + private clearHoverTimer() { + if (this.hoverTimeout) { + clearTimeout(this.hoverTimeout); + this.hoverTimeout = null; + } + } + + private clearCloseTimer() { + if (this.closeTimeout) { + clearTimeout(this.closeTimeout); + this.closeTimeout = null; + } + } + + private closeAfterTimeout() { + this.closeTimeout = window.setTimeout(() => { + this.close(); + }, this.CLOSE_DELAY_IN_MS); + } + + private close(forceClose=false) { + if (forceClose) { + this.mouseInModal = false; + } + + // It is important to check if we are currently showing a hover card. If we closed the modal service without + // doing so, we might accidentally close another modal (e.g. share dialog). + if (this.isShowingHoverCard && !this.mouseInModal) { + this.getAndResetOverlay(); + + this.isShowingHoverCard = false; + // Allow opening this target once more, since it has been orderly closed + this.previousTarget = null; + } + } + + private getAndResetOverlay() { + const overlay = document.getElementById('hover-card-overlay'); + if (overlay) { + overlay.innerHTML = ''; + overlay.remove(); + } + + const newOverlay = document.createElement('div'); + newOverlay.id = 'hover-card-overlay'; + + return newOverlay; + } + + /* + * Will fetch the URL from the element's data attribute and sanitize it. + * When there is no URL or if the URL is invalid, will return an empty string. + */ + private parseHoverCardUrl(el:HTMLElement) { + let url = el.getAttribute('data-hover-card-url'); + if (!url) { return ''; } + + url = sanitizeUrl(url); + + // `sanitizeUrl` will return 'about:blank' for invalid URLs. We will return an empty-string instead since + // there's no reason to show an empty hover card. + return url === 'about:blank' ? '' : url; + } + + private async reposition(element:HTMLElement, target:HTMLElement) { + const floatingEl = element; + + const { x, y } = await computePosition( + target, + floatingEl, + { + placement: 'top', + middleware: [ + flip({ + mainAxis: true, + crossAxis: true, + fallbackAxisSideDirection: 'start', + }), + shift({ limiter: limitShift() }), + ], + }, + ); + Object.assign(floatingEl.style, { + left: `${x}px`, + top: `${y}px`, + }); + } + + private constructPopover(overlay:HTMLElement, turboFrameUrl:string) { + const popover = document.createElement('div'); + popover.className = 'op-hover-card'; + popover.setAttribute('popover', 'auto'); + popover.setAttribute('data-hover-card-trigger-target', 'card'); + + const turboFrame = document.createElement('turbo-frame'); + turboFrame.id = 'op-hover-card-body'; + popover.appendChild(turboFrame); + turboFrame.setAttribute('src', turboFrameUrl); + + overlay.appendChild(popover); + + return { turboFrame, popover }; + } + + /* + * For dialogs, we must ensure that the overlay is a child of the dialog, not the body. Otherwise, the overlay + * is visible, but cannot be interacted with. This is a bug, see https://github.com/whatwg/html/issues/9936 + * + * Until this is fixed, we must ensure the popover is interactable. We can do this by checking + * if the target element is a child of a dialog, and if so, append the hover card overlay to the dialog. + * Otherwise, we append it to the body. + */ + private moveOverlayToAppropriateParent(overlay:HTMLElement, targetEl:HTMLElement) { + const targetParentDialog = targetEl.closest('dialog-helper > dialog'); + + if (targetParentDialog) { + targetParentDialog.appendChild(overlay); + } else { + this.element.appendChild(overlay); + } + } +} diff --git a/frontend/src/stimulus/controllers/keep-scroll-position.controller.ts b/frontend/src/stimulus/controllers/keep-scroll-position.controller.ts new file mode 100644 index 000000000000..72278dfa5759 --- /dev/null +++ b/frontend/src/stimulus/controllers/keep-scroll-position.controller.ts @@ -0,0 +1,83 @@ +/* + * -- copyright + * OpenProject is an open source project management software. + * Copyright (C) 2023 the OpenProject GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See COPYRIGHT and LICENSE files for more details. + * ++ + */ + +import { ApplicationController } from 'stimulus-use'; + +export default class KeepScrollPositionController extends ApplicationController { + static values = { + url: String, + }; + + static targets = ['triggerButton']; + + declare triggerButtonTarget:HTMLLinkElement; + + declare urlValue:string; + + connect() { + super.connect(); + + window.addEventListener('turbo:load', this.autoscrollToLastKnownPosition.bind(this)); + window.addEventListener('DOMContentLoaded', this.autoscrollToLastKnownPosition.bind(this)); + } + + disconnect() { + super.disconnect(); + } + + triggerButtonTargetConnected() { + this.triggerButtonTarget.addEventListener('click', this.rememberCurrentScrollPosition.bind(this)); + } + + rememberCurrentScrollPosition() { + const currentPosition = document.getElementById('content-body')?.scrollTop; + + if (currentPosition !== undefined) { + sessionStorage.setItem(this.scrollPositionKey(), currentPosition.toString()); + } + } + + autoscrollToLastKnownPosition() { + const lastKnownPos = sessionStorage.getItem(this.scrollPositionKey()); + if (lastKnownPos) { + const content = document.getElementById('content-body'); + + if (content) { + content.scrollTop = parseInt(lastKnownPos, 10); + } + } + + sessionStorage.removeItem(this.scrollPositionKey()); + } + + private scrollPositionKey():string { + return `${this.urlValue}/scrollPosition`; + } +} diff --git a/frontend/src/stimulus/controllers/pattern-input.controller.ts b/frontend/src/stimulus/controllers/pattern-input.controller.ts new file mode 100644 index 000000000000..dfa0dac7be60 --- /dev/null +++ b/frontend/src/stimulus/controllers/pattern-input.controller.ts @@ -0,0 +1,381 @@ +/* + * -- copyright + * OpenProject is an open source project management software. + * Copyright (C) the OpenProject GmbH + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License version 3. + * + * OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + * Copyright (C) 2006-2013 Jean-Philippe Lang + * Copyright (C) 2010-2013 the ChiliProject Team + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + * See COPYRIGHT and LICENSE files for more details. + * ++ + */ + +import { Controller } from '@hotwired/stimulus'; + +// internal type used to filter suggestions +type FilteredSuggestions = Array<{ + key:string; + values:Array<{ prop:string; value:string; }>; +}>; + +export default class PatternInputController extends Controller { + static targets = [ + 'tokenTemplate', + 'content', + 'formInput', + + 'suggestions', + 'suggestionsHeadingTemplate', + 'suggestionsDividerTemplate', + 'suggestionsItemTemplate', + ]; + + declare readonly tokenTemplateTarget:HTMLTemplateElement; + declare readonly contentTarget:HTMLElement; + declare readonly formInputTarget:HTMLInputElement; + + declare readonly suggestionsTarget:HTMLElement; + declare readonly suggestionsHeadingTemplateTarget:HTMLTemplateElement; + declare readonly suggestionsDividerTemplateTarget:HTMLTemplateElement; + declare readonly suggestionsItemTemplateTarget:HTMLTemplateElement; + + static values = { + patternInitial: String, + suggestionsInitial: Object, + }; + + declare patternInitialValue:string; + declare suggestionsInitialValue:Record>; + + validTokens:string[]; + currentRange:Range|undefined = undefined; + + connect() { + this.contentTarget.innerHTML = this.toHtml(this.patternInitialValue) || ' '; + this.extractValidTokens(); + this.tagInvalidTokens(); + } + + // Input field events + input_keydown(event:KeyboardEvent) { + if (event.key === 'Enter') { + event.preventDefault(); + } + + if (event.key === 'ArrowDown') { + const firstSuggestion = this.suggestionsTarget.querySelector('[role="menuitem"]') as HTMLElement; + firstSuggestion?.focus(); + event.preventDefault(); + } + if (event.key === 'ArrowLeft') { + if (this.contentTarget.innerHTML.startsWith('<')) { + this.insertSpaceIfFirstCharacter(); + } + } + if (event.key === 'ArrowRight') { + if (this.contentTarget.innerHTML.endsWith('>')) { + this.insertSpaceIfLastCharacter(); + } + } + + // close the suggestions + if (event.key === 'Escape' || event.key === 'ArrowLeft' || event.key === 'ArrowRight') { + this.clearSuggestionsFilter(); + } + + // update cursor + this.setRange(); + } + + input_change() { + // clean up empty tags from the input + this.contentTarget.querySelectorAll('span').forEach((element) => element.textContent?.trim() === '' && element.remove()); + this.contentTarget.querySelectorAll('br').forEach((element) => element.remove()); + + // show suggestions for the current word + const word = this.currentWord(); + if (word && word.length > 0) { + this.filterSuggestions(word); + } else { + this.clearSuggestionsFilter(); + } + + this.tagInvalidTokens(); + + // this resets the cursor position without changing it + // it is necessary because chromium based browsers try to + // retain styling and adds a unwanted tag, + // breaking the behaviour of this component + const selection = document.getSelection(); + if (selection && selection.rangeCount) { + const range = selection.getRangeAt(0); + selection.removeAllRanges(); + selection.addRange(range); + } + this.setRange(); + } + + input_mouseup() { + this.setRange(); + } + + input_focus() { + this.setRange(); + } + + input_blur() { + this.updateFormInputValue(); + } + + // Autocomplete events + suggestions_select(event:PointerEvent) { + const target = event.currentTarget as HTMLElement; + + if (target) { + this.insertToken(this.createToken(target.dataset.prop!)); + this.clearSuggestionsFilter(); + } + } + + // internal methods + extractValidTokens() { + const res = Object.values(this.suggestionsInitialValue).map((group) => (Object.keys(group))); + this.validTokens = ([] as string[]).concat(...res); + } + + private updateFormInputValue():void { + this.formInputTarget.value = this.toBlueprint(); + } + + /** + * Sets an internal representation of the cursor position by persisting the current `Range` + */ + private setRange():void { + const selection = document.getSelection(); + if (selection?.rangeCount) { + const range = selection.getRangeAt(0); + if (range.startContainer.parentNode === this.contentTarget) { + this.currentRange = range; + } + } + } + + insertSpaceIfFirstCharacter() { + const selection = document.getSelection(); + if (selection && selection.rangeCount) { + const range = selection.getRangeAt(0); + // create a test range + // select the whole content of the input + // then set the "end" position to the current actual selection position (the caret) + const testRange = document.createRange(); + testRange.selectNodeContents(this.contentTarget); + testRange.setEnd(range.startContainer, range.startOffset); + + // if the resulting range is empty it is at the end of the input + if (testRange.toString() === '') { + // add a space + const beforeToken = document.createTextNode(' '); + const firstContent = this.contentTarget.firstChild as HTMLElement; + this.contentTarget.insertBefore(beforeToken, firstContent); + + this.setRealCaretPositionAtNode(beforeToken, 'before'); + } + } + } + + insertSpaceIfLastCharacter():void { + const selection = document.getSelection(); + if (selection && selection.rangeCount) { + const range = selection.getRangeAt(0); + // create a test range + // select the whole content of the input + // then set the "start" position to the current actual selection position (the caret) + const testRange = document.createRange(); + testRange.selectNodeContents(this.contentTarget); + testRange.setStart(range.endContainer, range.endOffset); + + // if the resulting range is empty it is at the end of the input + if (testRange.toString() === '') { + // add a space + const afterToken = document.createTextNode(' '); + this.contentTarget.appendChild(afterToken); + + this.setRealCaretPositionAtNode(afterToken); + } + } + } + + setRealCaretPositionAtNode(target:Node, position:'before'|'after' = 'after'):void { + const selection = document.getSelection(); + if (selection) { + const postRange = document.createRange(); + if (position === 'after') { + postRange.setStartAfter(target); + } else { + postRange.setStartBefore(target); + } + selection?.removeAllRanges(); + selection?.addRange(postRange); + } + } + + private insertToken(tokenElement:HTMLElement) { + if (this.currentRange) { + const targetNode = this.currentRange.startContainer; + const targetOffset = this.currentRange.startOffset; + + if (!targetNode.textContent) { return; } + + let pos = targetOffset - 1; + while (pos > -1 && !this.isWhitespace(targetNode.textContent.charAt(pos))) { pos-=1; } + + const wordRange = document.createRange(); + wordRange.setStart(targetNode, pos + 1); + wordRange.setEnd(targetNode, targetOffset); + + wordRange.deleteContents(); + wordRange.insertNode(tokenElement); + + this.setRealCaretPositionAtNode(tokenElement); + + this.updateFormInputValue(); + this.setRange(); + + // clear suggestions + this.clearSuggestionsFilter(); + } else { + this.contentTarget.appendChild(tokenElement); + } + } + + private currentWord():string|null { + const selection = document.getSelection(); + if (selection) { + return (selection.anchorNode?.textContent?.slice(0, selection.anchorOffset) + .split(' ') + .pop() as string) + .toLowerCase(); + } + + return null; + } + + private clearSuggestionsFilter():void { + this.suggestionsTarget.innerHTML = ''; + } + + private filterSuggestions(word:string):void { + this.clearSuggestionsFilter(); + + const filtered = this.getFilteredSuggestionsData(word); + + // insert the HTML + filtered.forEach((group) => { + const groupHeader = this.suggestionsHeadingTemplateTarget.content?.cloneNode(true) as HTMLElement; + if (groupHeader) { + const headerElement = groupHeader.querySelector('h2'); + if (headerElement) { + headerElement.innerText = group.key; + } + + this.suggestionsTarget.appendChild(groupHeader); + } + + group.values.forEach((suggestion) => { + const suggestionTemplate = this.suggestionsItemTemplateTarget.content?.cloneNode(true) as HTMLElement; + const suggestionItem = suggestionTemplate.firstElementChild as HTMLElement; + if (suggestionTemplate && suggestionItem) { + suggestionItem.dataset.prop = suggestion.prop; + this.setSuggestionText(suggestionItem, suggestion.value); + this.suggestionsTarget.appendChild(suggestionItem); + } + }); + + const groupDivider = this.suggestionsDividerTemplateTarget.content?.cloneNode(true) as HTMLElement; + this.suggestionsTarget.appendChild(groupDivider); + }); + } + + setSuggestionText(suggestionItem:HTMLElement, value:string) { + const textContainer = suggestionItem.querySelector('span'); + if (textContainer) { + textContainer.innerText = value; + } else { + throw new Error('suggestion template does not have a span to hold the suggestion value'); + } + } + + private getFilteredSuggestionsData(word:string):FilteredSuggestions { + return Object.keys(this.suggestionsInitialValue).map((key) => { + const group = this.suggestionsInitialValue[key]; + return { + key, + values: Object.entries(group).filter(([prop, value]) => { + return value.toLowerCase().includes(word.toLowerCase()) || prop.toLowerCase().includes(word.toLowerCase()) || word === '*'; + }).map(([prop, value]) => ({ prop, value })), + }; + }).filter((group) => group.values.length > 0); + } + + private tagInvalidTokens():void { + this.contentTarget.querySelectorAll('[data-role="token"]').forEach((element) => { + const token = element.textContent?.trim(); + + let exists = false; + this.validTokens.forEach((prop) => { if (prop === token) { exists = true; } }); + + if (exists) { + element.classList.remove('Label--danger'); + } else { + element.classList.add('Label--danger'); + } + }); + } + + private createToken(value:string):HTMLElement { + const templateTarget = this.tokenTemplateTarget.content?.cloneNode(true) as HTMLElement; + const contentElement = templateTarget.firstElementChild as HTMLElement; + contentElement.innerText = value; + return contentElement; + } + + private toHtml(blueprint:string):string { + return blueprint.replace(/{{([0-9A-Za-z_]+)}}/g, (_, token:string) => this.createToken(token).outerHTML); + } + + private toBlueprint():string { + let result = ''; + this.contentTarget.childNodes.forEach((node:Element) => { + if (node.nodeType === Node.TEXT_NODE) { + // Plain text node + result += node.textContent; + } else if (node.nodeType === Node.ELEMENT_NODE && (node as HTMLElement).dataset.role === 'token') { + // Token element + result += `{{${node.textContent?.trim()}}}`; + } + }); + return result.trim(); + } + + private isWhitespace(value:string):boolean { + return /\s/.test(value); + } +} diff --git a/frontend/src/stimulus/controllers/poll-for-changes.controller.ts b/frontend/src/stimulus/controllers/poll-for-changes.controller.ts index 4b24bb4e64c0..3fdac936b327 100644 --- a/frontend/src/stimulus/controllers/poll-for-changes.controller.ts +++ b/frontend/src/stimulus/controllers/poll-for-changes.controller.ts @@ -36,19 +36,16 @@ export default class PollForChangesController extends ApplicationController { url: String, interval: Number, reference: String, - autoscrollEnabled: Boolean, }; - static targets = ['reloadButton', 'reference']; + static targets = ['reference']; - declare reloadButtonTarget:HTMLLinkElement; declare referenceTarget:HTMLElement; declare readonly hasReferenceTarget:boolean; declare referenceValue:string; declare urlValue:string; declare intervalValue:number; - declare autoscrollEnabledValue:boolean; private interval:number; @@ -60,10 +57,6 @@ export default class PollForChangesController extends ApplicationController { void this.triggerTurboStream(); }, this.intervalValue || 10_000); } - - if (this.autoscrollEnabledValue) { - window.addEventListener('DOMContentLoaded', this.autoscrollToLastKnownPosition.bind(this)); - } } disconnect() { @@ -79,10 +72,6 @@ export default class PollForChangesController extends ApplicationController { return this.referenceValue; } - reloadButtonTargetConnected() { - this.reloadButtonTarget.addEventListener('click', this.rememberCurrentScrollPosition.bind(this)); - } - triggerTurboStream() { void fetch(`${this.urlValue}?reference=${this.buildReference()}`, { headers: { @@ -97,29 +86,4 @@ export default class PollForChangesController extends ApplicationController { } }); } - - rememberCurrentScrollPosition() { - const currentPosition = document.getElementById('content-body')?.scrollTop; - - if (currentPosition !== undefined) { - sessionStorage.setItem(this.scrollPositionKey(), currentPosition.toString()); - } - } - - autoscrollToLastKnownPosition() { - const lastKnownPos = sessionStorage.getItem(this.scrollPositionKey()); - if (lastKnownPos) { - const content = document.getElementById('content-body'); - - if (content) { - content.scrollTop = parseInt(lastKnownPos, 10); - } - } - - sessionStorage.removeItem(this.scrollPositionKey()); - } - - private scrollPositionKey():string { - return `${this.urlValue}/scrollPosition`; - } } diff --git a/frontend/src/stimulus/controllers/show-when-checked.controller.ts b/frontend/src/stimulus/controllers/show-when-checked.controller.ts index 1674cc7a5272..4646bbd20eae 100644 --- a/frontend/src/stimulus/controllers/show-when-checked.controller.ts +++ b/frontend/src/stimulus/controllers/show-when-checked.controller.ts @@ -13,12 +13,14 @@ export default class OpShowWhenCheckedController extends ApplicationController { declare readonly effectTargets:HTMLInputElement[]; + private boundListener = this.toggleDisabled.bind(this); + causeTargetConnected(target:HTMLElement) { - target.addEventListener('change', this.toggleDisabled.bind(this)); + target.addEventListener('change', this.boundListener); } causeTargetDisconnected(target:HTMLElement) { - target.removeEventListener('change', this.toggleDisabled.bind(this)); + target.removeEventListener('change', this.boundListener); } private toggleDisabled(evt:InputEvent):void { diff --git a/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts b/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts index d29ae2c9c332..821f07e42ee2 100644 --- a/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts +++ b/frontend/src/stimulus/controllers/show-when-value-selected.controller.ts @@ -5,12 +5,14 @@ export default class OpShowWhenValueSelectedController extends ApplicationContro declare readonly effectTargets:HTMLInputElement[]; + private boundListener = this.toggleDisabled.bind(this); + causeTargetConnected(target:HTMLElement) { - target.addEventListener('change', this.toggleDisabled.bind(this)); + target.addEventListener('change', this.boundListener); } causeTargetDisconnected(target:HTMLElement) { - target.removeEventListener('change', this.toggleDisabled.bind(this)); + target.removeEventListener('change', this.boundListener); } private toggleDisabled(evt:InputEvent):void { diff --git a/frontend/src/stimulus/setup.ts b/frontend/src/stimulus/setup.ts index b1b052b5e8c8..aa6eb92c058a 100644 --- a/frontend/src/stimulus/setup.ts +++ b/frontend/src/stimulus/setup.ts @@ -5,6 +5,7 @@ import MainMenuController from './controllers/dynamic/menus/main.controller'; import OpDisableWhenCheckedController from './controllers/disable-when-checked.controller'; import PrintController from './controllers/print.controller'; import RefreshOnFormChangesController from './controllers/refresh-on-form-changes.controller'; +import FormPreviewController from './controllers/form-preview.controller'; import AsyncDialogController from './controllers/async-dialog.controller'; import PollForChangesController from './controllers/poll-for-changes.controller'; import TableHighlightingController from './controllers/table-highlighting.controller'; @@ -13,6 +14,9 @@ import OpShowWhenValueSelectedController from './controllers/show-when-value-sel import FlashController from './controllers/flash.controller'; import OpProjectsZenModeController from './controllers/dynamic/projects/zen-mode.controller'; import PasswordConfirmationDialogController from './controllers/password-confirmation-dialog.controller'; +import KeepScrollPositionController from './controllers/keep-scroll-position.controller'; +import PatternInputController from './controllers/pattern-input.controller'; +import HoverCardTriggerController from './controllers/hover-card-trigger.controller'; declare global { interface Window { @@ -37,7 +41,11 @@ instance.register('password-confirmation-dialog', PasswordConfirmationDialogCont instance.register('poll-for-changes', PollForChangesController); instance.register('print', PrintController); instance.register('refresh-on-form-changes', RefreshOnFormChangesController); +instance.register('form-preview', FormPreviewController); +instance.register('hover-card-trigger', HoverCardTriggerController); instance.register('show-when-checked', OpShowWhenCheckedController); instance.register('show-when-value-selected', OpShowWhenValueSelectedController); instance.register('table-highlighting', TableHighlightingController); instance.register('projects-zen-mode', OpProjectsZenModeController); +instance.register('keep-scroll-position', KeepScrollPositionController); +instance.register('pattern-input', PatternInputController); diff --git a/frontend/src/test/i18n-shim.ts b/frontend/src/test/i18n-shim.ts deleted file mode 100644 index c1f954ba170e..000000000000 --- a/frontend/src/test/i18n-shim.ts +++ /dev/null @@ -1,40 +0,0 @@ -import * as _ from 'lodash'; - -export class I18nShim { - public defaultLocale = 'en'; - - public firstDayOfWeek = 1; - - public locale = 'en'; - - public translations = { - en: {}, - }; - - t(key:string):T { - return `[missing "${key}" translation]` as unknown as T; - } - - lookup():boolean { - return false; - } - - // Return the input for these helpers - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - public toNumber = _.identity; - - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - public toPercentage = _.identity; - - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - public toCurrency = _.identity; - - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - public strftime = _.identity; - - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - public toHumanSize = _.identity; - - // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access,@typescript-eslint/no-unsafe-assignment - public toTime = _.identity; -} diff --git a/frontend/src/turbo/dialog-stream-action.ts b/frontend/src/turbo/dialog-stream-action.ts index a28ef698bb23..72f4b7361b18 100644 --- a/frontend/src/turbo/dialog-stream-action.ts +++ b/frontend/src/turbo/dialog-stream-action.ts @@ -1,6 +1,14 @@ import { StreamActions, StreamElement } from '@hotwired/turbo'; export function registerDialogStreamAction() { + StreamActions.closeDialog = function closeDialogStreamAction(this:StreamElement) { + const dialog = document.querySelector(this.target) as HTMLDialogElement; + // distpatching with submitted: true to indicate that the behavior of a successful submission should + // be triggered (i.e. reloading the ui) + document.dispatchEvent(new CustomEvent('dialog:close', { detail: { dialog, submitted: true } })); + dialog.close('close-event-already-dispatched'); + }; + StreamActions.dialog = function dialogStreamAction(this:StreamElement) { const content = this.templateElement.content; const dialog = content.querySelector('dialog') as HTMLDialogElement; @@ -17,6 +25,10 @@ export function registerDialogStreamAction() { } else { dialog.remove(); } + + if (dialog.returnValue !== 'close-event-already-dispatched') { + document.dispatchEvent(new CustomEvent('dialog:close', { detail: { dialog, submitted: false } })); + } }); // Hack to fix the width calculation of nested elements @@ -24,6 +36,6 @@ export function registerDialogStreamAction() { setTimeout(() => { const width = dialog.offsetWidth; dialog.style.width = `${width + 1}px`; - }, 50); + }, 100); }; } diff --git a/frontend/src/turbo/turbo-event-listeners.ts b/frontend/src/turbo/turbo-event-listeners.ts index 25cdca4d9d62..00bd871abc86 100644 --- a/frontend/src/turbo/turbo-event-listeners.ts +++ b/frontend/src/turbo/turbo-event-listeners.ts @@ -8,14 +8,20 @@ export function addTurboEventListeners() { // // It is necessary to close the primer dialog using the `close()` method, otherwise // it will leave an overflow:hidden attribute on the body, which prevents scrolling on the page. + // + // Also, we will dispatch a custom `dialog:close` event when the dialog is closed. document.addEventListener('turbo:submit-end', (event:CustomEvent) => { - const { detail: { success }, target } = event as { detail:{ success:boolean }, target:EventTarget }; + const { detail: { success }, target } = event as { detail:{ success:boolean }; target:EventTarget }; if (success && target instanceof HTMLFormElement) { const dialog = target.closest('dialog') as HTMLDialogElement; - if (dialog && dialog.dataset.keepOpenOnSubmit !== 'true') { - dialog.close(); + if (dialog) { + if (dialog.dataset.keepOpenOnSubmit !== 'true') { + dialog.close('close-event-already-dispatched'); + } + + document.dispatchEvent(new CustomEvent('dialog:close', { detail: { dialog, submitted: true } })); } } }); diff --git a/frontend/tsconfig.test.json b/frontend/tsconfig.test.json deleted file mode 100644 index c047a7a061ae..000000000000 --- a/frontend/tsconfig.test.json +++ /dev/null @@ -1,15 +0,0 @@ -{ - "compilerOptions": { - "target": "ES5", - "module": "commonjs", - "noEmitOnError": false, - "noImplicitAny": false, - "preserveConstEnums": true, - "sourceMap": false, - "removeComments": true - }, - "files": [ - "app/components/**/*.test.ts", - - ] -} diff --git a/lefthook.yml b/lefthook.yml index c4301424b2fd..ce1717e53b68 100644 --- a/lefthook.yml +++ b/lefthook.yml @@ -17,3 +17,11 @@ pre-commit: files: git diff --name-only --staged glob: "*.rb" run: bin/dirty-rubocop --uncommitted --force-exclusion {files} + erb_lint: + files: git diff --name-only --staged + glob: "*.erb" + run: erb_lint {files} + primer-view-components-version-is-the-same-everyhwere: + files: git diff --name-only --staged + glob: "{Gemfile.lock,frontend/package.json}" + run: script/check_same_primer_view_components_version_everywhere diff --git a/lib/api/v3/work_packages/schema/base_work_package_schema.rb b/lib/api/v3/work_packages/schema/base_work_package_schema.rb index d7b8bbb692da..fa1817762052 100644 --- a/lib/api/v3/work_packages/schema/base_work_package_schema.rb +++ b/lib/api/v3/work_packages/schema/base_work_package_schema.rb @@ -53,6 +53,7 @@ def available_custom_fields def writable?(property) property = property.to_s + return false if property == "subject" && type&.replacement_pattern_defined_for?(:subject) # Special case for milestones + date property property = "start_date" if property == "date" && milestone? diff --git a/lib/api/v3/work_packages/work_package_representer.rb b/lib/api/v3/work_packages/work_package_representer.rb index 20ea4a61abe7..96ccff0b9623 100644 --- a/lib/api/v3/work_packages/work_package_representer.rb +++ b/lib/api/v3/work_packages/work_package_representer.rb @@ -645,7 +645,8 @@ def add_work_packages_allowed? def relations self_path = api_v3_paths.work_package_relations(represented.id) visible_relations = represented - .visible_relations(current_user) + .relations + .visible(current_user) .includes(::API::V3::Relations::RelationCollectionRepresenter.to_eager_load) ::API::V3::Relations::RelationCollectionRepresenter.new(visible_relations, diff --git a/lib/open_project/access_control.rb b/lib/open_project/access_control.rb index 85942395b522..0da32c86563e 100644 --- a/lib/open_project/access_control.rb +++ b/lib/open_project/access_control.rb @@ -130,9 +130,12 @@ def global_permissions @global_permissions ||= permissions.select(&:global?) end - def available_project_modules - project_modules - .reject { |name| disabled_project_modules.include? name } + def available_project_modules(sorted: false) + modules = project_modules - disabled_project_modules + + modules.sort_by! { |name| I18n.t(:"project_module_#{name}") } if sorted + + modules end def disabled_project_modules diff --git a/lib/open_project/custom_field_format.rb b/lib/open_project/custom_field_format.rb index eb76c0496096..90c55a6488cc 100644 --- a/lib/open_project/custom_field_format.rb +++ b/lib/open_project/custom_field_format.rb @@ -30,18 +30,29 @@ module OpenProject class CustomFieldFormat include Redmine::I18n - cattr_accessor :available + cattr_reader :available @@available = {} - attr_accessor :name, :order, :label, :edit_as, :class_names, :formatter + attr_reader :name, :order, :label, :edit_as, :class_names - def initialize(name, label:, order:, edit_as: name, only: nil, formatter: "CustomValue::StringStrategy") - self.name = name - self.label = label - self.order = order - self.edit_as = edit_as - self.class_names = only - self.formatter = formatter + def initialize(name, + label:, + order:, + edit_as: name, + only: nil, + multi_value_possible: false, + formatter: "CustomValue::StringStrategy") + @name = name + @label = label + @order = order + @edit_as = edit_as + @class_names = only + @multi_value_possible = multi_value_possible + @formatter = formatter + end + + def multi_value_possible? + @multi_value_possible end def formatter @@ -56,7 +67,7 @@ def map(&) # Registers a custom field format def register(custom_field_format, _options = {}) - @@available[custom_field_format.name] = custom_field_format unless @@available.keys.include?(custom_field_format.name) + @@available[custom_field_format.name] = custom_field_format unless @@available.include?(custom_field_format.name) end def available_formats @@ -69,10 +80,15 @@ def find_by(name:) def all_for_field(custom_field) class_name = custom_field.class.customized_class.name + all_for_class_name(class_name) + end + def all_for_class_name(class_name) available .values .select { |field| field.class_names.nil? || field.class_names.include?(class_name) } + .sort_by(&:order) + .reject { |format| format.label.nil? } end end end diff --git a/lib/open_project/object_linking.rb b/lib/open_project/object_linking.rb index d30875dca950..c0f8a137e01a 100644 --- a/lib/open_project/object_linking.rb +++ b/lib/open_project/object_linking.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -40,22 +42,21 @@ module ObjectLinking end # Displays a link to user's account page if active or registered - def link_to_user(user, options = {}) - if user.is_a?(User) && user.locked? - user.name - elsif user.is_a?(User) - name = user.name - href = user_url(user, - only_path: options.delete(:only_path) { true }) - options[:title] ||= I18n.t(:label_user_named, name:) + # Will attach a user hover card to the link. + def link_to_user(user, options = {}) # rubocop:disable Metrics/AbcSize + return h(user.to_s) unless user.is_a?(User) + return h(user.name) if user.locked? && !User.current.admin? - link_to(name, href, options) - else - h(user.to_s) - end + only_path = options.delete(:only_path) { true } + name = options.delete(:name) { user.name } + options[:title] ||= I18n.t(:label_user_named, name:) + + add_hover_card_options(user, options, only_path:) + + link_to(name, user_url(user, only_path:), options) end - # Displays a link to groups's account page + # Displays a link to group's account page def link_to_group(group, options = {}) return h(group.to_s) unless group.is_a?(Group) @@ -127,8 +128,36 @@ def link_to_project(project, options = {}, html_options = nil, show_icon = false end.html_safe end + # Like #link_to_user, but will render a Primer link instead of a regular link. + def primer_link_to_user(user, options = {}) + options[:href] ||= user_path(user) + options[:target] ||= "_blank" + options[:underline] ||= false + + options = add_hover_card_options(user, options) + + render Primer::Beta::Link.new(**options) do + user.name + end + end + private + # Accepts a user and an options hash. Will apply a hover card config for the user to the options hash. + # Will not do anything if `hover_card` is set to false within the options. + # You can use this method if you want to render a link and apply a user hover card to it. + def add_hover_card_options(user, options, only_path: true) + if options.delete(:hover_card) { true } && user.is_a?(User) + options[:data] ||= {} + + hover_card_url = hover_card_user_url(user, only_path:) + options[:data][:hover_card_url] = hover_card_url + options[:data][:hover_card_trigger_target] = "trigger" + end + + options + end + def project_link_name(project, show_icon) if show_icon && User.current.member_of?(project) icon_wrapper("icon-context icon-star", I18n.t(:description_my_project).html_safe + " ".html_safe) + project.name diff --git a/lib/open_project/patches/i18n_reject_empty_string.rb b/lib/open_project/patches/i18n_reject_empty_string.rb index 39aac96cff31..a89ce48b11fb 100644 --- a/lib/open_project/patches/i18n_reject_empty_string.rb +++ b/lib/open_project/patches/i18n_reject_empty_string.rb @@ -60,6 +60,6 @@ def replace_empty_strings(hash) end end -OpenProject::Patches.patch_gem_version "i18n", "1.14.6" do +OpenProject::Patches.patch_gem_version "i18n", "1.14.7" do I18n.backend.singleton_class.prepend OpenProject::Patches::I18nRejectEmptyString end diff --git a/lib/open_project/patches/secure_headers_turbo_aware_nonce.rb b/lib/open_project/patches/secure_headers_turbo_aware_nonce.rb index 3f8e498cb961..4090fe089b2a 100644 --- a/lib/open_project/patches/secure_headers_turbo_aware_nonce.rb +++ b/lib/open_project/patches/secure_headers_turbo_aware_nonce.rb @@ -37,6 +37,6 @@ def content_security_policy_script_nonce(request) end end -OpenProject::Patches.patch_gem_version "secure_headers", "7.0.0" do +OpenProject::Patches.patch_gem_version "secure_headers", "7.1.0" do SecureHeaders.singleton_class.prepend OpenProject::Patches::SecureHeadersTurboAwareNonce end diff --git a/lib/open_project/static/links.rb b/lib/open_project/static/links.rb index ed1dcb06eef0..0d0ad9d1f312 100644 --- a/lib/open_project/static/links.rb +++ b/lib/open_project/static/links.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -73,250 +75,10 @@ def dynamic_links end def static_links - { - upsale: { - href: "https://www.openproject.org/enterprise-edition", - label: "homescreen.links.upgrade_enterprise_edition" - }, - upsale_benefits_features: { - href: "https://www.openproject.org/enterprise-edition/#premium-features", - label: "noscript_learn_more" - }, - upsale_benefits_installation: { - href: "https://www.openproject.org/enterprise-edition/#installation", - label: "noscript_learn_more" - }, - upsale_benefits_security: { - href: "https://www.openproject.org/enterprise-edition/#security-features", - label: "noscript_learn_more" - }, - upsale_benefits_support: { - href: "https://www.openproject.org/enterprise-edition/#professional-support", - label: "noscript_learn_more" - }, - upsale_get_quote: { - href: "https://www.openproject.org/request-quote/", - label: "admin.enterprise.get_quote" - }, - user_guides: { - href: "https://www.openproject.org/docs/user-guide/", - label: "homescreen.links.user_guides" - }, - installation_guides: { - href: "https://www.openproject.org/docs/installation-and-operations/installation/", - label: :label_installation_guides - }, - packager_installation: { - href: "https://www.openproject.org/docs/installation-and-operations/installation/packaged/", - label: "Packaged installation" - }, - docker_installation: { - href: "https://www.openproject.org/docs/installation-and-operations/installation/docker/", - label: "Docker installation" - }, - manual_installation: { - href: "https://www.openproject.org/docs/installation-and-operations/installation/manual/", - label: "Manual installation" - }, - upgrade_guides: { - href: "https://www.openproject.org/docs/installation-and-operations/operation/upgrading/", - label: :label_upgrade_guides - }, - postgres_migration: { - href: "https://www.openproject.org/docs/installation-and-operations/misc/packaged-postgresql-migration/", - label: :"homescreen.links.postgres_migration" - }, - postgres_13_upgrade: { - href: "https://www.openproject.org/docs/installation-and-operations/misc/migration-to-postgresql13/" - }, - configuration_guide: { - href: "https://www.openproject.org/docs/installation-and-operations/configuration/", - label: "links.configuration_guide" - }, - contact: { - href: "https://www.openproject.org/contact/", - label: "links.get_in_touch" - }, - glossary: { - href: "https://www.openproject.org/docs/glossary/", - label: "homescreen.links.glossary" - }, - shortcuts: { - href: "https://www.openproject.org/docs/user-guide/keyboard-shortcuts-access-keys/", - label: "homescreen.links.shortcuts" - }, - forums: { - href: "https://community.openproject.org/projects/openproject/forums", - label: "homescreen.links.forums" - }, - enterprise_support_as_community: { - href: "https://www.openproject.org/pricing/#support", - label: :label_enterprise_support - }, - enterprise_support: { - href: "https://www.openproject.org/docs/enterprise-guide/support/", - label: :label_enterprise_support - }, - website: { - href: "https://www.openproject.org", - label: "label_openproject_website" - }, - newsletter: { - href: "https://www.openproject.org/newsletter", - label: "homescreen.links.newsletter" - }, - blog: { - href: "https://www.openproject.org/blog", - label: "homescreen.links.blog" - }, - blog_article_progress_changes: { - href: "https://www.openproject.org/blog/updates-to-progress-tracking-in-14-4-based-on-user-feedback/", - label: "Significant changes to progress and work estimates" - }, - release_notes: { - href: "https://www.openproject.org/docs/release-notes/", - label: :label_release_notes - }, - release_notes_14_0_1: { - href: "https://www.openproject.org/docs/release-notes/14-0-1/", - label: "Release notes for OpenProject 14.0.1" - }, - data_privacy: { - href: "https://www.openproject.org/legal/privacy/", - label: :label_privacy_policy - }, - digital_accessibility: { - href: "https://www.openproject.org/de/rechtliches/erklaerung-zur-digitalen-barrierefreiheit/", - label: :label_digital_accessibility - }, - report_bug: { - href: "https://www.openproject.org/docs/development/report-a-bug/", - label: :label_report_bug - }, - roadmap: { - href: "https://community.openproject.org/projects/openproject/roadmap", - label: :label_development_roadmap - }, - crowdin: { - href: "https://www.openproject.org/docs/development/translate-openproject/", - label: :label_add_edit_translations - }, - api_docs: { - href: "https://www.openproject.org/docs/api/", - label: :label_api_doc - }, - text_formatting: { - href: "https://www.openproject.org/docs/user-guide/wysiwyg/", - label: :setting_text_formatting - }, - oauth_authorization_code_flow: { - href: "https://oauth.net/2/grant-types/authorization-code/", - label: "oauth.flows.authorization_code" - }, - client_credentials_code_flow: { - href: "https://oauth.net/2/grant-types/client-credentials/", - label: "oauth.flows.client_credentials" - }, - ldap_encryption_documentation: { - href: "https://www.rubydoc.info/gems/net-ldap/Net/LDAP#constructor_details" - }, - origin_mdn_documentation: { - href: "https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Origin" - }, - security_badge_documentation: { - href: "https://www.openproject.org/docs/system-admin-guide/information/#security-badge" - }, - date_format_settings_documentation: { - href: "https://www.openproject.org/docs/system-admin-guide/calendars-and-dates/#date-format" - }, - chargebee: { - href: "https://js.chargebee.com/v2/chargebee.js" - }, - webinar_videos: { - href: "https://www.youtube.com/watch?v=un6zCm8_FT4" - }, - get_started_videos: { - href: "https://www.youtube.com/playlist?list=PLGzJ4gG7hPb8WWOWmeXqlfMfhdXReu-RJ" - }, - openproject_docs: { - href: "https://www.openproject.org/docs/" - }, - contact_us: { - href: "https://www.openproject.org/contact/" - }, - pricing: { - href: "https://www.openproject.org/pricing/" - }, - progress_tracking_docs: { - href: "https://www.openproject.org/docs/user-guide/time-and-costs/progress-tracking/" - }, - enterprise_docs: { - form_configuration: { - href: "https://www.openproject.org/docs/system-admin-guide/manage-work-packages/work-package-types/#work-package-form-configuration-enterprise-add-on" - }, - attribute_highlighting: { - href: "https://www.openproject.org/docs/user-guide/work-packages/work-package-table-configuration/#attribute-highlighting-enterprise-add-on" - }, - boards: { - href: "https://www.openproject.org/docs/user-guide/agile-boards/#action-boards-enterprise-add-on" - }, - custom_field_projects: { - href: "https://www.openproject.org/docs/system-admin-guide/custom-fields/custom-fields-projects/" - }, - custom_field_multiselect: { - href: "https://www.openproject.org/docs/system-admin-guide/custom-fields/#create-a-multi-select-custom-field" - }, - status_read_only: { - href: "https://www.openproject.org/docs/system-admin-guide/manage-work-packages/work-package-status/#create-a-new-work-package-status" - } - }, - sysadmin_docs: { - saml: { - href: "https://www.openproject.org/docs/system-admin-guide/authentication/saml/" - }, - oidc: { - href: "https://www.openproject.org/docs/installation-and-operations/misc/custom-openid-connect-providers/" - }, - oidc_claims: { - href: "https://www.openproject.org/docs/installation-and-operations/misc/custom-openid-connect-providers/#claims" - }, - oidc_acr_values: { - href: "https://www.openproject.org/docs/installation-and-operations/misc/custom-openid-connect-providers/#non-essential-claims" - } - }, - storage_docs: { - setup: { - href: "https://www.openproject.org/docs/system-admin-guide/integrations/storage/" - }, - nextcloud_setup: { - href: "https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/" - }, - one_drive_setup: { - href: "https://www.openproject.org/docs/system-admin-guide/integrations/one-drive/" - }, - one_drive_drive_id_guide: { - href: "https://www.openproject.org/docs/system-admin-guide/integrations/one-drive/drive-guide/" - }, - nextcloud_oauth_application: { - href: "https://apps.nextcloud.com/apps/integration_openproject" - }, - one_drive_oauth_application: { - href: "https://portal.azure.com/" - }, - troubleshooting: { - href: "https://www.openproject.org/docs/user-guide/file-management/nextcloud-integration/#possible-errors-and-troubleshooting" - }, - health_status: { - href: "https://www.openproject.org/docs/system-admin-guide/files/external-file-storages/health-status/" - } - }, - ical_docs: { - href: "https://www.openproject.org/docs/user-guide/calendar/#subscribe-to-a-calendar" - }, - integrations: { - href: "https://www.openproject.org/docs/system-admin-guide/integrations/" - } - } + @static_links ||= begin + yaml = Rails.root.join("config/static_links.yml").read + YAML.safe_load(yaml, permitted_classes: [Symbol], symbolize_names: true) + end end end end diff --git a/lib/open_project/text_formatting/filters/markdown_filter.rb b/lib/open_project/text_formatting/filters/markdown_filter.rb index 5ebd68ccc5e5..70dbdfd2d2fb 100644 --- a/lib/open_project/text_formatting/filters/markdown_filter.rb +++ b/lib/open_project/text_formatting/filters/markdown_filter.rb @@ -43,12 +43,13 @@ def call def commonmarker_options { parse: { smart: false }, - extension: commonmark_extensions.index_with(true), + extension: commonmark_extensions, render: { unsafe: true, escape: false, github_pre_lang: true, - hardbreaks: context[:gfm] != false + hardbreaks: context[:gfm] != false, + escaped_char_spans: false } } end @@ -60,7 +61,11 @@ def commonmarker_plugins ## # Extensions to the default CommonMarker operation def commonmark_extensions - context.fetch :commonmarker_extensions, %i[table strikethrough tagfilter] + # Disable all the extension enabled by default by commonmarker. + %i[strikethrough tagfilter table autolink tasklist shortcodes] + .index_with(false) + # But enable those that the context has enabled explicitly + .merge(context.fetch(:commonmarker_extensions, %i[table strikethrough tagfilter]).index_with(true)) end end end diff --git a/lib/open_project/text_formatting/filters/mention_filter.rb b/lib/open_project/text_formatting/filters/mention_filter.rb index 9ced1b421ca8..c5deaaf0c350 100644 --- a/lib/open_project/text_formatting/filters/mention_filter.rb +++ b/lib/open_project/text_formatting/filters/mention_filter.rb @@ -75,8 +75,11 @@ def group_mention(group) def work_package_mention(work_package) link_to("##{work_package.id}", work_package_path_or_url(id: work_package.id, only_path: context[:only_path]), - class: "issue work_package op-hover-card--preview-trigger", - data: { "hover-card-url": hover_card_work_package_path(work_package.id) }) + class: "issue work_package", + data: { + hover_card_trigger_target: "trigger", + hover_card_url: hover_card_work_package_path(work_package.id) + }) end def class_from_mention(mention) diff --git a/lib/open_project/text_formatting/filters/table_of_contents_filter.rb b/lib/open_project/text_formatting/filters/table_of_contents_filter.rb index e216f632207b..91b4d47430d4 100644 --- a/lib/open_project/text_formatting/filters/table_of_contents_filter.rb +++ b/lib/open_project/text_formatting/filters/table_of_contents_filter.rb @@ -40,14 +40,9 @@ def initialize(doc, context = nil, result = nil) @ids = Set.new end - def add_header_link(node, id) - link = content_tag(:a, - "", - class: "op-uc-link_permalink icon-link", - "aria-hidden": true, - href: "##{id}") + def add_header_link_class_and_id(node, id) + node.css("a").first["class"] = "op-uc-link_permalink icon-link" node["id"] = id - node.add_child(link) end ## @@ -66,8 +61,7 @@ def get_unique_id(text) end ## - # Appends the header link and returns - # a toc item. + # Adds the bem classes to the header link and returns a toc item. # The item is prefixed by a number. If there is already a number prefix provided in the text, # that prefix is used if it matches the calculated number. def process_item(node, number) @@ -75,7 +69,7 @@ def process_item(node, number) return "".html_safe unless text.present? id = get_unique_id(text) - add_header_link(node, id) + add_header_link_class_and_id(node, id) content_tag(:li, class: "op-uc-toc--list-item") do anchor_tag(text, number, id) diff --git a/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb b/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb index 42128b5a8733..f4b58eaff9d6 100644 --- a/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb +++ b/lib/open_project/text_formatting/matchers/link_handlers/work_packages.rb @@ -66,8 +66,11 @@ def render_work_package_macro(wp_id, detailed: false) def render_work_package_link(wp_id) link_to("##{wp_id}", work_package_path_or_url(id: wp_id, only_path: context[:only_path]), - class: "issue work_package op-hover-card--preview-trigger", - data: { "hover-card-url": hover_card_work_package_path(wp_id) }) + class: "issue work_package", + data: { + hover_card_trigger_target: "trigger", + hover_card_url: hover_card_work_package_path(wp_id) + }) end end end diff --git a/lib/open_project/version.rb b/lib/open_project/version.rb index 4c9dbff1eddc..c30fc708e9a1 100644 --- a/lib/open_project/version.rb +++ b/lib/open_project/version.rb @@ -32,8 +32,8 @@ module OpenProject module VERSION # :nodoc: MAJOR = 15 - MINOR = 2 - PATCH = 1 + MINOR = 3 + PATCH = 0 class << self # Used by semver to define the special version (if any). diff --git a/lib/primer/open_project/forms/autocompleter.html.erb b/lib/primer/open_project/forms/autocompleter.html.erb index 04d63c65a959..cb6e71d90109 100644 --- a/lib/primer/open_project/forms/autocompleter.html.erb +++ b/lib/primer/open_project/forms/autocompleter.html.erb @@ -1,28 +1,9 @@ <%= render(FormControl.new(input: @input, data: @wrapper_data_attributes)) do %> <%= content_tag(:div, **@field_wrap_arguments) do %> - <% if decorated_select? %> - <%= render partial: '/augmented/autocomplete_select_decoration', - formats: %i[html], - locals: { - input_name: @autocomplete_options.fetch(:inputName) { builder.field_name(@input.name) }, - input_id: @autocomplete_options.fetch(:inputId) { builder.field_id(@input.name) }, - select_options: select_options.map(&:to_h), - multiple: @autocomplete_options.fetch(:multiple, false), - key: @autocomplete_options.fetch(:resource, ''), - append_to: @autocomplete_options.fetch(:append_to, 'body') - } %> - <% else %> - <%= content_tag(:div, class: ("projects-autocomplete-with-search-icon" if @autocomplete_options.delete(:with_search_icon))) do %> - <%= angular_component_tag @autocomplete_options.fetch(:component), - data: @autocomplete_options.delete(:data) { {} }, - inputs: @autocomplete_options.merge( - classes: "ng-select--primerized #{@input.invalid? ? '-error' : ''}", - inputName: @autocomplete_options.fetch(:inputName) { builder.field_name(@input.name) }, - inputValue: @autocomplete_options.fetch(:inputValue) { builder.object.send(@input.name) }, - defaultData: @autocomplete_options.fetch(:defaultData) { true } - ) - %> - <% end %> + <%= content_tag(:div, class: ["form-autocompleter-container", ("projects-autocomplete-with-search-icon" if @with_search_icon)]) do %> + <%= angular_component_tag(@autocomplete_component, + data: @autocomplete_data, + inputs: @autocomplete_inputs) %> <% end %> <% end %> <% end %> diff --git a/lib/primer/open_project/forms/autocompleter.rb b/lib/primer/open_project/forms/autocompleter.rb index f2d35812d62a..0eab3cfe3304 100644 --- a/lib/primer/open_project/forms/autocompleter.rb +++ b/lib/primer/open_project/forms/autocompleter.rb @@ -8,17 +8,36 @@ class Autocompleter < Primer::Forms::BaseComponent include AngularHelper prepend WrappedInput - delegate :builder, :form, :select_options, to: :@input + delegate :builder, :form, to: :@input def initialize(input:, autocomplete_options:, wrapper_data_attributes: {}) super() @input = input - @autocomplete_options = autocomplete_options + @with_search_icon = autocomplete_options.delete(:with_search_icon) { false } + @autocomplete_component = autocomplete_options.delete(:component) { "opce-autocompleter" } + @autocomplete_data = autocomplete_options.delete(:data) { {} } + @autocomplete_inputs = extend_autocomplete_inputs(autocomplete_options) @wrapper_data_attributes = wrapper_data_attributes end - def decorated_select? - @autocomplete_options[:decorated] + def extend_autocomplete_inputs(inputs) # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity + inputs[:classes] = "ng-select--primerized #{@input.invalid? ? '-error' : ''}" + inputs[:inputName] ||= builder.field_name(@input.name) + inputs[:labelForId] ||= builder.field_id(@input.name) + inputs[:defaultData] = true unless inputs.key?(:defaultData) + + if inputs.delete(:decorated) + inputs[:items] = @input.select_options.map(&:to_h) + selected = @input.select_options.filter_map { |option| option.to_h if option.selected } + inputs[:model] = inputs[:multiple] ? selected : selected.first + inputs[:defaultData] = false + inputs[:additionalClassProperty] = "classes" + inputs[:bindLabel] = "name" + elsif builder.object + inputs[:inputValue] ||= builder.object.send(@input.name) + end + + inputs end end end diff --git a/lib/primer/open_project/forms/color_select.html.erb b/lib/primer/open_project/forms/color_select.html.erb index a6678dce90de..fe59102fab55 100644 --- a/lib/primer/open_project/forms/color_select.html.erb +++ b/lib/primer/open_project/forms/color_select.html.erb @@ -2,7 +2,7 @@ <%= content_tag(:div, **@field_wrap_arguments) do %> <%= builder.hidden_field :color_id %> <%= angular_component_tag("opce-colors-autocompleter", - class: "colors-autocomplete form--select-container -middle", + class: "colors-autocomplete form--select-container", data: { colors:, classes: "ng-select--primerized", diff --git a/lib/primer/open_project/forms/dsl/autocompleter_input.rb b/lib/primer/open_project/forms/dsl/autocompleter_input.rb index 497658f27d91..05478085c74e 100644 --- a/lib/primer/open_project/forms/dsl/autocompleter_input.rb +++ b/lib/primer/open_project/forms/dsl/autocompleter_input.rb @@ -8,20 +8,21 @@ class AutocompleterInput < Primer::Forms::Dsl::Input attr_reader :name, :label, :autocomplete_options, :select_options, :wrapper_data_attributes class Option - attr_reader :label, :value, :selected + attr_reader :label, :value, :selected, :classes - def initialize(label:, value:, selected: false) + def initialize(label:, value:, classes: nil, selected: false) @label = label @value = value @selected = selected + @classes = classes end def to_h { - label:, - value:, - selected: - } + id: value, + name: label, + classes: + }.compact end end diff --git a/lib/primer/open_project/forms/dsl/input_methods.rb b/lib/primer/open_project/forms/dsl/input_methods.rb index eca21f89ef75..25ada7426cab 100644 --- a/lib/primer/open_project/forms/dsl/input_methods.rb +++ b/lib/primer/open_project/forms/dsl/input_methods.rb @@ -9,6 +9,10 @@ def autocompleter(**, &) add_input AutocompleterInput.new(builder:, form:, **, &) end + def pattern_input(**, &) + add_input PatternInput.new(builder:, form:, **, &) + end + def color_select_list(**, &) add_input ColorSelectInput.new(builder:, form:, **, &) end diff --git a/lib/primer/open_project/forms/dsl/pattern_input.rb b/lib/primer/open_project/forms/dsl/pattern_input.rb new file mode 100644 index 000000000000..31388419be1c --- /dev/null +++ b/lib/primer/open_project/forms/dsl/pattern_input.rb @@ -0,0 +1,62 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Primer + module OpenProject + module Forms + module Dsl + class PatternInput < Primer::Forms::Dsl::Input + attr_reader :name, :label, :value, :suggestions + + def initialize(name:, label:, value:, suggestions:, **system_arguments) + @name = name + @label = label + @value = value + @suggestions = suggestions + + super(**system_arguments) + end + + def to_component + WorkPackages::Types::PatternInput.new(input: self, value:, suggestions:) + end + + def type + :pattern_autocompleter + end + + def focusable? + true + end + end + end + end + end +end diff --git a/lib/tasks/parallel_testing.rake b/lib/tasks/parallel_testing.rake index 56c49d81bab4..f78856e70772 100644 --- a/lib/tasks/parallel_testing.rake +++ b/lib/tasks/parallel_testing.rake @@ -67,7 +67,7 @@ namespace :parallel do end def group_option_string(parsed_options) - group_options = parsed_options ? "-n #{parsed_options[:num_cpus]}" : "" + group_options = parsed_options[:num_cpus] ? "-n #{parsed_options[:num_cpus]}" : "" group_options += " --only-group #{parsed_options[:group]}" if parsed_options[:group] group_options diff --git a/lib_static/open_project/authentication/strategies/warden/jwt_oidc.rb b/lib_static/open_project/authentication/strategies/warden/jwt_oidc.rb index 94d3edb0d56e..573cddb809f3 100644 --- a/lib_static/open_project/authentication/strategies/warden/jwt_oidc.rb +++ b/lib_static/open_project/authentication/strategies/warden/jwt_oidc.rb @@ -5,12 +5,6 @@ module Warden class JwtOidc < ::Warden::Strategies::Base include FailWithHeader - SUPPORTED_ALG = %w[ - RS256 - RS384 - RS512 - ].freeze - # The strategy is supposed to only handle JWT. # These tokens are supposed to be issued by configured OIDC. def valid? @@ -19,60 +13,21 @@ def valid? ) return false if @access_token.blank? - @unverified_payload, @unverified_header = JWT.decode(@access_token, nil, false) - @unverified_header.present? && @unverified_payload.present? + unverified_payload, unverified_header = JWT.decode(@access_token, nil, false) + unverified_payload.present? && unverified_header.present? rescue JWT::DecodeError false end def authenticate! - issuer = @unverified_payload["iss"] - provider = OpenProject::OpenIDConnect.providers.find { |p| p.configuration[:issuer] == issuer } if issuer.present? - if provider.blank? - return fail_with_header!(error: "invalid_token", error_description: "The access token issuer is unknown") - end - - client_id = provider.configuration.fetch(:identifier) - alg = @unverified_header.fetch("alg") - if SUPPORTED_ALG.exclude?(alg) - return fail_with_header!(error: "invalid_token", error_description: "Token signature algorithm is not supported") - end - - kid = @unverified_header.fetch("kid") - jwks_uri = provider.configuration[:jwks_uri] - begin - key = JSON::JWK::Set::Fetcher.fetch(jwks_uri, kid:).to_key - rescue JSON::JWK::Set::KidNotFound - return fail_with_header!(error: "invalid_token", error_description: "The access token signature kid is unknown") - end - - begin - verified_payload, = JWT.decode( - @access_token, - key, - true, - { - algorithm: alg, - verify_iss: true, - verify_aud: true, - iss: issuer, - aud: client_id, - required_claims: ["sub", "iss", "aud"] - } - ) - rescue JWT::ExpiredSignature - return fail_with_header!(error: "invalid_token", error_description: "The access token expired") - rescue JWT::ImmatureSignature - # happens when nbf time is less than current - return fail_with_header!(error: "invalid_token", error_description: "The access token is used too early") - rescue JWT::InvalidIssuerError - return fail_with_header!(error: "invalid_token", error_description: "The access token issuer is wrong") - rescue JWT::InvalidAudError - return fail_with_header!(error: "invalid_token", error_description: "The access token audience claim is wrong") - end - - user = User.find_by(identity_url: "#{provider.name}:#{verified_payload['sub']}") - success!(user) if user + ::OpenIDConnect::JwtParser.new(required_claims: ["sub"]).parse(@access_token).either( + ->(payload_and_provider) do + payload, provider = payload_and_provider + user = User.find_by(identity_url: "#{provider.slug}:#{payload['sub']}") + success!(user) if user + end, + ->(error) { fail_with_header!(error: "invalid_token", error_description: error) } + ) end end end diff --git a/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb b/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb index 68a790884cbe..20393e25323e 100644 --- a/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb +++ b/lib_static/plugins/acts_as_customizable/lib/acts_as_customizable.rb @@ -49,7 +49,9 @@ def acts_as_customizable(options = {}) dependent: :delete_all, validate: false, autosave: true - validate :validate_custom_values + + validation_options = options[:validate_on] ? { on: options[:validate_on] } : {} + validate :validate_custom_values, **validation_options send :include, Redmine::Acts::Customizable::InstanceMethods before_save :ensure_custom_values_complete diff --git a/lib_static/redmine/i18n.rb b/lib_static/redmine/i18n.rb index 52dfcf29864d..68a150f58714 100644 --- a/lib_static/redmine/i18n.rb +++ b/lib_static/redmine/i18n.rb @@ -45,6 +45,19 @@ def self.all_languages .sort end + def self.start_of_week + case Setting.start_of_week.to_i + when 1 + :monday + when 7 + :sunday + when 6 + :saturday + else + Date.beginning_of_week + end + end + def self.valid_languages all_languages & (Setting.available_languages + [Setting.default_language]) end @@ -172,6 +185,21 @@ def formatted_time_zone_offset(user: User.current) "UTC#{user.time_zone.now.formatted_offset}" end + ## + # Formats an ActiveSupport::TimeZone object into a user-friendly string. + # @param time_zone [ActiveSupport::TimeZone] The time zone to format. + # @return [String] The formatted time zone string. + def friendly_timezone_name(time_zone) + tz_info = time_zone.tzinfo + + if tz_info.canonical_zone.name == "Etc/UTC" + "UTC" + else + friendly_names = ActiveSupport::TimeZone::MAPPING.select { |_, v| v == tz_info.canonical_zone.name }.keys.sort + "(UTC#{ActiveSupport::TimeZone.seconds_to_utc_offset(tz_info.base_utc_offset)}) #{friendly_names.join(', ')}" + end + end + def day_name(day) ::I18n.t("date.day_names")[day % 7] end diff --git a/lookbook/docs/patterns/02-forms.md.erb b/lookbook/docs/patterns/02-forms.md.erb index b757110c9417..7635efc710a9 100644 --- a/lookbook/docs/patterns/02-forms.md.erb +++ b/lookbook/docs/patterns/02-forms.md.erb @@ -10,6 +10,7 @@ A form may be composed of these elements: - Text input - Text area +- Rich text area - Select - Toggle switch - Checkbox @@ -166,6 +167,128 @@ Important data inputs: - If you want the target to be visibly blocked, not hidden, then use `data: { set_visibility: "true" }`. By default, the field will be hidden and removed from DOM computation. +### Advanced Interactivity by previewing forms before submission + +In order to implement complex form interactions other than hiding or showing fields, we can use the form preview pattern. A few examples of such interactions include displaying instant form validation errors on a changed field, or on its related fields. Another example is updating the caption of an input field based on its value. Handling each element update separately in these scenarios would be too cumbersome. A much better approach is to re-render the whole form when a field changes, preferably using a turbo streams morph response. + +In the example below we can see how the preview mechanism can be applied to forms: + +<%= embed OpPrimer::FormPreview, :default %> + +#### How it works: + +The form preview mechanism can be applied to any form by binding the `form-preview` global stimulus controller to it and then watch the input fields for changes: + + ```ruby + primer_form_with( + url: "/foo", + method: :get, + data: { + "controller": "form-preview", + "form-preview-url-value": preview_path + } + ) do |f| + f.text_field(name: :answer, data: { action: "change->form-preview#submit" }) + end + ``` +- `"controller": "form-preview"` will activate the stimulus controller that processes the form refresh. +- `"form-preview-url-value"` defines the path to be used for submitting the form preview. +- Setting the `data: { action: "change->form-preview#submit" }` on an individual input field will trigger the form preview action when the field is changed. + +#### Customizing the triggering mechanism: + +In some cases we might want to further customize the triggering behaviour, for example when using a date range picker input field. For date range pickers we want to trigger the form preview only when the both the start and end dates are chosen and the datepicker is closed. The solution is to create a form specific controller that will inherit from the `FormPreviewController` controller, and it decides if the `submit` action needs to be called. + +1. The form specific controller handles the input changes on the form. It also calls the `submit()` function from the parent controller when the date range picker is not visible anymore. + + ```typescript + export default class CustomFormPreviewFormController extends FormPreviewController { + previewForm(event:Event) { + const target = event.target as HTMLElement; + if (this.datePickerVisible(target)) { + return; // The datepicker is still open, do not submit yet. + } + + this.submit(); + } + } + ``` +2. The definition of the controller and the preview url should also point to the new controller: + + ```ruby + primer_form_with( + url: "/foo", + method: :get, + data: { + "controller": "custom-form-preview", + "custom-form-preview-url-value": preview_path + } + ) do |f| + f.text_field(name: :answer, data: { action: "change->custom-form-preview#previewForm" }) + end + ``` + - The `data: { action: "change->custom-form-preview#previewForm" }` watches the input changes and calls the `custom-form-preview#previewForm`. + +**Important note:** Javascript rendered elements inside the form such as the datepicker above, could be broken after the form update. This happens, because the datepicker input get replaced without re-initializing the datepicker library. To fix the issue, we can either avoid updating the datepicker input elements using "data-turbo-permanent", or we can programatically re-initialize them after the form update. In case of angular components, this issue is solved automatically by not updating them the components. For more info see the `turbo:before-morph-element` eventlistener in the `turbo-global-listeners.ts`. + + +#### How to handle the form preview actions on the backend? + +The form preview mechanism shown above can be nicely tied with our existing ActiveRecord object saving services. + +1. First, we'll create a `PreviewAttributesService` that inherits from the `SetAttributes` service. This new service is nearly identical to `SetAttributes`, with one key difference: it clears validation errors for fields that the user hasn't modified. This is particularly important when creating new objects. For instance, if the user modifies the first input field, all fields will be validated and errors will be displayed, which is undesirable. Instead, we want to display errors incrementally as the user progresses through the form. With this approach, users will experience instant validation as they complete each field. + + ```ruby + module WorkPackages + class PreviewAttributesService < ::BaseServices::SetAttributes + def perform(*) + super.tap do |service_call| + clear_unchanged_fields(service_call) + end + end + + private + + def clear_unchanged_fields(service_call) + work_package = service_call.result + work_package + .errors + .select { |error| work_package.changed.exclude?(error.attribute.to_s) } + .each do |error| + work_package.errors.delete(error.attribute) + end + end + end + end + ``` + +2. Then we define a new controller member action called `work_package_form` alongside the crud actions and use the newly defined `PreviewAttributesService`. + + ```ruby + class WorkPackagesController < ApplicationController + def work_package_form + service_call = ::WorkPackages::PreviewAttributesService + .new(user: current_user, + model: @work_package, + contract_class: WorkPackage::UpdateContract) + .call(permitted_params.work_package) + + update_via_turbo_stream( + component: WorkPackages::EditComponent.new(service_call.result), + method: "morph" + ) + # TODO: :unprocessable_entity is not nice, change the dialog logic to accept :ok + # without dismissing the dialog, alternatively use turbo frames instead of streams. + respond_to_with_turbo_streams(status: :unprocessable_entity) + + end + end + ``` + - For a smoother user experience, it is recommended to respond with the `method: "morph"` via turbo streams. This will ensure the user's input focus is maintained between field updates. It is useful for form previews that are triggered on a keystroke event instead of the change event. + - The turbo stream response could be replaced with a plain turbo drive html response, once we have the turbo drive morphing enabled. + - Responding with a `status: :unprocessable_entity` is also important, because we intend to display validation errors on the form. + +3. Having the service and the controller action in place, we can defined form preview path on the form by adding the `"form-preview-url-value": work_packages_form_path(@work_package)` attribute. ### Accessing the form model @@ -403,3 +526,43 @@ So far, the following helpers are available: normally handled by the settings form decorator in another way than intended. Any call to a method that is not defined on the settings form decorator will be forwarded to this form builder instance so its usage is transparent. + + +## Rich text editor + +OpenProject uses CKEditor for rich text editing. +See https://www.openproject.org/docs/development/concepts/wysiwyg-editor/ for more information on how the editor works +and how it is used in frontend code. + +To add a rich text field to a primer form, use the `form.rich_text_area` input: + +```ruby + form do |agenda_item_form| + agenda_item_form.rich_text_area( + name: :notes, + label: MeetingAgendaItem.human_attribute_name(:notes), + disabled: @disabled, + rich_text_options: { + resource:, + showAttachments: false + } + ) + end +``` + +Under the hood, this will render a textarea and next to it, a custom element called `opce-ckeditor-augmented-textarea`. +This custom element will sync the markdown output from the rich text editor to the textarea, so that on submission, +markdown is sent as if it was contained in the textarea. + +### Options + +Here are the most common options you'd pass to the rich text editor: + +- **resource**: An APIv3 represented resource to attach attachments to. For example, if you are editing a work package, + you would pass `API::V3::WorkPackages::WorkPackageRepresenter.new(work_package, current_user: User.current, embed_links: false)` +- **showAttachments**: (false) Whether to show attachments below the editor. They will only be present if `resource` is present +- **editorType**: (full) The type of editor to use. Currently, only `full` (all macros) and `constrained` (limited functionality) is supported. + +### Examples + +<%= embed OpenProject::Common::RichTextPreview, :default, panels: %i[source] %> diff --git a/lookbook/docs/patterns/08-flash-banner.md.erb b/lookbook/docs/patterns/08-flash-banner.md.erb index f89b5e1e377f..d3055300f6d6 100644 --- a/lookbook/docs/patterns/08-flash-banner.md.erb +++ b/lookbook/docs/patterns/08-flash-banner.md.erb @@ -47,7 +47,7 @@ flash[:error] = { message: "Oh no!", icon: :alert, dismiss_scheme: :none } The interesting part is having a flash message responded from within a turbo stream response -When a Primerised flash is required, this component can be used by calling `update_flash_message_via_turbo_stream()`. Under the hood, this prepends via turbo stream the `UpdateFlashComponent` in the `#banner-messages` div within the base layout. +When a Primerised flash is required, this component can be used by calling `render_flash_message_via_turbo_stream()`. Under the hood, this prepends via turbo stream the `UpdateFlashComponent` in the `#banner-messages` div within the base layout. The icon, dismiss scheme, and scheme are configurable identically to the Primer `Banner` component. A `message` property is added that will be passed as the content of the banner. @@ -55,7 +55,7 @@ A `message` property is added that will be passed as the content of the banner. For example: ```ruby -update_flash_message_via_turbo_stream( +render_flash_message_via_turbo_stream( message: t(:notice_project_not_found), full: true, dismiss_scheme: :hide, @@ -71,9 +71,15 @@ Please create a code maintenance ticket if you need to append/prepend messages i ## Further Examples +### Success: + +As this is a common use case, the `render_success_flash_message_via_turbo_stream()` helper method is provided, generating a flash with `scheme: :success` by default. + +<%= embed OpPrimer::FlashComponentPreview, :success, panels: %i[source] %> + ### Danger: -As this is a common use case, the method `render_error_flash_message_via_turbo_stream()` is provided, generating a flash with `scheme: :danger` and `icon: :stop` by default. +Also, `render_error_flash_message_via_turbo_stream()` is provided, generating a flash with `scheme: :danger` and `icon: :stop` by default. <%= embed OpPrimer::FlashComponentPreview, :danger, panels: %i[source] %> diff --git a/lookbook/docs/patterns/12-page-heading.md.erb b/lookbook/docs/patterns/12-page-heading.md.erb new file mode 100644 index 000000000000..1be6cce3cc84 --- /dev/null +++ b/lookbook/docs/patterns/12-page-heading.md.erb @@ -0,0 +1,29 @@ +The OP Heading component is a custom component which should be used for individual headers on a page below the `Primer::OpenProject::PageHeader`. It allows you to use a standard HTML heading with appropriate styling for use within OpenProject. + +## Note + +The OP Heading is not meant as a complete replacement of the Primer Heading as that one might can still be used, for example in the `Primer::OpenProject::SidePanel`. + +## Overview + +<%= embed Patterns::HeadingPreview, :default %> + +## Anatomy + +The OP Heading consists simply of a regular HTML `h` tag. It takes one input to specify which level of heading (from h1 to h6) should be used. + +## Options + +Currently, there are no additional options implemented. It is planned to support an optional divider at the bottom. + +This is useful in places like Settings pages that might need more visual differentiation between sections. + +## Used in + +The `Heading` is used: + +- Recurring meetings and meeting series index pages + +## Technical notes + +Internally, the `Primer::OpenProject::Heading` component calls the normal `Primer::Beta::Heading` with an overwritten (lower) font-weight. diff --git a/lookbook/docs/patterns/12-tables.md.erb b/lookbook/docs/patterns/13-tables.md.erb similarity index 100% rename from lookbook/docs/patterns/12-tables.md.erb rename to lookbook/docs/patterns/13-tables.md.erb diff --git a/lookbook/docs/patterns/13-feedback-dialog-and-feedback-message.md.erb b/lookbook/docs/patterns/14-feedback-dialog-and-feedback-message.md.erb similarity index 100% rename from lookbook/docs/patterns/13-feedback-dialog-and-feedback-message.md.erb rename to lookbook/docs/patterns/14-feedback-dialog-and-feedback-message.md.erb diff --git a/lookbook/docs/patterns/15-danger-dialog.md.erb b/lookbook/docs/patterns/15-danger-dialog.md.erb new file mode 100644 index 000000000000..b362ddca9415 --- /dev/null +++ b/lookbook/docs/patterns/15-danger-dialog.md.erb @@ -0,0 +1,96 @@ +The DangerDialog is used to direct the user's attention towards a potentially destructive, non-reversible action such as deletion. + +There are two variants: + +1. **Danger Confirmation** requires an addition interaction from the user (i.e, checking a checkbox) in addition to a visual and text warning before they are able to confirm the action +2. **Danger Warning** simply presents the user with a visual and text warning before they confirm the action + +The dialog aims to reduce cases of accidental deletion that may result from the browser "Are you sure?" confirmation dialog not sufficiently conveying the potential risks of a particular user action. + +The DangerDialog is related to the FeedbackDialog, sharing some common behavior. + +### Overview + +<%= embed Patterns::DangerDialogPreview, :default, panels: %i[source] %> + +### Anatomy + +The FeedbackDialog is a variation of FeedbackDialog. It consists of: + +- A red warning icon +- A title: a short description of the dialog action. This should be written in a neutral tone. The title is currently only used for accessibility purposes. Examples: + - "Delete work package" + - "Delete project" +- A heading: a question inviting the user to take a decision, This should be written in an active tone. You may also to give the full descriptive name of the resource on which the action will take place (e.g. "meeting occurrence" rather than just "meeting"). Examples: + - "Permanently delete this work package?" + - "Cancel this meeting occurrence?" +- A message explaining the consequences +- An additional content slot +- (For the Danger Confirmation) A confirmation checkbox with text: "I understand that this deletion cannot be reversed" +- Footer actions: "Cancel" and "Delete" (danger red) + +For the Danger Confirmation, the primary button text is "Delete permanently" and it is disabled until the user checks the confirmation checkbox. + +The button text can be customized if the dialog action is not a deletion. + +The additional content area can be replaced with other options, such as different text, a list of work packages or additional interaction. + +### Options + +Some elements can be customised: + +- The heading text +- The contents of the content slot +- The text of the confirmation checkbox +- The texts of the footer action buttons + +If you need a variant with a different structure, please contact the UX and Front-end Primer teams. + +### Best practices + +#### Do: + +- Do give the user relevant detail possible. For example, when bulk deleting, list the work packages that will be deleted. If the relevant details are too detailed (for example, there are over 10 work packages to be deleted), provide a summary instead of listing all individual items. +- Do use the simplest variant that will do the job, usually the default with customised text tailored to the specific context. Only choose variations or add additional elements if absolutely required. + +#### Don't: + +- Don't overload the content slot with too much information or additional interactions; we want the user to read and understand the consequences of this action. If the context that is needed is particularly complicated, consult the Design team for help on how to proceed. +- Don't use it to provide feedback. Use the FeedbackDialog instead. +- Don't add additional margins or spacing. +- Don't change the danger icon + +### Used in + +The DangerDialog will replace the traditional Rails danger zone area in at least these places: + +- work_packages: bulk/destroyusers: deletion +- repositories: destroy +- projects: change identifier +- placeholder_users: deletion +- projects: destroy +- storages: destroy +- openid_connect: destroy +- ldap_groups/synchronized_filters: destroy +- ldap_groups/synchronized_groups: destroy +- saml/providers: destroy +- Deleting a meeting series + +The DangerDialog should also be used where we are currently using browser dialogs or a non-Primer modal for high-risk operations, such as: + +- Bulk deleting work packages +- Deleting a custom field + +The Danger Warning dialog should replace the default browser native "Are you sure?" dialog if the action is destructive and non reversible, for example: + +- Deleting work packages +- Deleting individual meetings (or individual occurrences of a meeting series) +- Deleting a custom field +- Deleting a custom action +- Deleting a wiki + +### Technical notes + +* In order to actually delete some object, you will most likely need a form which the "delete" button then submits. We have two ways to achieve that: + * ([`With form_arguments`](../../inspect/primer/open_project/danger_dialog/with_form)) + * ([`With a form builder`](../../inspect/primer/open_project/danger_dialog/with_form_builder_form)) diff --git a/lookbook/docs/patterns/15-colors.md.erb b/lookbook/docs/patterns/16-colors.md.erb similarity index 100% rename from lookbook/docs/patterns/15-colors.md.erb rename to lookbook/docs/patterns/16-colors.md.erb diff --git a/lookbook/docs/patterns/16-settings-pages.md.erb b/lookbook/docs/patterns/17-settings-pages.md.erb similarity index 100% rename from lookbook/docs/patterns/16-settings-pages.md.erb rename to lookbook/docs/patterns/17-settings-pages.md.erb diff --git a/lookbook/docs/patterns/25-hover-cards.md.erb b/lookbook/docs/patterns/25-hover-cards.md.erb index 18474ed9eaee..172298e5ba4d 100644 --- a/lookbook/docs/patterns/25-hover-cards.md.erb +++ b/lookbook/docs/patterns/25-hover-cards.md.erb @@ -2,9 +2,9 @@ The HoverCard is a pattern related to the `Primer::Beta::Popover` and is used to ## Overview -![Exemplary work package hover card](<%= image_path('lookbook/hover_card.png') %>) +![Exemplary work package hover card](<%= image_path("lookbook/hover_card.png") %>) -![Exemplary user hover card](<%= image_path('lookbook/user_hover_card.png') %>) +![Exemplary user hover card](<%= image_path("lookbook/user_hover_card.png") %>) ## Anatomy @@ -13,7 +13,6 @@ The HoverCard always consists of two basic parts: 1. A trigger: That can be anything that is hoverable, like a link or a chip 2. The actual card: A small popover that is opened directly next to the trigger. The actual content of the card depends on the type of resource it is calling. - ## Best practices **Do** @@ -21,56 +20,51 @@ The HoverCard always consists of two basic parts: - Put in a slight delay between hovering and displaying the card to avoid accidental triggering, which can be annoying. - Keep the content of the card simple. Only the essentials. -**Don't** - -- Don't put additional interactive elements inside of the card. Since the popover closes as soon as you move the mouse out, users will find it frustrating if they try further interacting with it and have it keep disappearing -- Don't put too many triggers on one page, as it can otherwise become annoying to have too many items trigger a card that blocks part of the screen - ## Used in - WorkPackage preview when linking via `#ID` -- User preview when hovering the avatar +- User preview on usernames and avatars ## Technical notes -Unfortunately, we could not easily use the `Primer::Beta::Popover` component. -That is why, the `HoverCard` is technically an Angular modal which renders inside a `turboFrame`. -This modal is triggered by a class called `op-hover-card--preview-trigger` which can be set in any element. -A global event listener is registered on all elements with this class and triggers the modal when being hovered. +In the past, we could not easily use the `Primer::Beta::Popover` component. With recent changes, this is now possible. +But it would require us to adjust the DOM of the hover card contents and the styling of the popover, so that it maintains its looks. + +Essentially the `HoverCard` is just a div which renders inside a `turboFrame`. + +We have a `HoverCardTriggerController` that listens for hover events on elements with the attribute `data-hover-card-trigger-target="trigger"` +and renders a hover card for that element when the mouse enters the trigger. Additionally, the trigger element needs to pass the URL for the `turboFrame` as a data attribute called `data-hover-card-url`. -### Code structure +When the hovering event is received, the `HoverCardTriggerController` will retrieve the data for the turbo frame from +the URL and sanitize it. Then it will construct a div, create a turbo frame with the sanitized URL within it and +append it to either the body or an existing dialog element. The final placement depends on the position of the trigger +in the DOM. -**Angular modal**: -```html - -
    - - -
    -``` +The hover card will close automatically when the mouse leaves the trigger or the card itself. + +### Code structure **Trigger**: ```html - -     - #14 - - - - - - + + + + + + #14 + + + + + + + ``` Note that the user example is simplified. For actual use in the application, it is recommended to use the `AvatarComponent`, which offers an option for hover cards. diff --git a/lookbook/previews/op_primer/flash_component_preview.rb b/lookbook/previews/op_primer/flash_component_preview.rb index 9456c8435a13..eb4d4cad3737 100644 --- a/lookbook/previews/op_primer/flash_component_preview.rb +++ b/lookbook/previews/op_primer/flash_component_preview.rb @@ -7,6 +7,12 @@ def default end end + def success + render(OpPrimer::FlashComponent.new(scheme: :success)) do + I18n.t("notice_meeting_updated") + end + end + def danger render(OpPrimer::FlashComponent.new(scheme: :danger, icon: :stop)) do |_component| "Stop right there." diff --git a/lookbook/previews/op_primer/form_preview.rb b/lookbook/previews/op_primer/form_preview.rb new file mode 100644 index 000000000000..b1dd75585c1a --- /dev/null +++ b/lookbook/previews/op_primer/form_preview.rb @@ -0,0 +1,18 @@ +# frozen_string_literal: true + +module OpPrimer + # @logical_path OpenProject/Primer + # @display min_height 300px + class FormPreview < Lookbook::Preview + # @label Preview + # @param answer + def default(answer: nil) + preview_path = + Lookbook::Engine + .routes + .url_helpers + .lookbook_preview_path(path: "OpenProject/Primer/form/default") + render_with_template(locals: { answer:, preview_path: }) + end + end +end diff --git a/lookbook/previews/op_primer/form_preview/default.html.erb b/lookbook/previews/op_primer/form_preview/default.html.erb new file mode 100644 index 000000000000..872b31bee8d2 --- /dev/null +++ b/lookbook/previews/op_primer/form_preview/default.html.erb @@ -0,0 +1,35 @@ +<% + form_preview = Class.new(ApplicationForm) do + form do |f| + f.text_field( + name: :answer, + value: answer, + label: "Answer", + data: { action: "change->form-preview#submit" }, + required: true, + validation_message: answer.nil? ? "Field is required" : nil, + caption: if answer.nil? + "Fill in the field to make the validation error instantly go away." + else + "Yay, no more errors!" + end, + input_width: :auto + ) + end + end +%> + +<%= + primer_form_with( + url: "/foo", + method: :get, + data: { + "controller": "form-preview", + "form-preview-url-value": preview_path + } + ) do |f| +%> + <%= render(form_preview.new(f)) %> +<% end %> + + diff --git a/lookbook/previews/open_project/common/rich_text_preview.rb b/lookbook/previews/open_project/common/rich_text_preview.rb new file mode 100644 index 000000000000..632be3c8dfbf --- /dev/null +++ b/lookbook/previews/open_project/common/rich_text_preview.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module OpenProject + module Common + # @logical_path OpenProject/Common + class RichTextPreview < Lookbook::Preview + # @display min_height 250px + def default + render_with_template + end + end + end +end diff --git a/lookbook/previews/open_project/common/rich_text_preview/default.html.erb b/lookbook/previews/open_project/common/rich_text_preview/default.html.erb new file mode 100644 index 000000000000..0f497d257d8d --- /dev/null +++ b/lookbook/previews/open_project/common/rich_text_preview/default.html.erb @@ -0,0 +1,24 @@ +<% + the_form = Class.new(ApplicationForm) do + form do |f| + f.rich_text_area( + name: :description, + label: WorkPackage.human_attribute_name(:description), + rich_text_options: { + editorType: "constrained" + } + ) + end + end + + model = WorkPackage.new +%> + + +<%= primer_form_with( + model:, + url: '/abc', + id: 'asdf') do |f| + render(the_form.new(f)) +end +%> diff --git a/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb b/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb index a6ce8c932c6d..d76a3f9f58bc 100644 --- a/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb +++ b/lookbook/previews/open_project/enterprise_edition/banner_component_preview.rb @@ -57,7 +57,7 @@ class BannerComponentPreview < Lookbook::Preview def default render( ::EnterpriseEdition::BannerComponent - .new(:form_configuration, + .new(:customize_life_cycle, skip_render: false) ) end diff --git a/lookbook/previews/open_project/users/avatar_component_preview.rb b/lookbook/previews/open_project/users/avatar_component_preview.rb index b2e500a4281d..49c64d2af19e 100644 --- a/lookbook/previews/open_project/users/avatar_component_preview.rb +++ b/lookbook/previews/open_project/users/avatar_component_preview.rb @@ -3,17 +3,17 @@ module OpenProject::Users # @logical_path OpenProject/Users class AvatarComponentPreview < Lookbook::Preview - # Renders a user avatar using the OpenProject opce-principal web component. Note that the hover card options - # have no effect in this lookbook. + # Renders a user avatar using the OpenProject opce-principal web component. + # Please note that hover cards will not be displayed in the preview, since the necessary Javascript controller + # is not loaded. # @param size select { choices: [default, medium, mini] } # @param link toggle # @param show_name toggle # @param hover_card toggle - # @param hover_card_target select { choices: [default, custom] } - def default(size: :default, link: true, show_name: true, hover_card: true, hover_card_target: :default) + def default(size: :default, link: true, show_name: true, hover_card: true) user = FactoryBot.build_stubbed(:user) render(Users::AvatarComponent.new(user:, size:, link:, show_name:, - hover_card: { active: hover_card, target: hover_card_target })) + hover_card: { active: hover_card })) end def sizes diff --git a/lookbook/previews/patterns/danger_dialog_preview.rb b/lookbook/previews/patterns/danger_dialog_preview.rb new file mode 100644 index 000000000000..872d6aebd496 --- /dev/null +++ b/lookbook/previews/patterns/danger_dialog_preview.rb @@ -0,0 +1,11 @@ +# frozen_string_literal: true + +module Patterns + # @hidden + class DangerDialogPreview < ViewComponent::Preview + # @display min_height 400px + def default + render_with_template + end + end +end diff --git a/lookbook/previews/patterns/danger_dialog_preview/default.html.erb b/lookbook/previews/patterns/danger_dialog_preview/default.html.erb new file mode 100644 index 000000000000..545c0bf1e4e9 --- /dev/null +++ b/lookbook/previews/patterns/danger_dialog_preview/default.html.erb @@ -0,0 +1,11 @@ +<%= + render(Primer::OpenProject::DangerDialog.new( + title: "Delete project", open: true + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { "Are you sure?" } + message.with_description_content( "You are going to delete the whole project and all it's WorkPackages!" ) + end + dialog.with_confirmation_check_box_content("I understand that this deletion cannot be reversed") + end +%> diff --git a/lookbook/previews/patterns/feedback_dialog_preview/custom_icon.html.erb b/lookbook/previews/patterns/feedback_dialog_preview/custom_icon.html.erb index 5f9b550fe1fe..7b8ffd004fa3 100644 --- a/lookbook/previews/patterns/feedback_dialog_preview/custom_icon.html.erb +++ b/lookbook/previews/patterns/feedback_dialog_preview/custom_icon.html.erb @@ -1,5 +1,5 @@ <%= - render(Primer::OpenProject::FeedbackDialog.new(open: true)) do |dialog| + render(Primer::OpenProject::FeedbackDialog.new(title: "Error message", open: true)) do |dialog| dialog.with_feedback_message(icon_arguments: { icon: :"x-circle", color: :danger }) do |message| message.with_heading(tag: :h2) { "Ups, something went wrong" } message.with_description { "Please try again or contact your administrator if the issue persists." } diff --git a/lookbook/previews/patterns/feedback_dialog_preview/default.html.erb b/lookbook/previews/patterns/feedback_dialog_preview/default.html.erb index f439275bcf7b..064af44095c0 100644 --- a/lookbook/previews/patterns/feedback_dialog_preview/default.html.erb +++ b/lookbook/previews/patterns/feedback_dialog_preview/default.html.erb @@ -1,5 +1,5 @@ <%= - render(Primer::OpenProject::FeedbackDialog.new(open: true)) do |dialog| + render(Primer::OpenProject::FeedbackDialog.new(title: "Success message", open: true)) do |dialog| dialog.with_feedback_message do |message| message.with_heading(tag: :h2) { "Success" } message.with_description { "Great! Everything worked well." } diff --git a/lookbook/previews/patterns/feedback_dialog_preview/loading.html.erb b/lookbook/previews/patterns/feedback_dialog_preview/loading.html.erb index f04c19aa19d6..205dc32f4b84 100644 --- a/lookbook/previews/patterns/feedback_dialog_preview/loading.html.erb +++ b/lookbook/previews/patterns/feedback_dialog_preview/loading.html.erb @@ -1,5 +1,5 @@ <%= - render(Primer::OpenProject::FeedbackDialog.new(open: true)) do |dialog| + render(Primer::OpenProject::FeedbackDialog.new(title: "Loading...", open: true)) do |dialog| dialog.with_feedback_message(loading: true) do |message| message.with_heading(tag: :h2) { "Waiting" } message.with_description { "The job is currently running.." } diff --git a/lookbook/previews/patterns/heading_preview.rb b/lookbook/previews/patterns/heading_preview.rb new file mode 100644 index 000000000000..f468aa1b2649 --- /dev/null +++ b/lookbook/previews/patterns/heading_preview.rb @@ -0,0 +1,10 @@ +# frozen_string_literal: true + +module Patterns + # @hidden + class HeadingPreview < ViewComponent::Preview + def default + render(Primer::OpenProject::Heading.new(tag: :h2)) { "Hello world" } + end + end +end diff --git a/modules/auth_saml/config/locales/crowdin/he.yml b/modules/auth_saml/config/locales/crowdin/he.yml index 675d291ad57a..bfcff00abe22 100644 --- a/modules/auth_saml/config/locales/crowdin/he.yml +++ b/modules/auth_saml/config/locales/crowdin/he.yml @@ -2,8 +2,8 @@ he: activemodel: attributes: saml/provider: - display_name: Name - identifier: Identifier + display_name: שם + identifier: מזהה secret: Secret scope: Scope assertion_consumer_service_url: ACS (Assertion consumer service) URL diff --git a/modules/auth_saml/config/locales/crowdin/nl.yml b/modules/auth_saml/config/locales/crowdin/nl.yml index e2f0740ad930..c1ad593ebca9 100644 --- a/modules/auth_saml/config/locales/crowdin/nl.yml +++ b/modules/auth_saml/config/locales/crowdin/nl.yml @@ -39,43 +39,43 @@ nl: description: > Gebruik deze parameters om uw identity provider verbinding met OpenProject te configureren. metadata_parser: - success: "Successfully updated the configuration using the identity provider metadata." - invalid_url: "Provided metadata URL is invalid. Provide a HTTP(s) URL." - error: "Failed to retrieve the identity provider metadata: %{error}" + success: "De configuratie is succesvol bijgewerkt met de metagegevens van de identiteits- provider." + invalid_url: "Verstrekte metadata URL is ongeldig. Geef een HTTP(s) URL." + error: "Fout bij het ophalen van de metagegevens van de identiteitaanbieder: %{error}" providers: - label_empty_title: "No SAML providers configured yet." - label_empty_description: "Add a provider to see them here." - label_automatic_configuration: Automatic configuration + label_empty_title: "Er zijn nog geen SAML-providers geconfigureerd." + label_empty_description: "Voeg een provider toe om ze hier te zien." + label_automatic_configuration: Automatische configuratie label_metadata: Metadata - label_metadata_endpoint: OpenProject metadata endpoint - label_openproject_information: OpenProject information - label_configuration_details: "Identity provider endpoints and certificates" - label_configuration_encryption: "Signatures and Encryption" - label_add_new: New SAML identity provider - label_edit: Edit SAML identity provider %{name} - label_uid: Internal user id - label_mapping: Mapping - label_requested_attribute_for: "Requested attribute for: %{attribute}" - no_results_table: No SAML identity providers have been defined yet. - plural: SAML identity providers - singular: SAML identity provider - requested_attributes: Requested attributes + label_metadata_endpoint: OpenProject metadata eindpunt + label_openproject_information: OpenProject informatie + label_configuration_details: "Identiteit provider eindpunten en certificaten" + label_configuration_encryption: "Handtekeningen en encryptie" + label_add_new: Nieuwe SAML identiteitsprovider + label_edit: SAML-identiteitsprovider %{name} bewerken + label_uid: Interne gebruikers-id + label_mapping: Koppeling + label_requested_attribute_for: "Attribuut aangevraagd voor: %{attribute}" + no_results_table: Er zijn nog geen SAML identity providers gedefinieerd. + plural: SAML-identiteitsproviders + singular: SAML-identiteitsprovider + requested_attributes: Gevraagde kenmerken attribute_mapping: Attribute mapping attribute_mapping_text: > - The following fields control which attributes provided by the SAML identity provider are used to provide user attributes in OpenProject + De volgende velden bepalen welke kenmerken verstrekt door de SAML identity provider worden gebruikt om gebruikers kenmerken te verstrekken in OpenProject metadata: dialog: "This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider:" upsale: description: Connect OpenProject to a SAML identity provider request_attributes: - title: 'Requested attributes' + title: 'Gevraagde kenmerken' legend: > - These attributes are added to the SAML XML metadata to signify to the identify provider which attributes OpenProject requires. You may still need to explicitly configure your identity provider to send these attributes. Please refer to your IdP's documentation. - name: 'Requested attribute key' - format: 'Attribute format' + Deze kenmerken worden toegevoegd aan de SAML XML metadata om aan de identity provider aan te geven welke kenmerken OpenProject vereist. Mogelijk moet u uw identiteitsleverancier nog expliciet configureren om deze kenmerken te verzenden. Raadpleeg hiervoor de documentatie van uw IdP. + name: 'Gevraagde kenmerk sleutel' + format: 'Kenmerk formaat' section_headers: configuration: "Primary configuration" - attributes: "Attributes" + attributes: "Kenmerken" section_texts: display_name: "Configure the display name of the SAML provider." metadata: "Pre-fill configuration using a metadata URL or by pasting metadata XML" @@ -85,8 +85,8 @@ nl: configuration_metadata: "This information has been pre-filled using the supplied metadata. In most cases, they do not require editing." encryption: "Configure assertion signatures and encryption for SAML requests and responses." encryption_form: "You may optionally want to encrypt the assertion response, or have requests from OpenProject signed." - mapping: "Manually adjust the mapping between the SAML response and user attributes in OpenProject." - requested_attributes: "Define the set of attributes to be requested in the SAML request sent to your identity provider." + mapping: "Pas de mapping tussen de SAML respons en gebruikerskenmerken handmatig aan in OpenProject." + requested_attributes: "Definieer de set kenmerken die moet worden opgevraagd in het SAML-verzoek dat naar uw identity provider wordt gestuurd." seeded_from_env: "This provider was seeded from the environment configuration. It cannot be edited." settings: metadata_none: "I don't have metadata" @@ -118,23 +118,23 @@ nl: sp_metadata_endpoint: > This is the URL where the OpenProject SAML metadata is available. Optionally use it to configure your identity provider. mapping: > - Configure the mapping between the SAML response and user attributes in OpenProject. You can configure multiple attribute names to look for. OpenProject will choose the first available attribute from the SAML response. + Configureer de mapping tussen de SAML respons en gebruikerskenmerken in OpenProject. U kunt meerdere kenmerknamen configureren om naar te zoeken. OpenProject zal het eerste beschikbare kenmerk uit de SAML response kiezen. mapping_login: > - SAML attributes from the response used for the login. + SAML-kenmerken uit het antwoord die voor de aanmelding zijn gebruikt. mapping_mail: > - SAML attributes from the response used for the email of the user. + SAML-kenmerken uit het antwoord die gebruikt zijn voor de email van de gebruiker. mapping_firstname: > - SAML attributes from the response used for the given name. + SAML-kenmerken uit het antwoord die gebruikt zijn voor de opgegeven naam. mapping_lastname: > - SAML attributes from the response used for the last name. + SAML-kenmerken uit het antwoord die gebruikt zijn voor de opgegeven achternaam. mapping_uid: > SAML attribute to use for the internal user ID. Leave empty to use the name_id attribute instead request_uid: > SAML attribute to request for the internal user ID. By default, the name_id will be used for this field. requested_attributes: > - These attributes are added to the SAML request XML to communicate to the identity provider which attributes OpenProject requires. + Deze kenmerken worden toegevoegd aan de SAML request XML om aan de identity provider te communiceren welke kenmerken OpenProject nodig heeft. requested_format: > - The format of the requested attribute. This is used to specify the format of the attribute in the SAML request. Please see [documentation on configuring requested attributes](docs_url) for more information. + Het formaat van het gevraagde kenmerk. Dit wordt gebruikt om het formaat van het kenmerk in het SAML-verzoek op te geven. Zie [documentatie over het configureren van aangevraagde attributen](docs_url) voor meer informatie. authn_requests_signed: > If checked, OpenProject will sign the SAML AuthnRequest. You will have to provide a signing certificate and private key using the fields below. want_assertions_signed: > diff --git a/modules/auth_saml/config/locales/crowdin/tr.yml b/modules/auth_saml/config/locales/crowdin/tr.yml index c7ba70cf7db9..06d7ae6eef6c 100644 --- a/modules/auth_saml/config/locales/crowdin/tr.yml +++ b/modules/auth_saml/config/locales/crowdin/tr.yml @@ -74,8 +74,8 @@ tr: name: 'Requested attribute key' format: 'Attribute format' section_headers: - configuration: "Primary configuration" - attributes: "Attributes" + configuration: "Birincil yapılandırma" + attributes: "Öznitelikler" section_texts: display_name: "Configure the display name of the SAML provider." metadata: "Pre-fill configuration using a metadata URL or by pasting metadata XML" @@ -85,7 +85,7 @@ tr: configuration_metadata: "This information has been pre-filled using the supplied metadata. In most cases, they do not require editing." encryption: "Configure assertion signatures and encryption for SAML requests and responses." encryption_form: "You may optionally want to encrypt the assertion response, or have requests from OpenProject signed." - mapping: "Manually adjust the mapping between the SAML response and user attributes in OpenProject." + mapping: "SAML yanıtı ile OpenProject'teki kullanıcı öznitelikleri arasındaki eşlemeyi elle ayarlayın." requested_attributes: "Define the set of attributes to be requested in the SAML request sent to your identity provider." seeded_from_env: "This provider was seeded from the environment configuration. It cannot be edited." settings: diff --git a/modules/auth_saml/spec/features/administration/saml_crud_spec.rb b/modules/auth_saml/spec/features/administration/saml_crud_spec.rb index 476fdff97f0f..f44a4233d0ea 100644 --- a/modules/auth_saml/spec/features/administration/saml_crud_spec.rb +++ b/modules/auth_saml/spec/features/administration/saml_crud_spec.rb @@ -30,8 +30,7 @@ require_module_spec_helper RSpec.describe "SAML administration CRUD", - :js, - :with_cuprite do + :js do shared_let(:user) { create(:admin) } let(:danger_zone) { DangerZone.new(page) } diff --git a/modules/avatars/app/helpers/avatar_helper.rb b/modules/avatars/app/helpers/avatar_helper.rb index 97f9eea7486b..170ff516fb59 100644 --- a/modules/avatars/app/helpers/avatar_helper.rb +++ b/modules/avatars/app/helpers/avatar_helper.rb @@ -45,7 +45,7 @@ module AvatarHelper # Returns the avatar image tag for the given +user+ if avatars are enabled # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe ') - def avatar(principal, size: "default", hide_name: true, hover_card: { active: true, target: :default }, name_classes: "", **) + def avatar(principal, size: "default", hide_name: true, hover_card: { active: true }, name_classes: "", **) build_principal_avatar_tag(principal, size:, hide_name:, hover_card:, name_classes:, **) rescue StandardError => e Rails.logger.error "Failed to create avatar for #{principal}: #{e}" @@ -149,7 +149,6 @@ def hover_card_options(user, inputs = {}, tag_options = {}) hover_card = tag_options[:hover_card] if hover_card.fetch(:active, true) inputs[:hoverCard] = true - inputs[:hoverCardModalTarget] = hover_card.fetch(:target, :default) inputs[:hoverCardUrl] = hover_card_user_path(user.id) else diff --git a/modules/avatars/config/locales/crowdin/tr.yml b/modules/avatars/config/locales/crowdin/tr.yml index e93cbe249d42..65f5876ac351 100644 --- a/modules/avatars/config/locales/crowdin/tr.yml +++ b/modules/avatars/config/locales/crowdin/tr.yml @@ -26,13 +26,13 @@ tr: text_upload_instructions: | 128 x 128 piksellik kendi özel avatarınızı yükleyin. Büyük dosyalar yeniden boyutlandırılacak ve eşleşecek şekilde kırpılacaktır. Bir resmi seçtikten sonra, yüklemeden önce avatarınızın bir önizlemesi gösterilir. - text_change_gravatar_html: 'Posta adresinize ait Gravatar''ı değiştirmek veya eklemek için, %{gravatar_url}. adresine gidin.' + text_change_gravatar_html: 'Posta adresinize ait Gravatar''ı değiştirmek veya eklemek için %{gravatar_url} adresine gidin.' text_your_local_avatar: | OpenProject kendi özel avatarınızı yüklemenizi sağlar. text_local_avatar_over_gravatar: | Birini ayarlarsanız, bu özel avatar yukarıdaki gravatar üzerinde öncelikli olarak kullanılır. text_your_current_gravatar: | - OpenProject bir tanesini kaydettiyseniz gravatarınızı veya varsa bir varsayılan görüntü veya simgeyi kullanır. + OpenProject, kayıtlı bir gravatarınız varsa onu, yoksa varsayılan bir resim veya simgeyi kullanır. Mevcut gravatar aşağıdaki gibidir: settings: enable_gravatars: 'Kullanıcı gravatarlarını etkinleştir' diff --git a/modules/avatars/spec/helpers/avatar_helper_spec.rb b/modules/avatars/spec/helpers/avatar_helper_spec.rb index 37b0149856d6..937e38186e20 100644 --- a/modules/avatars/spec/helpers/avatar_helper_spec.rb +++ b/modules/avatars/spec/helpers/avatar_helper_spec.rb @@ -24,7 +24,7 @@ allow(user).to receive(:local_avatar_attachment).and_return avatar_stub end - def expected_user_avatar_tag(user, hover_card: true, modal_target: "default", hover_card_url: "/users/#{user.id}/hover_card") + def expected_user_avatar_tag(user, hover_card: true, hover_card_url: "/users/#{user.id}/hover_card") principal = { href: "/api/v3/users/#{user.id}", name: user.name, @@ -41,7 +41,6 @@ def expected_user_avatar_tag(user, hover_card: true, modal_target: "default", ho hoverCard: hover_card } - inputs[:hoverCardModalTarget] = modal_target if hover_card inputs[:hoverCardUrl] = hover_card_url if hover_card angular_component_tag "opce-principal", inputs: @@ -221,10 +220,5 @@ def gravatar_expected_url(digest, options = {}) avatar = helper.avatar(user, hover_card: { active: false }) expect(avatar).to be_html_eql(expected_user_avatar_tag(user, hover_card: false)) end - - it "provides a custom modal target" do - avatar = helper.avatar(user, hover_card: { target: :custom }) - expect(avatar).to be_html_eql(expected_user_avatar_tag(user, modal_target: :custom)) - end end end diff --git a/modules/backlogs/config/locales/crowdin/mn.yml b/modules/backlogs/config/locales/crowdin/mn.yml index 962e1aa63b4d..d99994189d49 100644 --- a/modules/backlogs/config/locales/crowdin/mn.yml +++ b/modules/backlogs/config/locales/crowdin/mn.yml @@ -41,8 +41,8 @@ mn: sprint: cannot_end_before_it_starts: "Sprint cannot end before it starts." backlogs: - add_new_story: "New Story" - any: "any" + add_new_story: "Шинэ Түүх" + any: "ямар ч" backlog_settings: "Backlogs settings" burndown_graph: "Burndown Graph" card_paper_size: "Paper size for card printing" diff --git a/modules/backlogs/config/locales/crowdin/tr.yml b/modules/backlogs/config/locales/crowdin/tr.yml index 30a5e3084557..807828468346 100644 --- a/modules/backlogs/config/locales/crowdin/tr.yml +++ b/modules/backlogs/config/locales/crowdin/tr.yml @@ -37,7 +37,7 @@ tr: can_only_contain_work_packages_of_current_sprint: "yalnızca geçerli sprintteki iş paketlerinin kimliklerini içerebilir." must_block_at_least_one_work_package: "en az bir biletin kimliğini içermelidir." version_id: - task_version_must_be_the_same_as_story_version: "ana hikaye sürümüyle aynı olmalıdır." + task_version_must_be_the_same_as_story_version: "üst hikaye sürümüyle aynı olmalıdır." sprint: cannot_end_before_it_starts: "Sprint başlamadan önce bitemez." backlogs: @@ -55,7 +55,7 @@ tr: hours: "Saatler" impediment: "Engel" label_versions_default_fold_state: "Katlanmış sürümleri göster" - work_package_is_closed: "İş paketi, ne zaman" + work_package_is_closed: "İş paketi şu durumlarda tamamlanır" label_is_done_status: "Durum %{status_name} tamamlandı anlamına geliyor" no_burndown_data: "Burndown verileri mevcut değil. Sprint başlangıç ve bitiş tarihlerinin ayarlanması gereklidir." points: "Puanlar / Noktalar" diff --git a/modules/backlogs/spec/features/backlogs/change_status_spec.rb b/modules/backlogs/spec/features/backlogs/change_status_spec.rb index 26ff0c87153c..028e3d04fe17 100644 --- a/modules/backlogs/spec/features/backlogs/change_status_spec.rb +++ b/modules/backlogs/spec/features/backlogs/change_status_spec.rb @@ -31,7 +31,7 @@ require "spec_helper" require_relative "../../support/pages/backlogs" -RSpec.describe "Backlogs context menu", :js, :with_cuprite do +RSpec.describe "Backlogs context menu", :js do shared_let(:story_type) { create(:type_feature) } shared_let(:task_type) { create(:type_task) } shared_let(:project) { create(:project, types: [story_type, task_type]) } diff --git a/modules/backlogs/spec/features/backlogs/context_menu_spec.rb b/modules/backlogs/spec/features/backlogs/context_menu_spec.rb index 3655ef953445..e64d2d59ed87 100644 --- a/modules/backlogs/spec/features/backlogs/context_menu_spec.rb +++ b/modules/backlogs/spec/features/backlogs/context_menu_spec.rb @@ -31,7 +31,7 @@ require "spec_helper" require_relative "../../support/pages/backlogs" -RSpec.describe "Backlogs context menu", :js, :with_cuprite do +RSpec.describe "Backlogs context menu", :js do shared_let(:story_type) { create(:type_feature) } shared_let(:task_type) { create(:type_task) } shared_let(:project) { create(:project, types: [story_type, task_type]) } diff --git a/modules/backlogs/spec/features/backlogs/create_story_spec.rb b/modules/backlogs/spec/features/backlogs/create_story_spec.rb index 92e4b5bf4e80..1cef40803aaf 100644 --- a/modules/backlogs/spec/features/backlogs/create_story_spec.rb +++ b/modules/backlogs/spec/features/backlogs/create_story_spec.rb @@ -28,7 +28,7 @@ require "spec_helper" -RSpec.describe "Backlogs", :js, :with_cuprite do +RSpec.describe "Backlogs", :js do let(:story_type) do create(:type_feature) end diff --git a/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb b/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb index b1492fbfafd4..a421692e8e2b 100644 --- a/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb +++ b/modules/backlogs/spec/features/backlogs_in_backlog_view_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/backlogs" RSpec.describe "Backlogs in backlog view", :js, - with_cuprite: false do + :selenium do let!(:project) do create(:project, types: [story, task], diff --git a/modules/backlogs/spec/features/empty_backlogs_spec.rb b/modules/backlogs/spec/features/empty_backlogs_spec.rb index 30e3611035ac..b4cf24b380f9 100644 --- a/modules/backlogs/spec/features/empty_backlogs_spec.rb +++ b/modules/backlogs/spec/features/empty_backlogs_spec.rb @@ -29,7 +29,7 @@ require "spec_helper" RSpec.describe "Empty backlogs project", - :js, :with_cuprite do + :js do shared_let(:story) { create(:type_feature) } shared_let(:task) { create(:type_task) } shared_let(:project) { create(:project, types: [story, task], enabled_module_names: %w(backlogs)) } diff --git a/modules/backlogs/spec/features/impediments_spec.rb b/modules/backlogs/spec/features/impediments_spec.rb index 645d0239582f..68367ff85a97 100644 --- a/modules/backlogs/spec/features/impediments_spec.rb +++ b/modules/backlogs/spec/features/impediments_spec.rb @@ -29,7 +29,7 @@ require "spec_helper" RSpec.describe "Impediments on taskboard", :js, - with_cuprite: false do + :selenium do let!(:project) do create(:project, types: [story, task], diff --git a/modules/backlogs/spec/features/stories_in_backlog_spec.rb b/modules/backlogs/spec/features/stories_in_backlog_spec.rb index fa72438add47..26ee04562ecf 100644 --- a/modules/backlogs/spec/features/stories_in_backlog_spec.rb +++ b/modules/backlogs/spec/features/stories_in_backlog_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/backlogs" RSpec.describe "Stories in backlog", :js, - with_cuprite: false do + :selenium do let!(:project) do create(:project, types: [story, task, other_story], diff --git a/modules/backlogs/spec/features/tasks_on_taskboard_spec.rb b/modules/backlogs/spec/features/tasks_on_taskboard_spec.rb index 4b5fe2eff5e2..5ddd99a6d90e 100644 --- a/modules/backlogs/spec/features/tasks_on_taskboard_spec.rb +++ b/modules/backlogs/spec/features/tasks_on_taskboard_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/taskboard" RSpec.describe "Tasks on taskboard", :js, - with_cuprite: false do + :selenium do let!(:project) do create(:project, types: [story, task, other_story], diff --git a/modules/backlogs/spec/features/work_packages/story_points_spec.rb b/modules/backlogs/spec/features/work_packages/story_points_spec.rb index c0698bb7da36..40100f1693b4 100644 --- a/modules/backlogs/spec/features/work_packages/story_points_spec.rb +++ b/modules/backlogs/spec/features/work_packages/story_points_spec.rb @@ -28,7 +28,7 @@ require "spec_helper" -RSpec.describe "Work packages having story points", :js, :with_cuprite do +RSpec.describe "Work packages having story points", :js do before do login_as current_user allow(Setting).to receive(:plugin_openproject_backlogs).and_return("points_burn_direction" => "down", diff --git a/modules/bim/config/locales/crowdin/cs.yml b/modules/bim/config/locales/crowdin/cs.yml index e0abce3e1827..892af062f2b5 100644 --- a/modules/bim/config/locales/crowdin/cs.yml +++ b/modules/bim/config/locales/crowdin/cs.yml @@ -9,7 +9,7 @@ cs: label_bcf: 'BCF' label_imported_failed: 'Selhalo importování témat BCF' label_imported_successfully: 'Importovaná témata BCF úspěšně' - label_bcf_issue_associated: "BCF issue associated" + label_bcf_issue_associated: "BCF úkol je přidružen" issues: "Problémy" recommended: 'doporučeno' not_recommended: 'nedoporučeno' diff --git a/modules/bim/config/locales/crowdin/tr.seeders.yml b/modules/bim/config/locales/crowdin/tr.seeders.yml index 464fbc5e5c43..d28084b81e32 100644 --- a/modules/bim/config/locales/crowdin/tr.seeders.yml +++ b/modules/bim/config/locales/crowdin/tr.seeders.yml @@ -217,16 +217,16 @@ tr: item_0: subject: Gathering first project information description: |- - ## Goal + ## Hedef - * Define tasks based on the customer needs - * Time frame and cost estimation shall be defined + * Müşteri ihtiyaçlarına göre görevlerin tanımlanması + * Zaman çerçevesi ve maliyet tahmini tanımlanmalıdır - ## Description + ## Açıklama - * Identify the customer needs by having a workshop with him/ her - * Each need shall represent a task with its corresponding work packages - * Derive the cost estimation and time frame + * Müşteri ile bir atölye çalışması yaparak ihtiyaçlarının belirlenmesi + * Her ihtiyaç, ilgili iş paketleriyle birlikte bir görevi temsil etmelidir + * Maliyet tahmini ve zaman çerçevesi türetilmelidir item_1: subject: Summarize the results description: |- @@ -474,19 +474,19 @@ tr: item_0: subject: Gathering the project specific data and information for the BIM model description: |- - ## Goal + ## Hedef - * Identify the information strategy for the customer (e.g. by using plain language questions) - * If provided, analyze the customer information requirements for the BIM model - * Define an information delivery strategy according to the customers needs + * Müşteri için bilgi stratejisini belirleyin (örneğin, sade dil soruları kullanarak) + * Sağlanmışsa, BIM modeli için müşteri bilgi gereksinimlerini analiz edin + * Müşterilerin ihtiyaçlarına göre bir bilgi dağıtım stratejisi tanımlayın - ## Description + ## Açıklama - * Analyzing the customers needs and goals for using the BIM methodology - * Results of this tasks should be: - * The requirements for the project - * A strategy for the delivery phase - * ... + * BIM metodolojisini kullanmak için müşterilerin ihtiyaçlarını ve hedeflerini analiz etmek + * Bu görevlerin sonuçları olmalıdır: + * Proje için gereksinimler + * Teslim aşaması için bir strateji + * ... item_1: subject: Creating the BIM execution plan description: |- diff --git a/modules/bim/spec/features/bcf/api_authorization_spec.rb b/modules/bim/spec/features/bcf/api_authorization_spec.rb index ad10114fed78..3ed09f9e548e 100644 --- a/modules/bim/spec/features/bcf/api_authorization_spec.rb +++ b/modules/bim/spec/features/bcf/api_authorization_spec.rb @@ -30,7 +30,6 @@ RSpec.describe "authorization for BCF api", :js, - :with_cuprite, with_config: { edition: "bim" } do let!(:user) { create(:admin) } let(:client_secret) { app.plaintext_secret } diff --git a/modules/bim/spec/features/bcf_view_management_spec.rb b/modules/bim/spec/features/bcf_view_management_spec.rb index 452e8e1e04ac..e602e255f938 100644 --- a/modules/bim/spec/features/bcf_view_management_spec.rb +++ b/modules/bim/spec/features/bcf_view_management_spec.rb @@ -31,7 +31,7 @@ require_relative "../support/pages/ifc_models/show_default" require_relative "../../../../spec/features/views/shared_examples" -RSpec.describe "bcf view management", :js, with_config: { edition: "bim" } do +RSpec.describe "bcf view management", :js, :selenium, with_config: { edition: "bim" } do let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } let(:bcf_page) { Pages::IfcModels::ShowDefault.new(project) } let(:role) do diff --git a/modules/bim/spec/features/bim_filter_spec.rb b/modules/bim/spec/features/bim_filter_spec.rb index 162a120fe39d..6ae63d70839f 100644 --- a/modules/bim/spec/features/bim_filter_spec.rb +++ b/modules/bim/spec/features/bim_filter_spec.rb @@ -31,7 +31,7 @@ require_relative "../support/pages/ifc_models/show" require_relative "../support/pages/ifc_models/show_default" -RSpec.describe "BIM filter spec", :js, with_config: { edition: "bim" } do +RSpec.describe "BIM filter spec", :js, :selenium, with_config: { edition: "bim" } do let(:project) { create(:project, enabled_module_names: %w(bim work_package_tracking)) } let(:open_status) { create(:status, is_closed: false) } let(:closed_status) { create(:status, is_closed: true) } diff --git a/modules/bim/spec/features/card_view/bulk_actions_spec.rb b/modules/bim/spec/features/card_view/bulk_actions_spec.rb index 2de36f7fc316..2c00d4232852 100644 --- a/modules/bim/spec/features/card_view/bulk_actions_spec.rb +++ b/modules/bim/spec/features/card_view/bulk_actions_spec.rb @@ -1,7 +1,7 @@ require "spec_helper" require_relative "../../support/pages/ifc_models/show_default" -RSpec.describe "Copy work packages through Rails view", :js, :with_cuprite, with_config: { edition: "bim" } do +RSpec.describe "Copy work packages through Rails view", :js, with_config: { edition: "bim" } do shared_let(:project) { create(:project, name: "Source", enabled_module_names: %i[bim work_package_tracking]) } shared_let(:dev) do diff --git a/modules/bim/spec/features/card_view/context_menu_spec.rb b/modules/bim/spec/features/card_view/context_menu_spec.rb index 8fb3c2af7044..fbe520d44447 100644 --- a/modules/bim/spec/features/card_view/context_menu_spec.rb +++ b/modules/bim/spec/features/card_view/context_menu_spec.rb @@ -2,7 +2,7 @@ require_relative "../../../../../spec/features/work_packages/table/context_menu/context_menu_shared_examples" require_relative "../../support/pages/ifc_models/show_default" -RSpec.describe "Work Package table hierarchy and sorting", :js, :with_cuprite, with_config: { edition: "bim" } do +RSpec.describe "Work Package table hierarchy and sorting", :js, with_config: { edition: "bim" } do shared_let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking costs]) } let(:wp_table) { Pages::IfcModels::ShowDefault.new(project) } diff --git a/modules/bim/spec/features/card_view/select_card_spec.rb b/modules/bim/spec/features/card_view/select_card_spec.rb index 31553fc8f704..db5b8273858f 100644 --- a/modules/bim/spec/features/card_view/select_card_spec.rb +++ b/modules/bim/spec/features/card_view/select_card_spec.rb @@ -29,7 +29,10 @@ require "spec_helper" require_relative "../../support/pages/ifc_models/show_default" -RSpec.describe "Selecting cards in the card view (regression #31962)", :js, with_config: { edition: "bim" } do +RSpec.describe "Selecting cards in the card view (regression #31962)", + :js, + :selenium, + with_config: { edition: "bim" } do let(:user) { create(:admin) } let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } let(:wp_table) { Pages::IfcModels::ShowDefault.new(project) } diff --git a/modules/bim/spec/features/card_view/wp_card_status_spec.rb b/modules/bim/spec/features/card_view/wp_card_status_spec.rb index a727858b1f95..d33d10a39a9d 100644 --- a/modules/bim/spec/features/card_view/wp_card_status_spec.rb +++ b/modules/bim/spec/features/card_view/wp_card_status_spec.rb @@ -29,7 +29,7 @@ require "spec_helper" require_relative "../../support/pages/ifc_models/show_default" -RSpec.describe "Update status from WP card", :js, :with_cuprite, with_config: { edition: "bim" } do +RSpec.describe "Update status from WP card", :js, with_config: { edition: "bim" } do let(:manager_role) do create(:project_role, permissions: %i[view_work_packages edit_work_packages view_ifc_models view_linked_issues]) end diff --git a/modules/bim/spec/features/display_representations/switch_display_representations_spec.rb b/modules/bim/spec/features/display_representations/switch_display_representations_spec.rb index 749a546fc125..5dbbb6262b52 100644 --- a/modules/bim/spec/features/display_representations/switch_display_representations_spec.rb +++ b/modules/bim/spec/features/display_representations/switch_display_representations_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/ifc_models/show_default" RSpec.describe "Switching work package view", - :js, with_config: { edition: "bim" }, with_ee: %i[conditional_highlighting] do + :js, + :selenium, + with_config: { edition: "bim" }, with_ee: %i[conditional_highlighting] do let(:user) { create(:admin) } let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } let(:wp_page) { Pages::IfcModels::ShowDefault.new(project) } diff --git a/modules/bim/spec/features/ifc_models/direct_ifc_upload_spec.rb b/modules/bim/spec/features/ifc_models/direct_ifc_upload_spec.rb index 52e2187d7c46..9f8760a1b508 100644 --- a/modules/bim/spec/features/ifc_models/direct_ifc_upload_spec.rb +++ b/modules/bim/spec/features/ifc_models/direct_ifc_upload_spec.rb @@ -29,7 +29,10 @@ require "spec_helper" require_relative "ifc_upload_shared_examples" -RSpec.describe "direct IFC upload", :js, with_config: { edition: "bim" }, with_direct_uploads: :redirect do +RSpec.describe "direct IFC upload", + :js, + :selenium, + with_config: { edition: "bim" }, with_direct_uploads: :redirect do it_behaves_like "can upload an IFC file" do # with direct upload, we don't get the model name let(:model_name) { "model.ifc" } diff --git a/modules/bim/spec/features/model_management_spec.rb b/modules/bim/spec/features/model_management_spec.rb index e484c9e9bd7a..42a6425b3297 100644 --- a/modules/bim/spec/features/model_management_spec.rb +++ b/modules/bim/spec/features/model_management_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/ifc_models/index" -RSpec.describe "model management", :js, with_config: { edition: "bim" } do +RSpec.describe "model management", :js, :selenium, with_config: { edition: "bim" } do let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } let(:index_page) { Pages::IfcModels::Index.new(project) } let(:role) { create(:project_role, permissions: %i[view_ifc_models manage_bcf manage_ifc_models view_work_packages]) } diff --git a/modules/bim/spec/features/model_viewer_spec.rb b/modules/bim/spec/features/model_viewer_spec.rb index 7fb1247de589..9750418d23fa 100644 --- a/modules/bim/spec/features/model_viewer_spec.rb +++ b/modules/bim/spec/features/model_viewer_spec.rb @@ -28,7 +28,10 @@ require_relative "../spec_helper" -RSpec.describe "model viewer", :js, with_config: { edition: "bim" } do +RSpec.describe "model viewer", + :js, + :selenium, + with_config: { edition: "bim" } do let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } # TODO: Add empty viewpoint and stub method to load viewpoints once defined let(:work_package) { create(:work_package, project:) } diff --git a/modules/bim/spec/features/viewer/create_viewpoint_spec.rb b/modules/bim/spec/features/viewer/create_viewpoint_spec.rb index 877be36ddea8..c683ea078b0c 100644 --- a/modules/bim/spec/features/viewer/create_viewpoint_spec.rb +++ b/modules/bim/spec/features/viewer/create_viewpoint_spec.rb @@ -28,7 +28,10 @@ require_relative "../../spec_helper" -RSpec.describe "Create viewpoint from BCF details page", :js, with_config: { edition: "bim" } do +RSpec.describe "Create viewpoint from BCF details page", + :js, + :selenium, + with_config: { edition: "bim" } do let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } let(:user) { create(:admin) } diff --git a/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb b/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb index a519ae481e62..4433dde58d14 100644 --- a/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb +++ b/modules/bim/spec/features/viewer/delete_viewpoint_spec.rb @@ -28,7 +28,7 @@ require_relative "../../spec_helper" -RSpec.describe "Delete viewpoint in model viewer", :js, with_config: { edition: "bim" } do +RSpec.describe "Delete viewpoint in model viewer", :js, :selenium, with_config: { edition: "bim" } do let(:project) { create(:project, enabled_module_names: %i[bim work_package_tracking]) } let(:user) { create(:admin) } diff --git a/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb b/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb index 892c1ce4ebce..11bfa46d20b9 100644 --- a/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb +++ b/modules/bim/spec/seeders/root_seeder_bim_edition_spec.rb @@ -47,7 +47,7 @@ def group_name(reference) it "creates the BIM demo data" do expect(Project.count).to eq 4 - expect(EnabledModule.count).to eq 23 + expect(EnabledModule.count).to eq 27 expect(WorkPackage.count).to eq 76 expect(Wiki.count).to eq 3 expect(Query.count).to eq 29 diff --git a/modules/boards/config/locales/crowdin/id.yml b/modules/boards/config/locales/crowdin/id.yml index 95855c42983d..cb81c95a8272 100644 --- a/modules/boards/config/locales/crowdin/id.yml +++ b/modules/boards/config/locales/crowdin/id.yml @@ -9,7 +9,7 @@ id: boards: label_board: "Papan" label_boards: "Papan" - label_create_new_board: "Create new board" + label_create_new_board: "Buat papan baru" label_board_type: "Tipe papan" board_types: free: Dasar @@ -23,17 +23,17 @@ id: basic: Dasar board_type_descriptions: basic: > - Start from scratch with a blank board. Manually add cards and columns to this board. + Mulai dari awal dengan papan kosong. Tambahkan kartu dan kolom secara manual ke papan ini. status: > - Basic kanban style board with columns for status such as To Do, In Progress, Done. + Papan gaya kanban dasar dengan kolom untuk status seperti To Do, In Progress, Done. assignee: > - Board with automated columns based on assigned users. Ideal for dispatching work packages. + Papan dengan kolom otomatis berdasarkan pengguna yang ditugaskan. Ideal untuk mengirimkan paket kerja. version: > - Board with automated columns based on the version attribute. Ideal for planning product development. + Papan dengan kolom otomatis berdasarkan atribut versi. Ideal untuk merencanakan pengembangan produk. subproject: > - Board with automated columns for subprojects. Dragging work packages to other lists updates the (sub-)project accordingly. + Papan dengan kolom otomatis untuk subproyek. Menyeret paket pekerjaan ke daftar lain akan memperbarui (sub) proyek yang sesuai. subtasks: > - Board with automated columns for sub-elements. Dragging work packages to other lists updates the parent accordingly. + Papan dengan kolom otomatis untuk sub-elemen. Menyeret paket pekerjaan ke daftar lain akan memperbarui induknya. upsale: - teaser_text: 'Would you like to automate your workflows with Boards? Advanced boards are an Enterprise add-on. Please upgrade to a paid plan.' + teaser_text: 'Apakah Anda ingin mengotomatiskan alur kerja Anda dengan Papan? Papan tingkat lanjut adalah add-on Enterprise. Tingkatkan ke paket berbayar.' upgrade: 'Tingkatkan sekarang' diff --git a/modules/boards/config/locales/crowdin/js-tr.yml b/modules/boards/config/locales/crowdin/js-tr.yml index 31df1677b4f7..4d4879d49e43 100644 --- a/modules/boards/config/locales/crowdin/js-tr.yml +++ b/modules/boards/config/locales/crowdin/js-tr.yml @@ -20,7 +20,7 @@ tr: unlock_version: 'Sürümün kilidini aç' edit_version: 'Sürümü düzenle' show_version: 'Sürümü göster' - locked: 'Kilitlendi' + locked: 'Kilitli' closed: 'Kapalı' new_board: 'Yeni yazı tahtası' add_list: 'Listeyi panele ekle' diff --git a/modules/boards/config/locales/crowdin/tr.yml b/modules/boards/config/locales/crowdin/tr.yml index 46fe4b25b6e6..193b9a234f20 100644 --- a/modules/boards/config/locales/crowdin/tr.yml +++ b/modules/boards/config/locales/crowdin/tr.yml @@ -3,8 +3,8 @@ tr: plugin_openproject_boards: name: "OpenProject Boards" description: "Provides board views." - permission_show_board_views: "Panoları görüntüle" - permission_manage_board_views: "Panoları yönet" + permission_show_board_views: "Panoları görüntüleme" + permission_manage_board_views: "Panoları yönetme" project_module_board_view: "Panolar" boards: label_board: "Pano" @@ -13,7 +13,7 @@ tr: label_board_type: "Pano türü" board_types: free: Temel - action: "Eylem kurulu (%{attribute})" + action: "Eylem panosu (%{attribute})" board_type_attributes: assignee: Atanan status: Durum @@ -23,7 +23,7 @@ tr: basic: Temel board_type_descriptions: basic: > - Boş bir tahtayla sıfırdan başlayın. Bu panoya kartları ve sütunları manuel olarak ekleyin. + Boş bir tahtayla sıfırdan başlayın. Bu panoya kartları ve sütunları elle ekleyin. status: > Yapılacaklar, Devam Ediyor, Tamamlandı gibi durum sütunlarını içeren temel kanban tarzı pano. assignee: > @@ -35,5 +35,5 @@ tr: subtasks: > Alt öğeler için otomatik sütunlara sahip pano. İş paketlerini diğer listelere sürüklemek üzere üst öğeyi buna göre günceller. upsale: - teaser_text: 'İş akışlarınızı Boards ile otomatikleştirmek ister misiniz? Gelişmiş kartlar Kurumsal bir eklentidir. Lütfen ücretli bir plana yükseltin.' - upgrade: 'Şimdi Yükselt' + teaser_text: 'İş akışlarınızı Panolar ile otomatikleştirmek ister misiniz? Gelişmiş panolar Enterprise eklentidir. Lütfen ücretli bir plana yükseltin.' + upgrade: 'Şimdi yükselt' diff --git a/modules/boards/spec/features/action_boards/assignee_board_spec.rb b/modules/boards/spec/features/action_boards/assignee_board_spec.rb index 5705ebb95f41..9ad0b218e4bb 100644 --- a/modules/boards/spec/features/action_boards/assignee_board_spec.rb +++ b/modules/boards/spec/features/action_boards/assignee_board_spec.rb @@ -30,7 +30,9 @@ require_relative "../support/board_index_page" require_relative "../support/board_page" -RSpec.describe "Assignee action board", :js, +RSpec.describe "Assignee action board", + :js, + :selenium, with_ee: %i[board_view] do let(:bobself_user) do create(:user, diff --git a/modules/boards/spec/features/action_boards/custom_field_filters_spec.rb b/modules/boards/spec/features/action_boards/custom_field_filters_spec.rb index 4ada7ca25fcc..a604b51b13d0 100644 --- a/modules/boards/spec/features/action_boards/custom_field_filters_spec.rb +++ b/modules/boards/spec/features/action_boards/custom_field_filters_spec.rb @@ -30,7 +30,10 @@ require_relative "../support//board_index_page" require_relative "../support/board_page" -RSpec.describe "Custom field filter in boards", :js, with_ee: %i[board_view] do +RSpec.describe "Custom field filter in boards", + :js, + :selenium, + with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role }) diff --git a/modules/boards/spec/features/action_boards/status_board_spec.rb b/modules/boards/spec/features/action_boards/status_board_spec.rb index 90166cd9878f..04d72c58df25 100644 --- a/modules/boards/spec/features/action_boards/status_board_spec.rb +++ b/modules/boards/spec/features/action_boards/status_board_spec.rb @@ -30,7 +30,10 @@ require_relative "../support//board_index_page" require_relative "../support/board_page" -RSpec.describe "Status action board", :js, with_ee: %i[board_view] do +RSpec.describe "Status action board", + :js, + :selenium, + with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role }) diff --git a/modules/boards/spec/features/action_boards/status_type_moving_board_spec.rb b/modules/boards/spec/features/action_boards/status_type_moving_board_spec.rb index 3435fec0d3ce..e4271110be17 100644 --- a/modules/boards/spec/features/action_boards/status_type_moving_board_spec.rb +++ b/modules/boards/spec/features/action_boards/status_type_moving_board_spec.rb @@ -32,6 +32,7 @@ RSpec.describe "Status action board", :js, + :selenium, with_ee: %i[board_view] do let(:user) do create(:user, diff --git a/modules/boards/spec/features/action_boards/subproject_board_spec.rb b/modules/boards/spec/features/action_boards/subproject_board_spec.rb index 96d9fa5782ea..fc66521fe71a 100644 --- a/modules/boards/spec/features/action_boards/subproject_board_spec.rb +++ b/modules/boards/spec/features/action_boards/subproject_board_spec.rb @@ -30,7 +30,10 @@ require_relative "../support//board_index_page" require_relative "../support/board_page" -RSpec.describe "Subproject action board", :js, with_ee: %i[board_view] do +RSpec.describe "Subproject action board", + :js, + :selenium, + with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role }) diff --git a/modules/boards/spec/features/action_boards/subtasks_board_spec.rb b/modules/boards/spec/features/action_boards/subtasks_board_spec.rb index 55e3e5987953..2e583b1aeb32 100644 --- a/modules/boards/spec/features/action_boards/subtasks_board_spec.rb +++ b/modules/boards/spec/features/action_boards/subtasks_board_spec.rb @@ -30,7 +30,7 @@ require_relative "../support//board_index_page" require_relative "../support/board_page" -RSpec.describe "Subtasks action board", :js, with_ee: %i[board_view] do +RSpec.describe "Subtasks action board", :js, :selenium, with_ee: %i[board_view] do let(:type) { create(:type_standard) } let(:project) { create(:project, types: [type], enabled_module_names: %i[work_package_tracking board_view]) } let(:role) { create(:project_role, permissions:) } diff --git a/modules/boards/spec/features/action_boards/version_board_spec.rb b/modules/boards/spec/features/action_boards/version_board_spec.rb index cb5b25ef4fac..cfa92f214e49 100644 --- a/modules/boards/spec/features/action_boards/version_board_spec.rb +++ b/modules/boards/spec/features/action_boards/version_board_spec.rb @@ -30,7 +30,10 @@ require_relative "../support//board_index_page" require_relative "../support/board_page" -RSpec.describe "Version action board", :js, with_ee: %i[board_view] do +RSpec.describe "Version action board", + :js, + :selenium, + with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role, second_project => role }) end diff --git a/modules/boards/spec/features/board_enterprise_spec.rb b/modules/boards/spec/features/board_enterprise_spec.rb index d03d11967b8a..e1d35b7e889f 100644 --- a/modules/boards/spec/features/board_enterprise_spec.rb +++ b/modules/boards/spec/features/board_enterprise_spec.rb @@ -30,7 +30,7 @@ require_relative "support/board_index_page" require_relative "support/board_page" -RSpec.describe "Boards enterprise spec", :js, :with_cuprite do +RSpec.describe "Boards enterprise spec", :js do shared_let(:admin) { create(:admin) } shared_let(:project) { create(:project, enabled_module_names: %i[work_package_tracking board_view]) } diff --git a/modules/boards/spec/features/board_highlighting_spec.rb b/modules/boards/spec/features/board_highlighting_spec.rb index 2915d80eaa88..838b5af39112 100644 --- a/modules/boards/spec/features/board_highlighting_spec.rb +++ b/modules/boards/spec/features/board_highlighting_spec.rb @@ -30,7 +30,7 @@ require_relative "support/board_index_page" require_relative "support/board_page" -RSpec.describe "Work Package boards spec", :js, with_ee: %i[board_view] do +RSpec.describe "Work Package boards spec", :js, :selenium, with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role }) diff --git a/modules/boards/spec/features/board_index_spec.rb b/modules/boards/spec/features/board_index_spec.rb index 06de1b280766..e575c5713e3a 100644 --- a/modules/boards/spec/features/board_index_spec.rb +++ b/modules/boards/spec/features/board_index_spec.rb @@ -30,7 +30,6 @@ require_relative "support/board_index_page" RSpec.describe "Work Package Project Boards Index Page", - :with_cuprite, with_ee: %i[board_view] do # The identifier is important to test https://community.openproject.com/wp/29754 shared_let(:project) { create(:project, identifier: "boards", enabled_module_names: %i[work_package_tracking board_view]) } diff --git a/modules/boards/spec/features/board_management_spec.rb b/modules/boards/spec/features/board_management_spec.rb index b9b2acf501c2..ae58d4e78b41 100644 --- a/modules/boards/spec/features/board_management_spec.rb +++ b/modules/boards/spec/features/board_management_spec.rb @@ -30,7 +30,7 @@ require_relative "support/board_index_page" require_relative "support/board_page" -RSpec.describe "Board management spec", :js, with_ee: %i[board_view] do +RSpec.describe "Board management spec", :js, :selenium, with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role }) diff --git a/modules/boards/spec/features/board_navigation_spec.rb b/modules/boards/spec/features/board_navigation_spec.rb index dc39dc6d3aa3..3e63c1e06a1c 100644 --- a/modules/boards/spec/features/board_navigation_spec.rb +++ b/modules/boards/spec/features/board_navigation_spec.rb @@ -32,7 +32,7 @@ RSpec.describe "Work Package boards spec", :js, - :with_cuprite, + :selenium, with_ee: %i[board_view] do let(:user) do create(:user, diff --git a/modules/boards/spec/features/board_overview_spec.rb b/modules/boards/spec/features/board_overview_spec.rb index 0186d1f7c2e2..4ed9e28cac93 100644 --- a/modules/boards/spec/features/board_overview_spec.rb +++ b/modules/boards/spec/features/board_overview_spec.rb @@ -30,7 +30,7 @@ require_relative "support/board_overview_page" RSpec.describe "Work Package Boards Overview", - :with_cuprite, + :js, with_ee: %i[board_view] do # The identifier is important to test https://community.openproject.com/wp/29754 shared_let(:project) do diff --git a/modules/boards/spec/features/board_reference_work_package_spec.rb b/modules/boards/spec/features/board_reference_work_package_spec.rb index 696d23bf218f..8463bea4a4ce 100644 --- a/modules/boards/spec/features/board_reference_work_package_spec.rb +++ b/modules/boards/spec/features/board_reference_work_package_spec.rb @@ -30,7 +30,10 @@ require_relative "support/board_index_page" require_relative "support/board_page" -RSpec.describe "Board reference work package spec", :js, with_ee: %i[board_view] do +RSpec.describe "Board reference work package spec", + :js, + :selenium, + with_ee: %i[board_view] do let(:user) do create(:user, member_with_roles: { project => role }) diff --git a/modules/boards/spec/features/board_update_spec.rb b/modules/boards/spec/features/board_update_spec.rb index ec69bfa85a1a..9fee82a1b54a 100644 --- a/modules/boards/spec/features/board_update_spec.rb +++ b/modules/boards/spec/features/board_update_spec.rb @@ -30,7 +30,10 @@ require_relative "support/board_index_page" require_relative "support/board_page" -RSpec.describe "Work Package boards updating spec", :js, with_ee: %i[board_view] do +RSpec.describe "Work Package boards updating spec", + :js, + :selenium, + with_ee: %i[board_view] do let(:admin) { create(:admin) } let(:project) { create(:project, enabled_module_names: %i[work_package_tracking board_view]) } diff --git a/modules/boards/spec/features/boards_global_create_spec.rb b/modules/boards/spec/features/boards_global_create_spec.rb index a4da2bacdf6f..8b51a1df3e89 100644 --- a/modules/boards/spec/features/boards_global_create_spec.rb +++ b/modules/boards/spec/features/boards_global_create_spec.rb @@ -6,7 +6,7 @@ RSpec.describe "Boards", "Creating a view from a Global Context", :js, - :with_cuprite, + :selenium, with_ee: %i[board_view] do shared_let(:project) { create(:project, enabled_module_names: %i[work_package_tracking board_view]) } shared_let(:other_project) { create(:project, enabled_module_names: %i[work_package_tracking board_view]) } diff --git a/modules/boards/spec/features/boards_sorting_spec.rb b/modules/boards/spec/features/boards_sorting_spec.rb index 51a3b8257bef..0f61f3350e1f 100644 --- a/modules/boards/spec/features/boards_sorting_spec.rb +++ b/modules/boards/spec/features/boards_sorting_spec.rb @@ -30,7 +30,10 @@ require_relative "support/board_index_page" require_relative "support/board_page" -RSpec.describe "Work Package boards sorting spec", :js, with_ee: %i[board_view] do +RSpec.describe "Work Package boards sorting spec", + :js, + :selenium, + with_ee: %i[board_view] do let(:admin) { create(:admin) } let(:project) { create(:project, enabled_module_names: %i[work_package_tracking board_view]) } let(:board_index) { Pages::BoardIndex.new(project) } diff --git a/modules/boards/spec/features/menu_items/global_menu_item_spec.rb b/modules/boards/spec/features/menu_items/global_menu_item_spec.rb index 9959c8e27fc2..d2ae9b7798cd 100644 --- a/modules/boards/spec/features/menu_items/global_menu_item_spec.rb +++ b/modules/boards/spec/features/menu_items/global_menu_item_spec.rb @@ -31,7 +31,7 @@ require "spec_helper" -RSpec.describe "Global menu item for boards", :js, :with_cuprite do +RSpec.describe "Global menu item for boards", :js do shared_let(:project) { create(:project) } let(:boards_label) { I18n.t("boards.label_boards") } diff --git a/modules/boards/spec/features/menu_items/top_menu_item_spec.rb b/modules/boards/spec/features/menu_items/top_menu_item_spec.rb index abb21b1fb831..e4f4eaed9585 100644 --- a/modules/boards/spec/features/menu_items/top_menu_item_spec.rb +++ b/modules/boards/spec/features/menu_items/top_menu_item_spec.rb @@ -28,7 +28,7 @@ require "spec_helper" -RSpec.describe "Top menu item for boards", :js, :with_cuprite do +RSpec.describe "Top menu item for boards", :js do shared_let(:admin) { create(:admin) } shared_let(:user) { create(:user) } shared_let(:project) { create(:project) } diff --git a/modules/budgets/spec/features/budgets/attachment_upload_spec.rb b/modules/budgets/spec/features/budgets/attachment_upload_spec.rb index 38d379e14171..0d5c9f5dd522 100644 --- a/modules/budgets/spec/features/budgets/attachment_upload_spec.rb +++ b/modules/budgets/spec/features/budgets/attachment_upload_spec.rb @@ -77,7 +77,7 @@ attachments_list.expect_attached("image.png", count: 2) end - it "can upload an image to new and existing budgets via drag & drop on attachment list" do + it "can upload an image to new and existing budgets via drag & drop on attachment list", :selenium do visit projects_budgets_path(project) page.find_test_selector("budget-create-button").click diff --git a/modules/budgets/spec/features/budgets/update_budget_spec.rb b/modules/budgets/spec/features/budgets/update_budget_spec.rb index 5da73d7fae42..2e29d07e1832 100644 --- a/modules/budgets/spec/features/budgets/update_budget_spec.rb +++ b/modules/budgets/spec/features/budgets/update_budget_spec.rb @@ -28,7 +28,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../../spec_helper.rb") -RSpec.describe "updating a budget", :js do +RSpec.describe "updating a budget", :js, :selenium do let(:project) do create(:project_with_types, enabled_module_names: %i[budgets costs work_package_tracking], @@ -39,7 +39,7 @@ current_user { user } - describe "with new cost items", :with_cuprite do + describe "with new cost items" do let(:cost_type) do create(:cost_type, name: "Post-war", unit: "cap", unit_plural: "caps") end diff --git a/modules/budgets/spec/features/costs_edit_fields_spec.rb b/modules/budgets/spec/features/costs_edit_fields_spec.rb index e8c2ecc860c6..ff219e26c99c 100644 --- a/modules/budgets/spec/features/costs_edit_fields_spec.rb +++ b/modules/budgets/spec/features/costs_edit_fields_spec.rb @@ -28,7 +28,9 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb") -RSpec.describe "Work Package budget fields", :js do +RSpec.describe "Work Package budget fields", + :js, + :selenium do let(:type_task) { create(:type_task) } let!(:status) { create(:status, is_default: true) } let!(:priority) { create(:priority, is_default: true) } diff --git a/modules/calendar/config/locales/crowdin/js-tr.yml b/modules/calendar/config/locales/crowdin/js-tr.yml index 7ecd0812514a..b6b7580dade6 100644 --- a/modules/calendar/config/locales/crowdin/js-tr.yml +++ b/modules/calendar/config/locales/crowdin/js-tr.yml @@ -4,5 +4,5 @@ tr: calendar: create_new: 'Yeni takvim oluştur' title: 'Takvim' - too_many: 'Toplamda %{count} iş paketi var, ancak sadece %{max} gösterilebilir.' + too_many: 'Toplamda %{count} iş paketi var, ancak sadece %{max} gösterilebilir.' unsaved_title: 'İsimsiz takvim' diff --git a/modules/calendar/config/locales/crowdin/tr.yml b/modules/calendar/config/locales/crowdin/tr.yml index 9bc55a33363d..d44efe9c20ee 100644 --- a/modules/calendar/config/locales/crowdin/tr.yml +++ b/modules/calendar/config/locales/crowdin/tr.yml @@ -6,7 +6,7 @@ tr: label_calendar: "Takvim" label_calendar_plural: "Takvimler" label_new_calendar: "Yeni takvim" - permission_view_calendar: "Takvimleri görüntüle" - permission_manage_calendars: "Takvimleri yönet" + permission_view_calendar: "Takvimleri görüntüleme" + permission_manage_calendars: "Takvimleri yönetme" permission_share_calendars: "iCalendars'a abone olun" project_module_calendar_view: "Takvimler" diff --git a/modules/calendar/spec/features/calendar_create_work_package_spec.rb b/modules/calendar/spec/features/calendar_create_work_package_spec.rb index 3e3fec9dcf3f..140c8cfea11f 100644 --- a/modules/calendar/spec/features/calendar_create_work_package_spec.rb +++ b/modules/calendar/spec/features/calendar_create_work_package_spec.rb @@ -29,7 +29,7 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Calendar create new work package", :js do +RSpec.describe "Calendar create new work package", :js, :selenium do include_context "with calendar full access" let(:type_task) { create(:type_task) } diff --git a/modules/calendar/spec/features/calendar_dates_spec.rb b/modules/calendar/spec/features/calendar_dates_spec.rb index 7326721b2caa..2b4dcc004d43 100644 --- a/modules/calendar/spec/features/calendar_dates_spec.rb +++ b/modules/calendar/spec/features/calendar_dates_spec.rb @@ -29,7 +29,7 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Calendar non working days", :js, :with_cuprite do +RSpec.describe "Calendar non working days", :js do include_context "with calendar full access" let!(:other_user) do diff --git a/modules/calendar/spec/features/calendar_project_include_spec.rb b/modules/calendar/spec/features/calendar_project_include_spec.rb index 45495a2667ae..26736c6e013e 100644 --- a/modules/calendar/spec/features/calendar_project_include_spec.rb +++ b/modules/calendar/spec/features/calendar_project_include_spec.rb @@ -30,7 +30,7 @@ require "features/work_packages/project_include/project_include_shared_examples" require_relative "../support/pages/calendar" -RSpec.describe "Calendar project include", :js do +RSpec.describe "Calendar project include", :js, :selenium do shared_let(:enabled_modules) { %w[work_package_tracking calendar_view] } shared_let(:permissions) do %i[view_work_packages view_calendar edit_work_packages add_work_packages save_queries manage_public_queries] diff --git a/modules/calendar/spec/features/calendar_user_interaction_spec.rb b/modules/calendar/spec/features/calendar_user_interaction_spec.rb index 232d58e46de9..479b49ea715e 100644 --- a/modules/calendar/spec/features/calendar_user_interaction_spec.rb +++ b/modules/calendar/spec/features/calendar_user_interaction_spec.rb @@ -29,7 +29,9 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Calendar drag&dop and resizing", :js do +RSpec.describe "Calendar drag&dop and resizing", + :js, + :selenium do include_context "with calendar full access" let!(:other_user) do diff --git a/modules/calendar/spec/features/calendar_widget_spec.rb b/modules/calendar/spec/features/calendar_widget_spec.rb index c8e9c105fcd6..ae527265e45b 100644 --- a/modules/calendar/spec/features/calendar_widget_spec.rb +++ b/modules/calendar/spec/features/calendar_widget_spec.rb @@ -30,7 +30,7 @@ require_relative "../../../overviews/spec/support/pages/overview" require_relative "../support/pages/calendar" -RSpec.describe "Calendar Widget", :js, :with_cuprite, with_settings: { start_of_week: 1 } do +RSpec.describe "Calendar Widget", :js, with_settings: { start_of_week: 1 } do shared_let(:project) do create(:project, enabled_module_names: %w[work_package_tracking calendar_view meetings]) end @@ -61,7 +61,7 @@ login_as(current_user) overview_page.visit! - wait_for_network_idle if RSpec.current_example.metadata[:with_cuprite] + wait_for_network_idle if using_cuprite? # within top-left area, add an additional widget overview_page.add_widget(1, 1, :row, "Calendar") @@ -107,7 +107,7 @@ expect(page).to have_text("Overview") end - it "can resize the same work package twice (Regression #48333)", with_cuprite: false do + it "can resize the same work package twice (Regression #48333)", :selenium do expect(page).to have_css(".fc-event-title", text: work_package.subject) calendar.resize_date(work_package, work_package.due_date - 1.day) diff --git a/modules/calendar/spec/features/calendars_global_create_spec.rb b/modules/calendar/spec/features/calendars_global_create_spec.rb index b87f8b9f7680..e9b89615ed5b 100644 --- a/modules/calendar/spec/features/calendars_global_create_spec.rb +++ b/modules/calendar/spec/features/calendars_global_create_spec.rb @@ -34,8 +34,7 @@ RSpec.describe "Calendar", "Creating a view from a Global Context", - :js, - :with_cuprite do + :js do include_context "with calendar full access" let(:calendars_page) { Pages::Calendar.new nil } diff --git a/modules/calendar/spec/features/calendars_index_spec.rb b/modules/calendar/spec/features/calendars_index_spec.rb index a3b74983f87f..cfc5bf34281f 100644 --- a/modules/calendar/spec/features/calendars_index_spec.rb +++ b/modules/calendar/spec/features/calendars_index_spec.rb @@ -29,7 +29,7 @@ require "spec_helper" require_relative "../support/pages/calendar" -RSpec.describe "Calendars", "index", :with_cuprite do +RSpec.describe "Calendars", "index" do # The order the Projects are created in is important. By naming `project` alphanumerically # after `other_project`, we can ensure that subsequent specs that assert sorting is # correct for the right reasons (sorting by Project name and not id) diff --git a/modules/costs/app/components/_index.sass b/modules/costs/app/components/_index.sass new file mode 100644 index 000000000000..c2d6cebea244 --- /dev/null +++ b/modules/costs/app/components/_index.sass @@ -0,0 +1 @@ +@import "time_entries/entry_dialog_component" diff --git a/modules/costs/app/components/time_entries/activity_form.rb b/modules/costs/app/components/time_entries/activity_form.rb new file mode 100644 index 000000000000..6c9f137f56e2 --- /dev/null +++ b/modules/costs/app/components/time_entries/activity_form.rb @@ -0,0 +1,72 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module TimeEntries + class ActivityForm < ApplicationForm + form do |f| + f.autocompleter( + name: :activity_id, + label: TimeEntry.human_attribute_name(:activity), + required: false, + include_blank: true, + autocomplete_options: { + placeholder: placeholder_text, + focusDirectly: false, + multiple: false, + decorated: true, + disabled: !project_or_work_package_selected?, + append_to: "#time-entry-dialog" + } + ) do |select| + activities.each do |activity| + select.option(value: activity.id, label: activity.name, selected: (model.activity_id == activity.id)) + end + end + end + + private + + delegate :project, :work_package, to: :model + + def project_or_work_package_selected? + work_package.present? || project.present? + end + + def placeholder_text + I18n.t("placeholder_activity_select_work_package_first") unless project_or_work_package_selected? + end + + def activities + return [] if project.blank? + + TimeEntryActivity.active_in_project(project) + end + end +end diff --git a/modules/meeting/app/helpers/recurring_meetings_helper.rb b/modules/costs/app/components/time_entries/comments_form.rb similarity index 85% rename from modules/meeting/app/helpers/recurring_meetings_helper.rb rename to modules/costs/app/components/time_entries/comments_form.rb index fb36af0f88d8..6a6a0afb7579 100644 --- a/modules/meeting/app/helpers/recurring_meetings_helper.rb +++ b/modules/costs/app/components/time_entries/comments_form.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -26,12 +28,10 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module RecurringMeetingsHelper - def max_count - if @direction == "past" - @recurring_meeting.scheduled_instances(upcoming: false).count - else - @recurring_meeting.remaining_occurrences.count +module TimeEntries + class CommentsForm < ApplicationForm + form do |f| + f.text_area name: :comments, label: TimeEntry.human_attribute_name(:comments) end end end diff --git a/app/models/types/pattern_collection_type.rb b/modules/costs/app/components/time_entries/custom_fields_form.rb similarity index 75% rename from app/models/types/pattern_collection_type.rb rename to modules/costs/app/components/time_entries/custom_fields_form.rb index 9758ee50c339..739bbb788098 100644 --- a/app/models/types/pattern_collection_type.rb +++ b/modules/costs/app/components/time_entries/custom_fields_form.rb @@ -28,27 +28,22 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Types - class PatternCollectionType < ActiveModel::Type::Value - def assert_valid_value(value) - cast(value) - end +module TimeEntries + class CustomFieldsForm < ApplicationForm + include CustomFields::CustomFieldRendering - def cast(value) - PatternCollection.build(patterns: value).value_or { nil } + form do |f| + render_custom_fields(form: f) end - def serialize(pattern) - return super if pattern.nil? - - YAML.dump(pattern.to_h) + def additional_custom_field_input_arguments + { wrapper_id: "#time-entry-dialog" } end - def deserialize(value) - return if value.blank? + private - data = YAML.safe_load(value) - cast(data) + def custom_fields + @custom_fields ||= model.available_custom_fields end end end diff --git a/modules/costs/app/components/time_entries/days_and_hours_form.rb b/modules/costs/app/components/time_entries/days_and_hours_form.rb new file mode 100644 index 000000000000..0e25d1fe2b0a --- /dev/null +++ b/modules/costs/app/components/time_entries/days_and_hours_form.rb @@ -0,0 +1,116 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module TimeEntries + class DaysAndHoursForm < ApplicationForm + delegate :project, to: :model + + form do |f| + # force the form to submit the ongoing flag as false to stop active timers + f.hidden name: :ongoing, value: false + + f.single_date_picker name: :spent_on, + type: "date", + required: true, + datepicker_options: { inDialog: "time-entry-dialog" }, + value: model.spent_on&.iso8601, + label: TimeEntry.human_attribute_name(:spent_on) + + if show_start_and_end_time_fields? + f.group(layout: :horizontal) do |g| + g.text_field name: :start_time, + type: "time", + required: start_and_end_time_required?, + label: TimeEntry.human_attribute_name(:start_time), + value: model.start_timestamp&.strftime("%H:%M"), + show_clear_button: true, + data: { + "time-entry-target" => "startTimeInput", + "action" => "input->time-entry#timeInputChanged" + } + + g.text_field name: :end_time, + type: "time", + required: start_and_end_time_required?, + label: TimeEntry.human_attribute_name(:end_time), + value: model.end_timestamp&.strftime("%H:%M"), + show_clear_button: true, + caption: end_time_caption, + data: { + "time-entry-target" => "endTimeInput", + "action" => "input->time-entry#timeInputChanged" + } + end + end + + f.text_field name: :hours, + required: true, + label: TimeEntry.human_attribute_name(:hours), + value: hours_value, + data: { "time-entry-target" => "hoursInput", + "action" => "blur->time-entry#hoursChanged keypress.enter->time-entry#hoursKeyEnterPress" } + end + + private + + def show_start_and_end_time_fields? + TimeEntry.can_track_start_and_end_time? + end + + def start_and_end_time_required? + TimeEntry.must_track_start_and_end_time? + end + + def hours_value + if model.ongoing? + ChronicDuration.output(model.ongoing_hours * 3600, format: :hours_only) + elsif model.hours.present? + ChronicDuration.output(model.hours * 3600, format: :hours_only) + else + "" + end + end + + def end_time_caption # rubocop:disable Metrics/AbcSize + relevant_hours = model.ongoing? ? model.ongoing_hours : model.hours + + return if model.start_time.blank? + return if relevant_hours.blank? + + end_time_in_minutes = model.start_time + (relevant_hours * 60) + + return if end_time_in_minutes <= (24 * 60) + + diff_in_days = (end_time_in_minutes / (60 * 24)).floor + + "+#{I18n.t('datetime.distance_in_words.x_days', count: diff_in_days)}" + end + end +end diff --git a/modules/costs/app/components/time_entries/entry_dialog_component.html.erb b/modules/costs/app/components/time_entries/entry_dialog_component.html.erb new file mode 100644 index 000000000000..bc944878f889 --- /dev/null +++ b/modules/costs/app/components/time_entries/entry_dialog_component.html.erb @@ -0,0 +1,47 @@ +<%= render(Primer::Alpha::Dialog.new(title: t("caption_log_time_dialog"), size: :medium_portrait, id: MODAL_ID, data: { "controller" => "time-entry", "application-target" => "dynamic", "time-entry-id" => time_entry.id, "ongoing" => time_entry.ongoing? })) do |d| %> + <% d.with_header(variant: :large) %> + <% d.with_body do %> + <%= render( + TimeEntries::TimeEntryFormComponent.new( + time_entry: time_entry, + show_user: show_user, + show_work_package: show_work_package + ) + ) %> + <% end %> + <% d.with_footer(variant: :large) do %> + <% flex_layout(justify_content: :flex_end, classes: "time-entry-dialog-footer-buttons") do |flex| %> + <% if time_entry.persisted? %> + <% flex.with_column do %> + <%= render( + Primer::ButtonComponent.new( + scheme: :danger, + test_selector: "destroy-time-entry-button", + data: { + "turbo" => true, + "turbo-method" => :delete, + "turbo-confirm" => t("js.text_are_you_sure") + }, + href: time_entry_path(time_entry), + tag: :a + ) + ) { t("button_delete") } %> + <% end %> + <% end %> + <% flex.with_column(classes: "time-entry-button-push") %> + <% flex.with_column do %> + <%= render( + Primer::ButtonComponent.new(data: { "close-dialog-id": "time-entry-dialog" }) + ) { I18n.t("button_cancel") } %> + <%= render( + Primer::ButtonComponent.new( + scheme: :primary, + type: :submit, + test_selector: "create-time-entry-button", + form: "time-entry-form" + ) + ) { t("button_log_time") } %> + <% end %> + <% end %> + <% end %> +<% end %> diff --git a/modules/costs/app/components/time_entries/entry_dialog_component.rb b/modules/costs/app/components/time_entries/entry_dialog_component.rb new file mode 100644 index 000000000000..8ce53c4ce0b7 --- /dev/null +++ b/modules/costs/app/components/time_entries/entry_dialog_component.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module TimeEntries + class EntryDialogComponent < ApplicationComponent + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + MODAL_ID = "time-entry-dialog" + + def initialize(time_entry:, show_user: true, show_work_package: true) + super() + @time_entry = time_entry + @show_user = show_user + @show_work_package = show_work_package + end + + private + + attr_reader :time_entry, :open, :show_user, :show_work_package + + def can_delete_time_entry? + return false if time_entry.new_record? + + DeleteContract.deletion_allowed?(@time_entry, User.current) + end + end +end diff --git a/modules/costs/app/components/time_entries/entry_dialog_component.sass b/modules/costs/app/components/time_entries/entry_dialog_component.sass new file mode 100644 index 000000000000..fcc8a2f41965 --- /dev/null +++ b/modules/costs/app/components/time_entries/entry_dialog_component.sass @@ -0,0 +1,39 @@ +/*! + / -- copyright + / OpenProject is an open source project management software. + / Copyright (C) 2024 the OpenProject GmbH + / + / This program is free software; you can redistribute it and/or + / modify it under the terms of the GNU General Public License version 3. + / + / OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: + / Copyright (C) 2006-2013 Jean-Philippe Lang + / Copyright (C) 2010-2013 the ChiliProject Team + / + / This program is free software; you can redistribute it and/or + / modify it under the terms of the GNU General Public License + / as published by the Free Software Foundation; either version 2 + / of the License, or (at your option) any later version. + / + / This program is distributed in the hope that it will be useful, + / but WITHOUT ANY WARRANTY; without even the implied warranty of + / MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + / GNU General Public License for more details. + / + / You should have received a copy of the GNU General Public License + / along with this program; if not, write to the Free Software + / Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + / + / See COPYRIGHT and LICENSE files for more details. + / ++ + / + +.time-entry-dialog-footer-buttons + width: 100% + +.time-entry-button-push + margin-left: auto + + +.time-entry-dialog-form-spacing + row-gap: var(--stack-gap-normal) diff --git a/modules/costs/app/components/time_entries/time_entry_form_component.html.erb b/modules/costs/app/components/time_entries/time_entry_form_component.html.erb new file mode 100644 index 000000000000..5a6c96ee7283 --- /dev/null +++ b/modules/costs/app/components/time_entries/time_entry_form_component.html.erb @@ -0,0 +1,47 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + See COPYRIGHT and LICENSE files for more details. + + ++# %> + + <%= component_wrapper do + primer_form_with(**form_options) do |form| + flex_layout(classes: "time-entry-dialog-form-spacing") do |body| + body.with_row(display: show_user ? :block : :none) do + render(TimeEntries::UserForm.new(form, visible: show_user)) + end + body.with_row { render(TimeEntries::DaysAndHoursForm.new(form)) } + body.with_row(display: show_work_package ? :block : :none) do + render( + TimeEntries::WorkPackageForm.new(form, visible: show_work_package) + ) + end + body.with_row { render(TimeEntries::ActivityForm.new(form)) } + body.with_row { render(TimeEntries::CommentsForm.new(form)) } + body.with_row { render(TimeEntries::CustomFieldsForm.new(form)) } + end + end + end %> diff --git a/modules/costs/app/components/time_entries/time_entry_form_component.rb b/modules/costs/app/components/time_entries/time_entry_form_component.rb new file mode 100644 index 000000000000..c81c15257b8d --- /dev/null +++ b/modules/costs/app/components/time_entries/time_entry_form_component.rb @@ -0,0 +1,74 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module TimeEntries + class TimeEntryFormComponent < ApplicationComponent + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + def initialize(time_entry:, show_user: true, show_work_package: true) + super() + @time_entry = time_entry + @show_user = show_user + @show_work_package = show_work_package + end + + private + + attr_reader :time_entry, :show_user, :show_work_package + + delegate :project, :work_package, to: :time_entry + + def form_options + base = { + model: time_entry, + data: { + turbo: true, + "time-entry-target" => "form", + refresh_form_url: refresh_form_time_entries_path + }, + id: "time-entry-form" + } + + if time_entry.persisted? + base.merge({ + url: time_entry_path(time_entry), + method: :patch + }) + else + + base.merge({ + url: time_entries_path, + method: :post + }) + end + end + end +end diff --git a/modules/costs/app/components/time_entries/user_form.rb b/modules/costs/app/components/time_entries/user_form.rb new file mode 100644 index 000000000000..697271d36aca --- /dev/null +++ b/modules/costs/app/components/time_entries/user_form.rb @@ -0,0 +1,88 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module TimeEntries + class UserForm < ApplicationForm + def initialize(visible: true) + super() + @visible = visible + end + + form do |f| + f.hidden name: :show_user, value: @visible + + if show_user_field? + f.autocompleter( + name: :user_id, + id: "time_entry_user_id", + label: TimeEntry.human_attribute_name(:user), + required: true, + autocomplete_options: { + defaultData: true, + hiddenFieldAction: "change->time-entry#userChanged", + component: "opce-user-autocompleter", + url: ::API::V3::Utilities::PathHelper::ApiV3Path.principals, + filters: user_completer_filters, + searchKey: "any_name_attribute", + resource: "principals", + focusDirectly: false, + multiple: false, + clearable: false, + appendTo: "#time-entry-dialog" + } + ) + end + end + + private + + delegate :project, to: :model + + def show_user_field? + return false unless @visible + return false if project && !User.current.allowed_in_project?(:log_time, project) + + true + end + + def user_completer_filters + filters = [ + { name: "type", operator: "=", values: %w[User Group] }, + { name: "status", operator: "=", values: [Principal.statuses[:active], Principal.statuses[:invited]] } + ] + + if model.project_id + filters << { name: "member", operator: "=", values: [model.project_id] } + end + + filters + end + end +end diff --git a/modules/costs/app/components/time_entries/work_package_form.rb b/modules/costs/app/components/time_entries/work_package_form.rb new file mode 100644 index 000000000000..142248f7cb94 --- /dev/null +++ b/modules/costs/app/components/time_entries/work_package_form.rb @@ -0,0 +1,100 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module TimeEntries + class WorkPackageForm < ApplicationForm + def initialize(visible: true) + super() + @visible = visible + end + + form do |f| + f.hidden name: :show_work_package, value: @visible + + if show_work_package_field? + f.work_package_autocompleter name: :work_package_id, + label: TimeEntry.human_attribute_name(:work_package), + required: work_package_required?, + validation_message: work_package_validation_error, + autocomplete_options: { + defaultData: false, + component: "opce-time-entries-work-package-autocompleter", + hiddenFieldAction: "change->time-entry#workPackageChanged", + focusDirectly: false, + append_to: "#time-entry-dialog", + url: work_package_completer_url, + filters: work_package_completer_filters + } + else + f.hidden name: :work_package_id, value: model.work_package_id + end + end + + private + + def show_work_package_field? + return true if model.work_package_id.nil? + + @visible + end + + def work_package_completer_url + if model.persisted? + ::API::V3::Utilities::PathHelper::ApiV3Path.time_entries_available_work_packages_on_edit(model.id) + else + ::API::V3::Utilities::PathHelper::ApiV3Path.time_entries_available_work_packages_on_create + end + end + + # When logging time from a project page or the work package page, the project id field is set in the background. + # When logging from the my page the project is only settable via the work package so in this case we need to make + # the WP field mandatory and get the error message from the project_id field and move it to the work_package_id field. + # + # We're still discussing if we make the work package mandatory, then this will become obsolete and + # probably be removed. + def work_package_required? + model.project.blank? + end + + def work_package_validation_error + model.errors[:project_id]&.first + end + + def work_package_completer_filters + filters = [] + + if model.project_id + filters << { name: "project_id", operator: "=", values: [model.project_id] } + end + + filters + end + end +end diff --git a/modules/costs/app/contracts/time_entries/base_contract.rb b/modules/costs/app/contracts/time_entries/base_contract.rb index 52aad1fda5db..275350dfad97 100644 --- a/modules/costs/app/contracts/time_entries/base_contract.rb +++ b/modules/costs/app/contracts/time_entries/base_contract.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -44,6 +46,7 @@ def self.model validate :validate_hours_are_in_range validate :validate_project_is_set validate :validate_work_package + validate :validate_user validates :spent_on, date: { before_or_equal_to: Proc.new { Date.new(9999, 12, 31) }, @@ -69,6 +72,8 @@ def self.model attribute :user_id, permission: :log_time + attribute :start_time # TODO: Add validation with global setting + def assignable_activities if model.project TimeEntryActivity.active_in_project(model.project) @@ -93,6 +98,15 @@ def validate_work_package end end + def validate_user + return unless model.user || model.user_id_changed? + return if model.user == model.logged_by + + if user_invisible? + errors.add :user_id, :invalid + end + end + def validate_hours_are_in_range errors.add :hours, :invalid if model.hours&.negative? end @@ -113,8 +127,8 @@ def work_package_not_in_project? model.work_package && model.project != model.work_package.project end - def validate_logged_by_current_user - errors.add :logged_by_id, :not_current_user if model.logged_by != logged_by + def user_invisible? + model.user.nil? || !model.user.visible? end def validate_self_timer diff --git a/modules/costs/app/contracts/time_entries/update_contract.rb b/modules/costs/app/contracts/time_entries/update_contract.rb index ddc228b08fa5..7084f2ddd88d 100644 --- a/modules/costs/app/contracts/time_entries/update_contract.rb +++ b/modules/costs/app/contracts/time_entries/update_contract.rb @@ -62,9 +62,10 @@ def user_allowed_to_update_in?(time_entry) end def user_allowed_to_modify_ongoing?(time_entry) - model.user == user && (user.allowed_in_project?(:log_time, - time_entry.project) || user.allowed_in_work_package?(:log_own_time, - time_entry.work_package)) + model.user == user && ( + user.allowed_in_project?(:log_time, time_entry.project) || + user.allowed_in_work_package?(:log_own_time, time_entry.work_package) + ) end end end diff --git a/modules/costs/app/controllers/cost_types_controller.rb b/modules/costs/app/controllers/cost_types_controller.rb index 099e123d4358..db537b965439 100644 --- a/modules/costs/app/controllers/cost_types_controller.rb +++ b/modules/costs/app/controllers/cost_types_controller.rb @@ -70,7 +70,7 @@ def update if @cost_type.save flash[:notice] = t(:notice_successful_update) - redirect_back_or_default(action: "index") + redirect_back_or_default({ action: "index" }) else render action: :edit, status: :unprocessable_entity, layout: !request.xhr? end @@ -92,7 +92,7 @@ def create # rubocop:disable Metrics/AbcSize if @cost_type.save flash[:notice] = t(:notice_successful_update) - redirect_back_or_default(action: "index") + redirect_back_or_default({ action: "index" }) else @cost_type.rates.build(valid_from: Date.today) if @cost_type.rates.empty? render action: :edit, status: :unprocessable_entity, layout: !request.xhr? @@ -109,7 +109,7 @@ def destroy if @cost_type.save flash[:notice] = t(:notice_successful_lock) - redirect_back_or_default(action: "index") + redirect_back_or_default({ action: "index" }) end end @@ -120,7 +120,7 @@ def restore if @cost_type.save flash[:notice] = t(:notice_successful_restore) - redirect_back_or_default(action: "index") + redirect_back_or_default({ action: "index" }) end end diff --git a/modules/costs/app/controllers/costlog_controller.rb b/modules/costs/app/controllers/costlog_controller.rb index 386ff2436898..8b00024b59c7 100644 --- a/modules/costs/app/controllers/costlog_controller.rb +++ b/modules/costs/app/controllers/costlog_controller.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -102,9 +104,6 @@ def find_project elsif params[:work_package_id] @work_package = WorkPackage.find(params[:work_package_id]) @project = @work_package.project - elsif params[:work_package_id] - @work_package = WorkPackage.find(params[:work_package_id]) - @project = @work_package.project elsif params[:project_id] @project = Project.find(params[:project_id]) else diff --git a/modules/costs/app/controllers/costs_settings_controller.rb b/modules/costs/app/controllers/costs_settings_controller.rb index 737541a38b4f..f6a66fec7131 100644 --- a/modules/costs/app/controllers/costs_settings_controller.rb +++ b/modules/costs/app/controllers/costs_settings_controller.rb @@ -27,5 +27,5 @@ #++ class CostsSettingsController < Admin::SettingsController - menu_item :admin_costs + menu_item :costs_settings end diff --git a/modules/costs/app/controllers/hourly_rates_controller.rb b/modules/costs/app/controllers/hourly_rates_controller.rb index 50feea32249f..f130372a408f 100644 --- a/modules/costs/app/controllers/hourly_rates_controller.rb +++ b/modules/costs/app/controllers/hourly_rates_controller.rb @@ -108,9 +108,9 @@ def update # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity if @user.save flash[:notice] = t(:notice_successful_update) if @project.nil? - redirect_back_or_default(controller: "users", action: "edit", id: @user) + redirect_back_or_default({ controller: "users", action: "edit", id: @user }) else - redirect_back_or_default(action: "show", id: @user, project_id: @project) + redirect_back_or_default({ action: "show", id: @user, project_id: @project }) end else if @project.nil? diff --git a/modules/costs/app/controllers/time_entries_controller.rb b/modules/costs/app/controllers/time_entries_controller.rb new file mode 100644 index 000000000000..7598efb05709 --- /dev/null +++ b/modules/costs/app/controllers/time_entries_controller.rb @@ -0,0 +1,188 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class TimeEntriesController < ApplicationController + include OpTurbo::ComponentStream + include OpTurbo::DialogStreamHelper + include Redmine::I18n + + before_action :require_login + + with_options only: [:dialog] do + before_action :load_and_authorize_optional_project + before_action :load_and_authorize_optional_work_package + end + + before_action :load_or_build_and_authorize_time_entry, only: %i[dialog update destroy] + + authorization_checked! :dialog, :create, :update, :user_tz_caption, :refresh_form, :destroy + + def dialog + @show_work_package = params[:work_package_id].blank? + @show_user = show_user_input_in_dialog + + @time_entry.spent_on ||= params[:date].presence || Time.zone.today + end + + def user_tz_caption + user = User.visible.find_by(id: params[:user_id]) + caption = if user && user.time_zone != User.current.time_zone + I18n.t("notice_different_time_zones", tz: friendly_timezone_name(user.time_zone)) + else + "" + end + + add_caption_to_input_element_via_turbo_stream('input[name="time_entry[user_id]"]', + caption:, + clean_other_captions: true) + respond_with_turbo_streams + end + + def refresh_form + call = TimeEntries::SetAttributesService.new( + user: current_user, + model: TimeEntry.new, + contract_class: EmptyContract + ).call(permitted_params.time_entries) + + time_entry = call.result + + replace_via_turbo_stream( + component: TimeEntries::TimeEntryFormComponent.new(time_entry: time_entry, **form_config_options) + ) + + respond_with_turbo_streams + end + + def create + call = TimeEntries::CreateService + .new(user: current_user) + .call(permitted_params.time_entries) + + @time_entry = call.result + + unless call.success? + form_component = TimeEntries::TimeEntryFormComponent.new(time_entry: @time_entry, **form_config_options) + update_via_turbo_stream(component: form_component, status: :bad_request) + + respond_with_turbo_streams + end + end + + def update + call = TimeEntries::UpdateService + .new(user: current_user, model: @time_entry) + .call(permitted_params.time_entries) + + @time_entry = call.result + + unless call.success? + form_component = TimeEntries::TimeEntryFormComponent.new(time_entry: @time_entry, **form_config_options) + update_via_turbo_stream(component: form_component, status: :bad_request) + + respond_with_turbo_streams + end + end + + def destroy + call = TimeEntries::DeleteService.new(user: current_user, model: @time_entry).call + + @time_entry = call.result + + if call.success? + close_dialog_via_turbo_stream("#time-entry-dialog") + else + form_component = TimeEntries::TimeEntryFormComponent.new(time_entry: @time_entry, **form_config_options) + update_via_turbo_stream(component: form_component, status: :bad_request) + end + + respond_with_turbo_streams + end + + private + + def show_user_input_in_dialog + return false if params[:onlyMe] == "true" + + if @project + User.current.allowed_in_project?(:log_time, @project) + else + User.current.allowed_in_any_project?(:log_time) + end + end + + def form_config_options + { + show_user: params[:time_entry][:show_user] == "true", + show_work_package: params[:time_entry][:show_work_package] == "true" + } + end + + def load_and_authorize_optional_project + if params[:project_id].present? + @project = Project.visible.find(params[:project_id]) + + if !User.current.allowed_in_project?(:log_time, @project) && + !User.current.allowed_in_any_work_package?(:log_own_time, in_project: @project) + deny_access + end + + end + rescue ActiveRecord::RecordNotFound + deny_access(not_found: true) + end + + def load_and_authorize_optional_work_package + if params[:work_package_id].present? + @work_package = WorkPackage.visible.find(params[:work_package_id]) + @project = @work_package.project + + if !User.current.allowed_in_project?(:log_time, @project) && + !User.current.allowed_in_work_package?(:log_own_time, @work_package) + deny_access + end + end + rescue ActiveRecord::RecordNotFound + deny_access(not_found: true) + end + + def load_or_build_and_authorize_time_entry + @time_entry = if params[:id] + entry = TimeEntry.find_by(id: params[:id]) + if entry.blank? || !TimeEntries::UpdateContract.new(entry, current_user).user_allowed_to_update? + deny_access(not_found: true) + else + entry + end + else + TimeEntry.new(project: @project, work_package: @work_package, user: User.current) + end + end +end diff --git a/modules/costs/app/models/time_entry.rb b/modules/costs/app/models/time_entry.rb index 7ca7f424c695..fdd1d33ef4da 100644 --- a/modules/costs/app/models/time_entry.rb +++ b/modules/costs/app/models/time_entry.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -38,21 +40,36 @@ class TimeEntry < ApplicationRecord MIN_TIME = 0 # => 00:00 MAX_TIME = (60 * 24) - 1 # => 23:59 + SECONDS_PER_HOUR = 3600.0 acts_as_customizable acts_as_journalized - validates_presence_of :user_id, :project_id, :spent_on - validates_presence_of :hours, if: -> { !ongoing? } - validates_numericality_of :hours, allow_nil: true, message: :invalid + validates :user_id, :project_id, :spent_on, + presence: true + + validates :hours, + presence: true, + if: -> { !ongoing? } + + validates :hours, + numericality: { + message: :invalid + }, + allow_nil: true - validates :start_time, :hours, + validates :start_time, presence: true, if: -> { TimeEntry.must_track_start_and_end_time? } validates :start_time, - numericality: { only_integer: true, greater_than_or_equal_to: MIN_TIME, less_than_or_equal_to: MAX_TIME }, + numericality: { + only_integer: true, + greater_than_or_equal_to: MIN_TIME, + less_than_or_equal_to: MAX_TIME, + message: :invalid_time + }, allow_blank: true scope :on_work_packages, ->(work_packages) { where(work_package_id: work_packages) } @@ -71,7 +88,7 @@ class TimeEntry < ApplicationRecord register_journal_formatted_fields "hours", formatter_key: :time_entry_hours register_journal_formatted_fields "user_id", formatter_key: :time_entry_named_association register_journal_formatted_fields "work_package_id", "activity_id", formatter_key: :named_association - register_journal_formatted_fields "comments", "spent_on", formatter_key: :plaintext + register_journal_formatted_fields "comments", "spent_on", "start_time", formatter_key: :plaintext def self.update_all(updates, conditions = nil, options = {}) # instead of a update_all, perform an individual update during work_package#move @@ -92,6 +109,20 @@ def hours=(value) write_attribute :hours, (value.is_a?(String) ? (value.to_hours || value) : value) end + def ongoing_hours + return nil unless ongoing? + + (Time.zone.now.to_i - created_at.to_i) / SECONDS_PER_HOUR + end + + def start_time=(value) + if value.is_a?(String) && value =~ /\A(\d{1,2}):(\d{2})\z/ + super(($1.to_i * 60) + $2.to_i) + else + super + end + end + # Returns true if the time entry can be edited by usr, otherwise false def editable_by?(usr) (usr == user && usr.allowed_in_work_package?(:edit_own_time_entries, work_package)) || @@ -112,9 +143,10 @@ def costs_visible_by?(usr) (user_id == usr.id && usr.allowed_in_project?(:view_own_hourly_rate, project)) end - def start_timestamp + def start_timestamp # rubocop:disable Metrics/AbcSize return nil if start_time.blank? return nil if time_zone.blank? + return nil if spent_on.blank? time_zone_object.local(spent_on.year, spent_on.month, spent_on.day, start_time / 60, start_time % 60) end @@ -122,9 +154,13 @@ def start_timestamp def end_timestamp return nil if start_time.blank? return nil if time_zone.blank? - return nil if hours.blank? + return nil if spent_on.blank? - start_timestamp + hours.hours + if ongoing? + start_timestamp + ongoing_hours.hours + else + start_timestamp + hours.hours + end end class << self diff --git a/modules/costs/app/models/time_entry_activity.rb b/modules/costs/app/models/time_entry_activity.rb index 8f977362dccd..60ee893efb64 100644 --- a/modules/costs/app/models/time_entry_activity.rb +++ b/modules/costs/app/models/time_entry_activity.rb @@ -64,6 +64,10 @@ def activated_projects Project.activated_time_activity(self) end + def self.can_have_default_value? + false + end + private def detect_project_time_entry_activity_active_state(project) diff --git a/modules/costs/app/services/time_entries/set_attributes_service.rb b/modules/costs/app/services/time_entries/set_attributes_service.rb index 0a9f860ef1bd..65cbe60e3e27 100644 --- a/modules/costs/app/services/time_entries/set_attributes_service.rb +++ b/modules/costs/app/services/time_entries/set_attributes_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -30,7 +32,7 @@ module TimeEntries class SetAttributesService < ::BaseServices::SetAttributes private - def set_attributes(_attributes) + def set_attributes(_attributes) # rubocop:disable Metrics/AbcSize model.attributes = params ## @@ -41,6 +43,14 @@ def set_attributes(_attributes) set_default_attributes(params) if model.new_record? + # move the timezone from the user + model.change_by_system do + model.time_zone = model.user.time_zone.name + end + + # Set start time for ongoing time entries + ensure_start_time_for_onging_entries + # Always set the logging user as logged_by set_logged_by end @@ -48,7 +58,6 @@ def set_attributes(_attributes) def set_default_attributes(*) set_default_user set_default_hours - set_default_activity if model.activity.nil? end def set_logged_by @@ -63,28 +72,6 @@ def set_default_user end end - def set_default_activity - return unless TimeEntryActivity.default - - if model.project - assign_default_project_activity - else - assign_default_activity - end - end - - def assign_default_project_activity - if TimeEntryActivity.active_in_project(model.project).exists?(id: TimeEntryActivity.default.id) - assign_default_activity - end - end - - def assign_default_activity - model.change_by_system do - model.activity = TimeEntryActivity.default - end - end - def set_default_hours model.hours = nil if model.hours&.zero? end @@ -93,5 +80,15 @@ def no_project_or_context_changed? !model.project || (model.work_package && model.work_package_id_changed? && !model.project_id_changed?) end + + def ensure_start_time_for_onging_entries + return unless model.new_record? + return unless model.ongoing? + return unless TimeEntry.can_track_start_and_end_time? + + Time.use_zone(model.user.time_zone) do + model.start_time ||= Time.zone.now.strftime("%H:%M") + end + end end end diff --git a/modules/costs/app/views/time_entries/dialog.turbo_stream.erb b/modules/costs/app/views/time_entries/dialog.turbo_stream.erb new file mode 100644 index 000000000000..c8a95c962517 --- /dev/null +++ b/modules/costs/app/views/time_entries/dialog.turbo_stream.erb @@ -0,0 +1,7 @@ +<%= turbo_stream.dialog do + render(TimeEntries::EntryDialogComponent.new( + time_entry: @time_entry, + show_user: @show_user, + show_work_package: @show_work_package + )) +end %> diff --git a/modules/costs/config/locales/crowdin/af.yml b/modules/costs/config/locales/crowdin/af.yml index 697b1dc9ccc9..042db062238a 100644 --- a/modules/costs/config/locales/crowdin/af.yml +++ b/modules/costs/config/locales/crowdin/af.yml @@ -33,6 +33,7 @@ af: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ af: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Ure + comments: Comment + activity: Aktiwiteit + spent_on: Datum + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ af: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ af: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Verstek" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ af: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ af: label_until: "until" label_valid_from: "Valid from" label_yes: "Ja" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ af: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ar.yml b/modules/costs/config/locales/crowdin/ar.yml index b50b099182d4..2b3ce72d5877 100644 --- a/modules/costs/config/locales/crowdin/ar.yml +++ b/modules/costs/config/locales/crowdin/ar.yml @@ -33,6 +33,7 @@ ar: cost_type: unit: "اسم الوحدة" unit_plural: "اسم الوحدة متعددة الأقطاب" + default: "Cost type by default" work_package: costs_by_type: "الوحدات المستهلكة" labor_costs: "تكاليف العمل" @@ -44,6 +45,16 @@ ar: rate: "المعدل" user: default_rates: "المعدلات المفترضة" + time_entry: + project: Project + user: User + work_package: Work package + hours: الساعات + comments: Comment + activity: النشاط + spent_on: التاريخ + start_time: Start time + end_time: Finish time models: cost_type: zero: "أنواع التكلفة" @@ -55,6 +66,8 @@ ar: rate: "المعدل" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "مجموعة العمل #%{id} ليست هدفًا صالحًا لإعادة تعيين إدخالات التكلفة." nullify_is_not_valid_for_cost_entries: "لا يمكن تعيين إدخالات التكلفة للمشروع." @@ -69,6 +82,7 @@ ar: fixed_date: "تاريخ ثابت" button_add_rate: "أضِف المعدل" button_log_costs: "سجل تكاليف الوحدة" + button_log_time: "Log" caption_booked_on_project: "حُجِِز على المشروع" caption_default: "الافتراضي" caption_default_rate_history_for: "تاريخ المعدل الافتراضي ل %{user}" @@ -80,6 +94,7 @@ ar: caption_save_rate: "معدل التوفير" caption_set_rate: "ضبط المعدل الحالي" caption_show_locked: "إظهار الأنواع المغلقة" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "تاريخ المعدل الجديد" group_by_others: "ليس في أي مجموعة" label_between: "بين" @@ -119,10 +134,12 @@ ar: label_until: "حتى" label_valid_from: "صالح من" label_yes: "نعم" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "حصل خطأ ما. من فضلك حاول مرة أخرى." notice_successful_restore: "استعادة ناجحة." notice_successful_lock: "أغلِقت بنجاح." notice_cost_logged_successfully: "تمّ تسجيل تكلفة الوحدة بنجاح." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "تحرير تكاليف الوحدة المحجوزة" permission_edit_own_cost_entries: "تحرير تكاليف الوحدة المحجوزة الخاصة" permission_edit_hourly_rates: "تحرير الأجور الساعيّة" @@ -150,3 +167,7 @@ ar: week: "الأسبوع" js: text_are_you_sure: "هل أنت متأكد؟" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/az.yml b/modules/costs/config/locales/crowdin/az.yml index c2e9da30db92..1491e8f3dddd 100644 --- a/modules/costs/config/locales/crowdin/az.yml +++ b/modules/costs/config/locales/crowdin/az.yml @@ -33,6 +33,7 @@ az: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ az: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ az: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ az: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ az: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ az: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ az: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/be.yml b/modules/costs/config/locales/crowdin/be.yml index e064b0fbf12d..be077ae8bb3f 100644 --- a/modules/costs/config/locales/crowdin/be.yml +++ b/modules/costs/config/locales/crowdin/be.yml @@ -33,6 +33,7 @@ be: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ be: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Гадзіны + comments: Comment + activity: Activity + spent_on: Дата + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -53,6 +64,8 @@ be: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -67,6 +80,7 @@ be: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -78,6 +92,7 @@ be: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -117,10 +132,12 @@ be: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -148,3 +165,7 @@ be: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/bg.yml b/modules/costs/config/locales/crowdin/bg.yml index 69b55b8c90e2..1bf189547e48 100644 --- a/modules/costs/config/locales/crowdin/bg.yml +++ b/modules/costs/config/locales/crowdin/bg.yml @@ -33,6 +33,7 @@ bg: cost_type: unit: "Име на единица" unit_plural: "Плурализирано име на единица" + default: "Cost type by default" work_package: costs_by_type: "Изразходвани единици" labor_costs: "Разходи за труд" @@ -44,6 +45,16 @@ bg: rate: "Ставка" user: default_rates: "Ставка по подразбиране" + time_entry: + project: Project + user: User + work_package: Work package + hours: Часове + comments: Comment + activity: Активност + spent_on: Дата + start_time: Start time + end_time: Finish time models: cost_type: one: "Тип разход" @@ -51,6 +62,8 @@ bg: rate: "Ставка" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Работния пакет #%{id} не е валидна цел за преназначение на разходите." nullify_is_not_valid_for_cost_entries: "Вписванията за разходи не могат да бъдат зададени на проект." @@ -65,6 +78,7 @@ bg: fixed_date: "Фиксирана дата" button_add_rate: "Добавете курс" button_log_costs: "Разходи за единична регистрация" + button_log_time: "Log" caption_booked_on_project: "Разходи за единична регистрация" caption_default: "По подразбиране" caption_default_rate_history_for: "История на тарифите по подразбиране за %{user}" @@ -76,6 +90,7 @@ bg: caption_save_rate: "Съхраняване на ставката" caption_set_rate: "Задайте текуща ставка" caption_show_locked: "Показване на заключените типове" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Дата за нова ставка" group_by_others: "не е в нито една група" label_between: "между" @@ -115,10 +130,12 @@ bg: label_until: "докато" label_valid_from: "Валиден от" label_yes: "Да" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Нещо се обърка. Моля, опитайте отново." notice_successful_restore: "Успешно възстановяване." notice_successful_lock: "Заключено успешно." notice_cost_logged_successfully: "Единичната цена е регистрирана успешно." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Редактирайте резервираните единични разходи" permission_edit_own_cost_entries: "Редактирайте собствените резервирани единични разходи" permission_edit_hourly_rates: "Редактирайте почасовите ставки" @@ -146,3 +163,7 @@ bg: week: "седмица" js: text_are_you_sure: "Сигурни ли сте?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ca.yml b/modules/costs/config/locales/crowdin/ca.yml index 2fc6e6c2f3b4..b1bf2f75f637 100644 --- a/modules/costs/config/locales/crowdin/ca.yml +++ b/modules/costs/config/locales/crowdin/ca.yml @@ -33,6 +33,7 @@ ca: cost_type: unit: "Nom d'unitat" unit_plural: "Noms d'unitat pluralitzats" + default: "Cost type by default" work_package: costs_by_type: "Unitats gastades" labor_costs: "Costs de treball" @@ -44,6 +45,16 @@ ca: rate: "Tarifa" user: default_rates: "Tarifes per defecte" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hores + comments: Comment + activity: Activitat + spent_on: Data + start_time: Start time + end_time: Finish time models: cost_type: one: "Estil de cost" @@ -51,6 +62,8 @@ ca: rate: "Tarifa" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "El paquet de treball #%{id} no és un objectiu vàlid per reassignar les entrades de costs." nullify_is_not_valid_for_cost_entries: "Les entrades de cost no poden ser assignades a un projecte." @@ -65,6 +78,7 @@ ca: fixed_date: "Data fixada" button_add_rate: "Afegeix tarifa" button_log_costs: "Registra unitat de costs" + button_log_time: "Log" caption_booked_on_project: "Registrat a un projecte" caption_default: "Per defecte" caption_default_rate_history_for: "Història de tarifa per defecte per %{user}" @@ -76,6 +90,7 @@ ca: caption_save_rate: "Guardar tarifa" caption_set_rate: "Estableix la tarifa actual" caption_show_locked: "Mostra els estils fixats" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Data per una tarifa nova" group_by_others: "no està a cap grup" label_between: "entre" @@ -115,10 +130,12 @@ ca: label_until: "fins a" label_valid_from: "Vàlid des de" label_yes: "Si" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Alguna cosa ha anat malament. Si us plau, prova-ho de nou." notice_successful_restore: "Restaurat correctament." notice_successful_lock: "Fixat correctament." notice_cost_logged_successfully: "Cost d'unitat registrat correctament." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Editar costs d'unitat registrats" permission_edit_own_cost_entries: "Editar costs d'unitat registrats propis" permission_edit_hourly_rates: "Editar tarifes per hora" @@ -146,3 +163,7 @@ ca: week: "setmana" js: text_are_you_sure: "N'estas segur?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ckb-IR.yml b/modules/costs/config/locales/crowdin/ckb-IR.yml index 16643fa127cc..01cb388efe52 100644 --- a/modules/costs/config/locales/crowdin/ckb-IR.yml +++ b/modules/costs/config/locales/crowdin/ckb-IR.yml @@ -33,6 +33,7 @@ ckb-IR: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ ckb-IR: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ ckb-IR: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ ckb-IR: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ ckb-IR: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ ckb-IR: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ ckb-IR: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/cs.yml b/modules/costs/config/locales/crowdin/cs.yml index 403fb73df6f7..799cbf085e5b 100644 --- a/modules/costs/config/locales/crowdin/cs.yml +++ b/modules/costs/config/locales/crowdin/cs.yml @@ -33,6 +33,7 @@ cs: cost_type: unit: "Název jednotky" unit_plural: "Název Pluralizované jednotky" + default: "Typ nákladů ve výchozím nastavení" work_package: costs_by_type: "Strávené jednotky" labor_costs: "Náklady práce" @@ -44,6 +45,16 @@ cs: rate: "Kurz" user: default_rates: "Výchozí sazby" + time_entry: + project: Projekt + user: Uživatel + work_package: Pracovní balíček + hours: Hodiny + comments: Komentář + activity: Aktivita + spent_on: Datum + start_time: Čas zahájení + end_time: Čas dokončení models: cost_type: one: "Druh nákladů" @@ -53,6 +64,8 @@ cs: rate: "Sazba" errors: models: + time_entry: + invalid_time: "musí být mezi 00:00 a 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Pracovní balíček #%{id} není platný cíl pro přeřazení nákladových položek." nullify_is_not_valid_for_cost_entries: "K projektu nelze přiřadit položky nákladů." @@ -67,6 +80,7 @@ cs: fixed_date: "Pevné datum" button_add_rate: "Přidat kurz" button_log_costs: "Logovat jednotkové náklady" + button_log_time: "Log" caption_booked_on_project: "Rezervováno v projektu" caption_default: "Výchozí" caption_default_rate_history_for: "Výchozí historie sazeb pro %{user}" @@ -78,6 +92,7 @@ cs: caption_save_rate: "Uložit kurz" caption_set_rate: "Nastavit aktuální sazbu." caption_show_locked: "Zobrazit uzamčené typy" + caption_log_time_dialog: "Čas logu" description_date_for_new_rate: "Datum pro nový kurz" group_by_others: "není v žádné skupině" label_between: "mezi" @@ -117,10 +132,12 @@ cs: label_until: "do" label_valid_from: "Platné od" label_yes: "Ano" + placeholder_activity_select_work_package_first: Nejprve je nutné vybrat pracovní balíček notice_something_wrong: "Něco se pokazilo. Zkuste to prosím znovu." notice_successful_restore: "Úspěšně obnoveno." notice_successful_lock: "Úspěšně uzamčeno." notice_cost_logged_successfully: "Jednotková cena byla úspěšně zaznamenána." + notice_different_time_zones: "Tento uživatel má jiné časové pásmo (%{tz}). Čas bude zaznamenán pomocí svého časového pásma." permission_edit_cost_entries: "Upravit rezervované jednotkové náklady" permission_edit_own_cost_entries: "Upravit vlastní rezervované jednotkové náklady" permission_edit_hourly_rates: "Upravit hodinové sazby" @@ -148,3 +165,7 @@ cs: week: "týden" js: text_are_you_sure: "Jste si jisti?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/da.yml b/modules/costs/config/locales/crowdin/da.yml index 3c64f0839ba4..500fe30ddb91 100644 --- a/modules/costs/config/locales/crowdin/da.yml +++ b/modules/costs/config/locales/crowdin/da.yml @@ -33,6 +33,7 @@ da: cost_type: unit: "Enhedsnavn" unit_plural: "Pluralistisk enhedsnavn" + default: "Cost type by default" work_package: costs_by_type: "Forbrugte enheder" labor_costs: "Lønomkostninger" @@ -44,6 +45,16 @@ da: rate: "Sats" user: default_rates: "Standardsatser" + time_entry: + project: Project + user: User + work_package: Work package + hours: Timer + comments: Comment + activity: Aktivivtet + spent_on: Dato + start_time: Start time + end_time: Finish time models: cost_type: one: "Omkostningstype" @@ -51,6 +62,8 @@ da: rate: "Sats" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Arbejdspakke #%{id} er ikke et gyldigt mål til omfordeling af omkostningsangivelser." nullify_is_not_valid_for_cost_entries: "Omkostningsangivelser kan ikke tildeles et projekt." @@ -65,6 +78,7 @@ da: fixed_date: "Fast dato" button_add_rate: "Tilføj sats" button_log_costs: "Registrér enhedsomkostninger" + button_log_time: "Log" caption_booked_on_project: "Reservationer til projekt" caption_default: "Forhåndsvalgt" caption_default_rate_history_for: "Standardsatshistorik for %{user}" @@ -76,6 +90,7 @@ da: caption_save_rate: "Gem sats" caption_set_rate: "Indstil nuværende sats" caption_show_locked: "Vis låste typer" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Dato for ny sats" group_by_others: "ikke i nogen gruppe" label_between: "mellem" @@ -115,10 +130,12 @@ da: label_until: "indtil" label_valid_from: "Gældende fra" label_yes: "Ja" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Noget gik galt. Forsøg venligst igen." notice_successful_restore: "Gendannet." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Redigér reserverede enhedsomkostninger" permission_edit_own_cost_entries: "Redigér egne reserverede enhedsomkostninger" permission_edit_hourly_rates: "Redigér timesatser" @@ -146,3 +163,7 @@ da: week: "uge" js: text_are_you_sure: "Sikker?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/de.yml b/modules/costs/config/locales/crowdin/de.yml index add466c5965a..0afa67e4e7bb 100644 --- a/modules/costs/config/locales/crowdin/de.yml +++ b/modules/costs/config/locales/crowdin/de.yml @@ -33,6 +33,7 @@ de: cost_type: unit: "Einheit" unit_plural: "Einheit plural" + default: "Standardkostentyp" work_package: costs_by_type: "Gebuchte Einheiten" labor_costs: "Personaleinzelkosten" @@ -44,6 +45,16 @@ de: rate: "Satz" user: default_rates: "Standardsätze" + time_entry: + project: Projekt + user: Benutzer + work_package: Arbeitspaket + hours: Stunden + comments: Kommentar + activity: Aktivität + spent_on: Datum + start_time: Startzeit + end_time: Endzeit models: cost_type: one: "Kostentyp" @@ -51,6 +62,8 @@ de: rate: "Satz" errors: models: + time_entry: + invalid_time: "muss zwischen 00:00 und 23:59 liegen." work_package: is_not_a_valid_target_for_cost_entries: "Arbeitspaket #%{id} ist kein gültiges Ziel für die Zuordnug der Stückkosteneinträge." nullify_is_not_valid_for_cost_entries: "Stückkosten können keinem Projekt zugeordnet werden." @@ -65,6 +78,7 @@ de: fixed_date: "Referenzdatum" button_add_rate: "Satz hinzufügen" button_log_costs: "Stückkosten buchen" + button_log_time: "Protokollieren" caption_booked_on_project: "Auf das Projekt gebucht" caption_default: "Standard" caption_default_rate_history_for: "Standardsatz-Historie für %{user}" @@ -76,6 +90,7 @@ de: caption_save_rate: "Satz speichern" caption_set_rate: "Aktuellen Satz festlegen" caption_show_locked: "Gesperrte Typen anzeigen" + caption_log_time_dialog: "Zeit protokollieren" description_date_for_new_rate: "Datum für neuen Satz" group_by_others: "In keiner der Gruppen" label_between: "zwischen" @@ -115,10 +130,12 @@ de: label_until: "bis" label_valid_from: "Gültig ab" label_yes: "Ja" + placeholder_activity_select_work_package_first: Die Auswahl des Arbeitspakets ist zuerst erforderlich notice_something_wrong: "Ein Fehler ist aufgetreten. Bitte versuchen Sie es erneut." notice_successful_restore: "Erfolgreich wiederhergestellt." notice_successful_lock: "Erfolgreich gesperrt." notice_cost_logged_successfully: "Stückkosten erfolgreich gebucht." + notice_different_time_zones: "Dieser Benutzer hat eine andere Zeitzone (%{tz}). Die Zeit wird unter Verwendung seiner Zeitzone protokolliert." permission_edit_cost_entries: "Bearbeiten gebuchter Stückkosten" permission_edit_own_cost_entries: "Bearbeiten eigener gebuchter Stückkosten" permission_edit_hourly_rates: "Stundensätze bearbeiten" @@ -146,3 +163,7 @@ de: week: "Woche" js: text_are_you_sure: "Sind Sie sicher?" + api_v3: + errors: + validation: + start_time_different_date: "Der Datumsteil von startTime (%{start_time}) muss mit dem Datum von spentOn (%{spent_on}) übereinstimmen." diff --git a/modules/costs/config/locales/crowdin/el.yml b/modules/costs/config/locales/crowdin/el.yml index b498d43cbb02..07ad8e36fb98 100644 --- a/modules/costs/config/locales/crowdin/el.yml +++ b/modules/costs/config/locales/crowdin/el.yml @@ -33,6 +33,7 @@ el: cost_type: unit: "Όνομα μονάδας" unit_plural: "Πληθυντικός ονόματος μονάδας" + default: "Cost type by default" work_package: costs_by_type: "Δαπανημένες μονάδες" labor_costs: "Κόστος εργασίας" @@ -44,6 +45,16 @@ el: rate: "Αμοιβή" user: default_rates: "Προεπιλεγμένη αμοιβή" + time_entry: + project: Project + user: User + work_package: Work package + hours: Ώρες + comments: Comment + activity: Δραστηριότητα + spent_on: Ημερομηνία + start_time: Start time + end_time: Finish time models: cost_type: one: "Τύπος κόστους" @@ -51,6 +62,8 @@ el: rate: "Αμοιβή" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Το πακέτο εργασίας #%{id} δεν είναι έγκυρος στόχος για ανάθεση των καταχωρήσεων κόστους." nullify_is_not_valid_for_cost_entries: "Οι καταχωρίσεις κόστους δεν μπορούν να ανατεθούν σε ένα έργο." @@ -65,6 +78,7 @@ el: fixed_date: "Καθορισμένη ημερομηνία" button_add_rate: "Προσθήκη αμοιβής" button_log_costs: "Καταγραφή κόστους μονάδας" + button_log_time: "Log" caption_booked_on_project: "Κλείστηκαν στο έργο" caption_default: "Προεπιλογή" caption_default_rate_history_for: "Προεπιλεγμένο ιστορικό αμοιβής για %{user}" @@ -76,6 +90,7 @@ el: caption_save_rate: "Αποθηκεύση αμοιβής" caption_set_rate: "Ορίστε την τρέχουσα αμοιβή" caption_show_locked: "Εμφάνιση κλειδωμένων τύπων" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Ημερομηνία για νέα αμοιβή" group_by_others: "δεν είναι σε καμία ομάδα" label_between: "μεταξύ" @@ -115,10 +130,12 @@ el: label_until: "μέχρι" label_valid_from: "Έγκυρο από" label_yes: "Ναι" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Κάτι πήγε στραβά. Παρακαλούμε προσπαθήστε ξανά." notice_successful_restore: "Επιτυχής επαναφορά." notice_successful_lock: "Κλειδώθηκε επιτυχώς." notice_cost_logged_successfully: "Η μονάδα κόστους καταγράφηκε επιτυχώς." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Επεξεργασία κλεισμένου κόστους μονάδας" permission_edit_own_cost_entries: "Επεξεργασία δικού μου κλεισμένου κόστους μονάδας" permission_edit_hourly_rates: "Επεξεργασία ωριαίων αμοιβών" @@ -146,3 +163,7 @@ el: week: "εβδομάδα" js: text_are_you_sure: "Είστε σίγουρος/η;" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/eo.yml b/modules/costs/config/locales/crowdin/eo.yml index bb6c809541d0..a6c973022e42 100644 --- a/modules/costs/config/locales/crowdin/eo.yml +++ b/modules/costs/config/locales/crowdin/eo.yml @@ -33,6 +33,7 @@ eo: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ eo: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Horoj + comments: Comment + activity: Aktiveco + spent_on: Dato + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ eo: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ eo: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Defaŭlte" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ eo: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "inter" @@ -115,10 +130,12 @@ eo: label_until: "until" label_valid_from: "Valid from" label_yes: "Jes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ eo: week: "semajno" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/es.yml b/modules/costs/config/locales/crowdin/es.yml index 97fb0763c1a3..bdc757a8ea87 100644 --- a/modules/costs/config/locales/crowdin/es.yml +++ b/modules/costs/config/locales/crowdin/es.yml @@ -33,6 +33,7 @@ es: cost_type: unit: "Nombre de la unidad" unit_plural: "Nombre de la unidad pluralizado" + default: "Tipo de coste por defecto" work_package: costs_by_type: "Unidades usadas" labor_costs: "Costos de mano de obra" @@ -44,6 +45,16 @@ es: rate: "Tasa" user: default_rates: "tasa de morosidad" + time_entry: + project: Proyecto + user: Usuario + work_package: Paquete de trabajo + hours: Horas + comments: Comentario + activity: Actividad + spent_on: Fecha + start_time: Hora de inicio + end_time: Hora de finalización models: cost_type: one: "Tipo de costo" @@ -51,6 +62,8 @@ es: rate: "Proporción" errors: models: + time_entry: + invalid_time: "debe estar entre las 00:00 y las 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Paquete de trabajo #%{id} no es un objetivo válido para reasignar las entradas de costo." nullify_is_not_valid_for_cost_entries: "Las entradas de costo no pueden ser asignadas a un proyecto." @@ -65,6 +78,7 @@ es: fixed_date: "Fecha fija" button_add_rate: "Añadir tasa" button_log_costs: "Registrar costos unitarios" + button_log_time: "Registro" caption_booked_on_project: "Reservados en proyecto" caption_default: "Por defecto" caption_default_rate_history_for: "Historial de morosidad para %{user}" @@ -76,6 +90,7 @@ es: caption_save_rate: "Guardar tasa" caption_set_rate: "Ajustar tasa actual" caption_show_locked: "Mostrar tipos de bloqueados" + caption_log_time_dialog: "Tiempo registrado" description_date_for_new_rate: "Fecha para la nueva tarifa" group_by_others: "no en cualquier grupo" label_between: "entre" @@ -115,10 +130,12 @@ es: label_until: "hasta" label_valid_from: "Válido desde" label_yes: "Sí" + placeholder_activity_select_work_package_first: Primero debe seleccionar el paquete de trabajo notice_something_wrong: "Algo salió mal. Por favor intentelo nuevamente." notice_successful_restore: "Restauración exitosa." notice_successful_lock: "Bloqueado correctamente." notice_cost_logged_successfully: "Costo unitario registrado correctamente." + notice_different_time_zones: "Este usuario tiene una zona horaria diferente (%{tz}). La hora se registrará utilizando su zona horaria." permission_edit_cost_entries: "Editar los costos unitarios reservados" permission_edit_own_cost_entries: "Editar los costos unitarios propios reservados" permission_edit_hourly_rates: "Editar las tasas por hora" @@ -146,3 +163,7 @@ es: week: "semana" js: text_are_you_sure: "¿Estás seguro?" + api_v3: + errors: + validation: + start_time_different_date: "La parte de fecha de startTime (%{start_time}) debe ser la misma que la fecha de spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/et.yml b/modules/costs/config/locales/crowdin/et.yml index 52b8af64e1f5..afef5638e899 100644 --- a/modules/costs/config/locales/crowdin/et.yml +++ b/modules/costs/config/locales/crowdin/et.yml @@ -33,6 +33,7 @@ et: cost_type: unit: "Ühiku nimi" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Töökulud" @@ -44,6 +45,16 @@ et: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Tunnid + comments: Comment + activity: Tegevus + spent_on: Kuupäev + start_time: Start time + end_time: Finish time models: cost_type: one: "Kulu liik" @@ -51,6 +62,8 @@ et: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ et: fixed_date: "Fikseeritud kuupäev" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Vaikimisi" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ et: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ et: label_until: "kuni" label_valid_from: "Kehtiv alates" label_yes: "Jah" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Lukustatud." notice_cost_logged_successfully: "Ühiku kulu on logitud." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ et: week: "week" js: text_are_you_sure: "Kas oled kindel?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/eu.yml b/modules/costs/config/locales/crowdin/eu.yml index 3946b8109c95..55345cb4ea5d 100644 --- a/modules/costs/config/locales/crowdin/eu.yml +++ b/modules/costs/config/locales/crowdin/eu.yml @@ -33,6 +33,7 @@ eu: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ eu: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Orduak + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ eu: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ eu: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ eu: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ eu: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ eu: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/fa.yml b/modules/costs/config/locales/crowdin/fa.yml index 47f534f18305..aae91840b946 100644 --- a/modules/costs/config/locales/crowdin/fa.yml +++ b/modules/costs/config/locales/crowdin/fa.yml @@ -33,6 +33,7 @@ fa: cost_type: unit: "نام واحد" unit_plural: "نام واحد پولی" + default: "نوع ارزش به صورت پیش فرض" work_package: costs_by_type: "واحد هزینه‌کرد" labor_costs: "هزینه های نیروی کار" @@ -44,6 +45,16 @@ fa: rate: "نرخ" user: default_rates: "ضرایب پرداختی (نرخ) پیشفرض" + time_entry: + project: پروژه + user: کاربر + work_package: بسته کاری + hours: ساعت‌‌‌‌‌‌ + comments: نظر + activity: فعالیت + spent_on: تاریخ + start_time: زمان شروع + end_time: Finish time models: cost_type: one: "نوع هزینه" @@ -51,6 +62,8 @@ fa: rate: "نرخ" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "پکیج‌کاری شماره %{id} به عنوان مقصد معتبری برای تخصیص موارد هزینه نمی‌باشد." nullify_is_not_valid_for_cost_entries: "ورودی‌های هزینه نمی‌توانند به یک پروژه اختصاص یابند." @@ -65,6 +78,7 @@ fa: fixed_date: "تاریخ ثابت" button_add_rate: "افزودن نرخ (ضریب) پرداخت" button_log_costs: "ثبت هزینه‌های واحد" + button_log_time: "Log" caption_booked_on_project: "رزرو شده در پروژه" caption_default: "پیش‌فرض" caption_default_rate_history_for: "تاریخچه ضریب (نرخ) پرداختی پیش‌فرض برای %{user}" @@ -76,6 +90,7 @@ fa: caption_save_rate: "ذخیره امتیاز" caption_set_rate: "تنظیم ضریب پرداخت (نرخ) کنونی" caption_show_locked: "نمایش انواع قفل‌شده" + caption_log_time_dialog: "پیگیری زمان" description_date_for_new_rate: "تاریخ برای شروع ضریب پرداختی (نرخ) جدید" group_by_others: "در هیچ گروهی نیست" label_between: "بین" @@ -115,10 +130,12 @@ fa: label_until: "تا" label_valid_from: "معتبر از" label_yes: "بله" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "مشکلی پیش آمد. لطفا دوباره تلاش کنید." notice_successful_restore: "بازیابی موفق" notice_successful_lock: "با موفقیت قفل شد." notice_cost_logged_successfully: "هزینه واحد با موفقیت ثبت شد." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "ویرایش هزینه‌های واحد رزرو شده" permission_edit_own_cost_entries: "ویرایش هزینه‌های واحد رزرو شده خود" permission_edit_hourly_rates: "ویرایش نرخ (ضریب پرداختی) ساعتی" @@ -146,3 +163,7 @@ fa: week: "هفته" js: text_are_you_sure: "آیا مطمئن هستید؟" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/fi.yml b/modules/costs/config/locales/crowdin/fi.yml index 377c4134a2c7..9aba53a265f5 100644 --- a/modules/costs/config/locales/crowdin/fi.yml +++ b/modules/costs/config/locales/crowdin/fi.yml @@ -33,6 +33,7 @@ fi: cost_type: unit: "Yksikön nimi" unit_plural: "Yksikön nimi monikossa" + default: "Cost type by default" work_package: costs_by_type: "Käytetyt yksiköt" labor_costs: "Työvoimakustannukset" @@ -44,6 +45,16 @@ fi: rate: "Tuntihinta" user: default_rates: "Yleinen tuntihinta" + time_entry: + project: Project + user: User + work_package: Work package + hours: Tunnit + comments: Comment + activity: Tapahtumat + spent_on: Päivämäärä + start_time: Start time + end_time: Finish time models: cost_type: one: "Kustannustyyppi" @@ -51,6 +62,8 @@ fi: rate: "Tuntihinta" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Tehtävä #%{id} ei ole kelvollinen kohde kustannuskirjauksille." nullify_is_not_valid_for_cost_entries: "Kustannuksia ei voi kohdistaa projektiin." @@ -65,6 +78,7 @@ fi: fixed_date: "Kiinteä päivämäärä" button_add_rate: "Lisää tuntihinta" button_log_costs: "Kirjaa kustannuksia" + button_log_time: "Log" caption_booked_on_project: "Kirjattu projektille" caption_default: "Oletus" caption_default_rate_history_for: "Oletushinnan historia käyttäjälle %{user}" @@ -76,6 +90,7 @@ fi: caption_save_rate: "Tallenna tuntihinta" caption_set_rate: "Aseta nykyinen tuntihinta" caption_show_locked: "Näytä lukitut tyypit" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Uuden tuntinnan päivämäärä" group_by_others: "ei missä missään ryhmässä" label_between: "välillä" @@ -115,10 +130,12 @@ fi: label_until: "saakka" label_valid_from: "Voimassa" label_yes: "Kyllä" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Jotain meni pieleen. Yritä uudelleen." notice_successful_restore: "Palautus onnistui." notice_successful_lock: "Lukittu onnistuneesti." notice_cost_logged_successfully: "Kustannus kirjattu onnistuneesti." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Kirjattujen yksikkökustannusten muokkaus" permission_edit_own_cost_entries: "Omien yksikkökustannuskirjausten muokkaus" permission_edit_hourly_rates: "Tuntihintojen muokkaus" @@ -146,3 +163,7 @@ fi: week: "viikko" js: text_are_you_sure: "Oletko varma?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/fil.yml b/modules/costs/config/locales/crowdin/fil.yml index 85070c611d8b..6c6aae7f4e00 100644 --- a/modules/costs/config/locales/crowdin/fil.yml +++ b/modules/costs/config/locales/crowdin/fil.yml @@ -33,6 +33,7 @@ fil: cost_type: unit: "Pangalan ng yunit" unit_plural: "Pinaraming pangalan ng yunit" + default: "Cost type by default" work_package: costs_by_type: "Ginugol na yunit" labor_costs: "Gastos sa Paggawa" @@ -44,6 +45,16 @@ fil: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Mga oras + comments: Comment + activity: Aktibidad + spent_on: Petsa + start_time: Start time + end_time: Finish time models: cost_type: one: "Uri ng Gastos" @@ -51,6 +62,8 @@ fil: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ fil: fixed_date: "Iksaktong Petsa" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ fil: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "sa pagitan ng" @@ -115,10 +130,12 @@ fil: label_until: "until" label_valid_from: "Valid from" label_yes: "Oo" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ fil: week: "week" js: text_are_you_sure: "Sigurado ka ba?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/fr.yml b/modules/costs/config/locales/crowdin/fr.yml index f805ac698f6e..82f7b1bd69af 100644 --- a/modules/costs/config/locales/crowdin/fr.yml +++ b/modules/costs/config/locales/crowdin/fr.yml @@ -33,6 +33,7 @@ fr: cost_type: unit: "Nom de l'unité" unit_plural: "Nom pluriel de l'unité" + default: "Type de coût par défaut" work_package: costs_by_type: "Unités consommées" labor_costs: "Coûts de main d'œuvre" @@ -44,6 +45,16 @@ fr: rate: "Tarif" user: default_rates: "Tarifs par défaut" + time_entry: + project: Projet + user: Utilisateur + work_package: Paquet de travail + hours: Heures + comments: Commentaire + activity: Activité + spent_on: date + start_time: Heure de début + end_time: Heure de fin models: cost_type: one: "Types de coût" @@ -51,6 +62,8 @@ fr: rate: "Tarif" errors: models: + time_entry: + invalid_time: "doit être entre 00:00 et 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Le lot de travaux #%{id} n'est pas une cible valide pour réaffecter les entrées de coût." nullify_is_not_valid_for_cost_entries: "Des entrées de coût ne peuvent pas être assignées à un projet." @@ -65,6 +78,7 @@ fr: fixed_date: "Date fixe" button_add_rate: "Ajouter tarif" button_log_costs: "Consigner coûts unitaires" + button_log_time: "Journal" caption_booked_on_project: "Réservé pour le projet" caption_default: "Défaut" caption_default_rate_history_for: "Historique des tarifs par défaut pour %{user}" @@ -76,6 +90,7 @@ fr: caption_save_rate: "Enregistrer tarif" caption_set_rate: "Définir le tarif actuel" caption_show_locked: "Afficher les types verrouillés" + caption_log_time_dialog: "Enregistrer le temps" description_date_for_new_rate: "Date pour le nouveau tarif" group_by_others: "dans aucun groupe" label_between: "entre" @@ -115,10 +130,12 @@ fr: label_until: "jusque" label_valid_from: "Valable à partir du" label_yes: "Oui" + placeholder_activity_select_work_package_first: La sélection d'un paquet de travail est requise en premier notice_something_wrong: "Quelque chose s'est mal passé. Veuillez réessayer." notice_successful_restore: "Restauration réussie." notice_successful_lock: "Bloqué avec succès." notice_cost_logged_successfully: "Coût unitaire enregistré avec succès." + notice_different_time_zones: "Cet utilisateur a un fuseau horaire différent (%{tz}). L'heure sera enregistrée en utilisant son fuseau horaire." permission_edit_cost_entries: "Éditer coûts unitaires réservés" permission_edit_own_cost_entries: "Éditer coûts unitaires propres réservés" permission_edit_hourly_rates: "Éditer les tarifs horaires" @@ -146,3 +163,7 @@ fr: week: "semaine" js: text_are_you_sure: "Êtes-vous sûr ?" + api_v3: + errors: + validation: + start_time_different_date: "La partie date de startTime (%{start_time}) doit être identique à la date de spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/he.yml b/modules/costs/config/locales/crowdin/he.yml index 7336b306d83b..7b8c47f8961d 100644 --- a/modules/costs/config/locales/crowdin/he.yml +++ b/modules/costs/config/locales/crowdin/he.yml @@ -33,6 +33,7 @@ he: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ he: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: שעות + comments: Comment + activity: פעילות + spent_on: תאריך + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -53,6 +64,8 @@ he: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -67,6 +80,7 @@ he: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "ברירת מחדל" caption_default_rate_history_for: "Default rate history for %{user}" @@ -78,6 +92,7 @@ he: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -117,10 +132,12 @@ he: label_until: "until" label_valid_from: "Valid from" label_yes: "כן" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -148,3 +165,7 @@ he: week: "week" js: text_are_you_sure: "האם הינך בטוח?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/hi.yml b/modules/costs/config/locales/crowdin/hi.yml index a1d4a3937593..99e765de004a 100644 --- a/modules/costs/config/locales/crowdin/hi.yml +++ b/modules/costs/config/locales/crowdin/hi.yml @@ -33,6 +33,7 @@ hi: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ hi: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: घंटे + comments: Comment + activity: गतिविधी + spent_on: तिथि + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ hi: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ hi: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ hi: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ hi: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ hi: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/hr.yml b/modules/costs/config/locales/crowdin/hr.yml index b34657abc311..82ba8e3004cf 100644 --- a/modules/costs/config/locales/crowdin/hr.yml +++ b/modules/costs/config/locales/crowdin/hr.yml @@ -33,6 +33,7 @@ hr: cost_type: unit: "Naziv jedinice" unit_plural: "Višestruki nazivi jedinica" + default: "Cost type by default" work_package: costs_by_type: "Potrošene jedinice" labor_costs: "Troškovi rada" @@ -44,6 +45,16 @@ hr: rate: "Stopa" user: default_rates: "Zadane satnice" + time_entry: + project: Project + user: User + work_package: Work package + hours: Sati + comments: Comment + activity: Aktivnost + spent_on: Datum + start_time: Start time + end_time: Finish time models: cost_type: one: "Vrsta troška" @@ -52,6 +63,8 @@ hr: rate: "Stopa" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Radni paket #%{id} nije ispravano odredište za ponovljeno dodjeljivanje ulaznih troškova." nullify_is_not_valid_for_cost_entries: "Ulazni troškovi ne mogu biti dodani projektu." @@ -66,6 +79,7 @@ hr: fixed_date: "Utvrđeni datum" button_add_rate: "Dodaj satnicu" button_log_costs: "Evidentiraj jedinice troškova" + button_log_time: "Log" caption_booked_on_project: "Na projektu" caption_default: "Zadana vrijednost" caption_default_rate_history_for: "Povijest uobičajene satnice za %{user}" @@ -77,6 +91,7 @@ hr: caption_save_rate: "Spremi stopu" caption_set_rate: "Postavite trenutnu stopu" caption_show_locked: "Pokaži zaključane tipove" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Datum za nove satnice" group_by_others: "nije u niti jednoj grupi" label_between: "između" @@ -116,10 +131,12 @@ hr: label_until: "do" label_valid_from: "Vrijedi od" label_yes: "Da" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Nešto je pošlo po zlu. Molimo pokušajte ponovno." notice_successful_restore: "Uspješno vraćanje." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Jedinični trošak uspješno zabilježen." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Uredite zabilježene jedinične troškove" permission_edit_own_cost_entries: "Uredite vlastite zabilježene jedinične troškove" permission_edit_hourly_rates: "Uredite satnice" @@ -147,3 +164,7 @@ hr: week: "tjedan" js: text_are_you_sure: "Da li ste sigurni?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/hu.yml b/modules/costs/config/locales/crowdin/hu.yml index 299922c91202..7e0d7cfafc83 100644 --- a/modules/costs/config/locales/crowdin/hu.yml +++ b/modules/costs/config/locales/crowdin/hu.yml @@ -33,6 +33,7 @@ hu: cost_type: unit: "Egység neve" unit_plural: "Többes számú egység neve" + default: "Cost type by default" work_package: costs_by_type: "Elhasznált egységek" labor_costs: "Munkaerő költségek" @@ -44,6 +45,16 @@ hu: rate: "Díj" user: default_rates: "Alapértelmezett díj" + time_entry: + project: Project + user: User + work_package: Work package + hours: órák + comments: Comment + activity: Tevékenység + spent_on: dátum + start_time: Start time + end_time: Finish time models: cost_type: one: "Költségtípus" @@ -51,6 +62,8 @@ hu: rate: "Díj" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Munkacsomag #%{id} nem érvényes cél a költség újrahozzárendeléséhez." nullify_is_not_valid_for_cost_entries: "Költségek nem hozzárendelhetőek a projekthez." @@ -65,6 +78,7 @@ hu: fixed_date: "Fix dátum" button_add_rate: "Új díj" button_log_costs: "Költségek naplózása" + button_log_time: "Log" caption_booked_on_project: "Foglalt projekt" caption_default: "Alapértelmezett" caption_default_rate_history_for: "Alapértelmezett díj történet %{user}-nek" @@ -76,6 +90,7 @@ hu: caption_save_rate: "Díj mentése" caption_set_rate: "Aktuális díj beállítása" caption_show_locked: "Zárolt nemek mutatása" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Új díj dátuma" group_by_others: "nincs egy csoportban sem" label_between: "között" @@ -115,10 +130,12 @@ hu: label_until: "-ig" label_valid_from: "Innentől érvényes" label_yes: "Igen" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Valami hiba történt. Kérlek próbáld újra." notice_successful_restore: "Sikeres visszaállítás." notice_successful_lock: "Sikeresen zárolt." notice_cost_logged_successfully: "Egységköltség sikeresen naplózva." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Könyvelt egységköltségek szerkesztése" permission_edit_own_cost_entries: "Saját könyvelt egységköltségek szerkesztése" permission_edit_hourly_rates: "Órabérek szerkesztése" @@ -146,3 +163,7 @@ hu: week: "hét" js: text_are_you_sure: "Biztos vagy benne?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/id.yml b/modules/costs/config/locales/crowdin/id.yml index 53333eaee00a..df2600120c08 100644 --- a/modules/costs/config/locales/crowdin/id.yml +++ b/modules/costs/config/locales/crowdin/id.yml @@ -33,6 +33,7 @@ id: cost_type: unit: "Nama unit" unit_plural: "Nama plural unit" + default: "Cost type by default" work_package: costs_by_type: "Unit terpakai" labor_costs: "Biaya tenaga" @@ -44,12 +45,24 @@ id: rate: "Rate" user: default_rates: "Rate standart" + time_entry: + project: Project + user: User + work_package: Work package + hours: Jam + comments: Comment + activity: Activity + spent_on: Tanggal + start_time: Start time + end_time: Finish time models: cost_type: other: "Jenis biaya" rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Reassign biaya tidak dapat dilakukan pada Work package #%{id}." nullify_is_not_valid_for_cost_entries: "Masukan biaya tidak dapat di-assign ke proyek." @@ -64,6 +77,7 @@ id: fixed_date: "Tanggal fix" button_add_rate: "Tambahkan rate" button_log_costs: "Log biaya unit" + button_log_time: "Log" caption_booked_on_project: "Telah dipesan pada proyek" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -75,6 +89,7 @@ id: caption_save_rate: "Simpan rate" caption_set_rate: "Set rate saat ini" caption_show_locked: "Tampilkan tipe yang terkunci" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Tanggal berlaku rate" group_by_others: "tidak dalam grup manapun" label_between: "antara" @@ -114,10 +129,12 @@ id: label_until: "hingga" label_valid_from: "Berlaku dari" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Terjadi suatu kesalahan. Silahkan coba lagi." notice_successful_restore: "Restore berhasil." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Ubah booked biaya unit" permission_edit_own_cost_entries: "Edit booked biaya unit sendiri" permission_edit_hourly_rates: "Edit rate per jam" @@ -145,3 +162,7 @@ id: week: "minggu" js: text_are_you_sure: "Apakah anda yakin?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/it.yml b/modules/costs/config/locales/crowdin/it.yml index 5b26448b6a1e..11029b63a801 100644 --- a/modules/costs/config/locales/crowdin/it.yml +++ b/modules/costs/config/locales/crowdin/it.yml @@ -33,6 +33,7 @@ it: cost_type: unit: "Nome dell'unità" unit_plural: "Nome unità pluralizzato" + default: "Tipo di costo predefinito" work_package: costs_by_type: "Unità spese" labor_costs: "Costi della manodopera" @@ -44,6 +45,16 @@ it: rate: "Tariffa" user: default_rates: "Tariffe di default" + time_entry: + project: Progetto + user: Utente + work_package: Macro-attività + hours: Ore + comments: Commento + activity: Attività + spent_on: Data + start_time: Ora di inizio + end_time: Ora di fine models: cost_type: one: "Tipo di costo" @@ -51,6 +62,8 @@ it: rate: "Tariffa" errors: models: + time_entry: + invalid_time: "deve essere compresa tra le 00:00 e le 23:59." work_package: is_not_a_valid_target_for_cost_entries: "La macro-attività (work package) #%{id} non è una destinazione valida per riassegnare le entrate del costo." nullify_is_not_valid_for_cost_entries: "Voci di costo non possono essere assegnate a un progetto." @@ -65,6 +78,7 @@ it: fixed_date: "Data fissa" button_add_rate: "Aggiungi tariffa" button_log_costs: "Registra unità di costo" + button_log_time: "Registra" caption_booked_on_project: "Prenotato su progetto" caption_default: "Predefinito" caption_default_rate_history_for: "Cronologia tariffe predefinite per %{user}" @@ -76,6 +90,7 @@ it: caption_save_rate: "Salva tariffa" caption_set_rate: "Impostata tariffa corrente" caption_show_locked: "Mostra tipi bloccati" + caption_log_time_dialog: "Registra tempo" description_date_for_new_rate: "Data per la nuova tariffa" group_by_others: "non in qualsiasi gruppo" label_between: "tra" @@ -115,10 +130,12 @@ it: label_until: "finché" label_valid_from: "Valido dal" label_yes: "Si" + placeholder_activity_select_work_package_first: Prima è necessario selezionare la macro-attività notice_something_wrong: "Qualcosa è andato storto. Si prega di riprovare." notice_successful_restore: "Ripristino eseguito con successo." notice_successful_lock: "Bloccato con successo." notice_cost_logged_successfully: "Costo unitario registrato con successo." + notice_different_time_zones: "Questo utente ha un fuso orario diverso (%{tz}). L'ora verrà registrata utilizzando il suo fuso orario." permission_edit_cost_entries: "Modifica unità di costo riservate" permission_edit_own_cost_entries: "Modifica le proprie unità di costo riservate" permission_edit_hourly_rates: "Modifica tariffe orarie" @@ -146,3 +163,7 @@ it: week: "settimana" js: text_are_you_sure: "Sei sicuro/a?" + api_v3: + errors: + validation: + start_time_different_date: "La parte data di startTime (%{start_time}) deve essere uguale alla data di spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/ja.yml b/modules/costs/config/locales/crowdin/ja.yml index f86bf161ca8b..80ab404ce48b 100644 --- a/modules/costs/config/locales/crowdin/ja.yml +++ b/modules/costs/config/locales/crowdin/ja.yml @@ -33,6 +33,7 @@ ja: cost_type: unit: "単位名" unit_plural: "単位名" + default: "デフォルトのコストタイプ" work_package: costs_by_type: "使用済単価" labor_costs: "作業員コスト" @@ -44,12 +45,24 @@ ja: rate: "原価率" user: default_rates: "デフォルト原価率" + time_entry: + project: プロジェクト + user: ユーザー + work_package: ワークパッケージ + hours: ' 時間' + comments: コメント + activity: 活動 + spent_on: 日付 + start_time: 開始時間 + end_time: 終了時間 models: cost_type: other: "コスト種類" rate: "原価率" errors: models: + time_entry: + invalid_time: "00:00 から 23:59 の間で設定してください。" work_package: is_not_a_valid_target_for_cost_entries: "コストを再割り当てるには、作業項目#%{id}は対象外である。" nullify_is_not_valid_for_cost_entries: "コストエントリをプロジェクトに割り当てることはできません。" @@ -64,6 +77,7 @@ ja: fixed_date: "固定日付" button_add_rate: "原価率を追加" button_log_costs: "単価を記録" + button_log_time: "ログ" caption_booked_on_project: "プロジェクトの予約" caption_default: "デフォルト" caption_default_rate_history_for: "%{user} のデフォルト率の履歴" @@ -75,6 +89,7 @@ ja: caption_save_rate: "進捗の保存" caption_set_rate: "現在の進捗を設定する" caption_show_locked: "ロックの種類を表示します。" + caption_log_time_dialog: "時間を記録" description_date_for_new_rate: "新しいレートの日付" group_by_others: "どのグループにもない" label_between: "次の範囲内" @@ -114,10 +129,12 @@ ja: label_until: "まで" label_valid_from: "から有効" label_yes: "はい" + placeholder_activity_select_work_package_first: まずワークパッケージを選択してください。 notice_something_wrong: "エラーが発生しました。再試行してください。" notice_successful_restore: "復元処理が成功します。" notice_successful_lock: "ロックに成功しました。" notice_cost_logged_successfully: "単価が正常に記録されました。" + notice_different_time_zones: "このユーザーは異なるタイムゾーン(%{tz})を使用しています。時間は異なるタイムゾーンで記録されます。" permission_edit_cost_entries: "予約単価の編集" permission_edit_own_cost_entries: "自分が予約した単価の編集" permission_edit_hourly_rates: "時給の編集" @@ -145,3 +162,7 @@ ja: week: "週間" js: text_are_you_sure: "よろしいですか？" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ka.yml b/modules/costs/config/locales/crowdin/ka.yml index ba345258b083..9c76fa1c2823 100644 --- a/modules/costs/config/locales/crowdin/ka.yml +++ b/modules/costs/config/locales/crowdin/ka.yml @@ -33,6 +33,7 @@ ka: cost_type: unit: "ერთეულის სახელი" unit_plural: "ერთეულის სახელი მრავლობითში" + default: "Cost type by default" work_package: costs_by_type: "დახარჯული ერთეული" labor_costs: "მუშაობის ფასი" @@ -44,6 +45,16 @@ ka: rate: "სიხშირე" user: default_rates: "ნაგულისხმევი სიხშირეები" + time_entry: + project: Project + user: User + work_package: Work package + hours: საათი + comments: Comment + activity: აქტივობა + spent_on: თარიღი + start_time: Start time + end_time: Finish time models: cost_type: one: "ღირებულების ტიპი" @@ -51,6 +62,8 @@ ka: rate: "სიხშირე" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "ღირებულების ჩანაწერებს პროექტს ვერ მიანიჭებთ." @@ -65,6 +78,7 @@ ka: fixed_date: "ფიქსირებული თარიღი" button_add_rate: "სიხშირის დამატება" button_log_costs: "ერთეულის ფასის ჟურნალი" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "ნაგულისხმევი" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ ka: caption_save_rate: "ტარიფის შენახვა" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "მითითებულ დროის შუალედში" @@ -115,10 +130,12 @@ ka: label_until: "დასასრულის დრო" label_valid_from: "Ძალაშია" label_yes: "დიახ" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "მოხდა შეცდომა. სცადეთ თავიდან." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ ka: week: "კვირა" js: text_are_you_sure: "დარწმუნებული ბრძანდებით?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/kk.yml b/modules/costs/config/locales/crowdin/kk.yml index 19fc6a7da4d9..94d810b153df 100644 --- a/modules/costs/config/locales/crowdin/kk.yml +++ b/modules/costs/config/locales/crowdin/kk.yml @@ -33,6 +33,7 @@ kk: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ kk: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ kk: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ kk: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ kk: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ kk: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ kk: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ko.yml b/modules/costs/config/locales/crowdin/ko.yml index a846541bb856..3efcdb254325 100644 --- a/modules/costs/config/locales/crowdin/ko.yml +++ b/modules/costs/config/locales/crowdin/ko.yml @@ -33,6 +33,7 @@ ko: cost_type: unit: "단위 이름" unit_plural: "복수형 단위 이름" + default: "기본 비용 유형" work_package: costs_by_type: "소비 단위" labor_costs: "노동 비용" @@ -44,12 +45,24 @@ ko: rate: "요금" user: default_rates: "기본 요금" + time_entry: + project: 프로젝트 + user: 사용자 + work_package: 작업 패키지 + hours: 시간 + comments: 코멘트 + activity: 활동 + spent_on: 날짜 + start_time: 시작 시간 + end_time: 완료 시간 models: cost_type: other: "비용 유형" rate: "요금" errors: models: + time_entry: + invalid_time: "- 00:00에서 23:59 사이여야 합니다." work_package: is_not_a_valid_target_for_cost_entries: "작업 패키지 #%{id}은(는) 비용 항목 재할당에 올바른 대상이 아닙니다." nullify_is_not_valid_for_cost_entries: "비용 항목은 프로젝트에 할당할 수 없습니다." @@ -64,6 +77,7 @@ ko: fixed_date: "고정 날짜" button_add_rate: "요금 추가" button_log_costs: "단위 비용 기록" + button_log_time: "기록" caption_booked_on_project: "프로젝트에서 예약됨" caption_default: "기본값" caption_default_rate_history_for: "%{user}에 대한 기본 요금 기록" @@ -75,6 +89,7 @@ ko: caption_save_rate: "요금 저장" caption_set_rate: "현재 요금 설정" caption_show_locked: "잠긴 유형 표시" + caption_log_time_dialog: "시간 기록" description_date_for_new_rate: "새로운 요금의 날짜" group_by_others: "어떤 그룹에도 없음" label_between: "사이에" @@ -114,10 +129,12 @@ ko: label_until: "다음까지:" label_valid_from: "다음부터 유효함" label_yes: "예" + placeholder_activity_select_work_package_first: 먼저 작업 패키지 선택이 필요합니다 notice_something_wrong: "문제가 발생했습니다. 다시 시도해 주세요." notice_successful_restore: "성공적으로 복원되었습니다." notice_successful_lock: "잠겼습니다." notice_cost_logged_successfully: "단위 비용이 기록되었습니다." + notice_different_time_zones: "이 사용자의 표준 시간대(%{tz})가 다릅니다. 시간은 해당 표준 시간대를 사용하여 기록됩니다." permission_edit_cost_entries: "예약된 단위 비용 편집" permission_edit_own_cost_entries: "고유한 예약된 단위 비용 편집" permission_edit_hourly_rates: "시간당 요금 편집" @@ -145,3 +162,7 @@ ko: week: "주" js: text_are_you_sure: "계속하시겠습니까?" + api_v3: + errors: + validation: + start_time_different_date: "startTime(%{start_time})의 날짜 부분은 spentOn(%{spent_on}) 날짜와 동일해야 합니다." diff --git a/modules/costs/config/locales/crowdin/lt.yml b/modules/costs/config/locales/crowdin/lt.yml index 69519573428a..2d0f1b85b39d 100644 --- a/modules/costs/config/locales/crowdin/lt.yml +++ b/modules/costs/config/locales/crowdin/lt.yml @@ -33,6 +33,7 @@ lt: cost_type: unit: "Vieneto pavadinimas" unit_plural: "Daugiaskaitinis vienetų pavadinimas" + default: "Cost type by default" work_package: costs_by_type: "Panaudota vienetų" labor_costs: "Darbų kaštai" @@ -44,6 +45,16 @@ lt: rate: "Koeficientas" user: default_rates: "Numatytasis koeficientas" + time_entry: + project: Project + user: User + work_package: Work package + hours: Valandų + comments: Comment + activity: Veikla + spent_on: Data + start_time: Start time + end_time: Finish time models: cost_type: one: "Kaštų tipas" @@ -53,6 +64,8 @@ lt: rate: "Koeficientas" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Darbų paketas #%{id} nėra tinkamas kaštų perskirstymo pasirinkimas." nullify_is_not_valid_for_cost_entries: "Kaštų įrašai negali būti priskirti šiam projektui." @@ -67,6 +80,7 @@ lt: fixed_date: "Fiksuota data" button_add_rate: "Pridėti koeficientą" button_log_costs: "Vesti į žurnalą vieneto kaštus" + button_log_time: "Log" caption_booked_on_project: "Įrašytas projektui" caption_default: "Numatytasis" caption_default_rate_history_for: "%{user} numatytojo koeficiento istorija" @@ -78,6 +92,7 @@ lt: caption_save_rate: "Išsaugoti koeficientą" caption_set_rate: "Nustatyti esamą koeficientą" caption_show_locked: "Rodyti užrakintus tipus" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Naujo koeficiento data" group_by_others: "nėra jokioje grupėje" label_between: "tarp" @@ -117,10 +132,12 @@ lt: label_until: "iki" label_valid_from: "Galioja nuo" label_yes: "Taip" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Įvyko klaida. Bandykite dar kartą." notice_successful_restore: "Sėkmingas atkūrimas." notice_successful_lock: "Sėkmingai užrakinta." notice_cost_logged_successfully: "Vieneto kaštai į žurnalą įrašyti sėkmingai." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Redaguoti įrašytų vienetų kaštus" permission_edit_own_cost_entries: "Redaguoti paties įrašytų vienetų kaštus" permission_edit_hourly_rates: "Redaguoti valandinius koeficientus" @@ -148,3 +165,7 @@ lt: week: "savaitė" js: text_are_you_sure: "Ar esate įsitikinę?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/lv.yml b/modules/costs/config/locales/crowdin/lv.yml index dc31a556a99a..cf62b7e2491b 100644 --- a/modules/costs/config/locales/crowdin/lv.yml +++ b/modules/costs/config/locales/crowdin/lv.yml @@ -33,6 +33,7 @@ lv: cost_type: unit: "Vienības nosaukums" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Izlietotās vienības" labor_costs: "Darba izmaksas" @@ -44,6 +45,16 @@ lv: rate: "Likme" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Stundas + comments: Comment + activity: Aktivitāte + spent_on: Datums + start_time: Start time + end_time: Finish time models: cost_type: zero: "Izmaksu veids" @@ -52,6 +63,8 @@ lv: rate: "Likme" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "" @@ -66,6 +79,7 @@ lv: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Uzskaitīt vienības izmaksas" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -77,6 +91,7 @@ lv: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -116,10 +131,12 @@ lv: label_until: "līdz" label_valid_from: "Derīgs no" label_yes: "Jā" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Kļūda. Mēģiniet vēlreiz." notice_successful_restore: "Veiksmīga atjaunošana." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Sekmīgi reģistrētas vienības izmaksas." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -147,3 +164,7 @@ lv: week: "nedēļa" js: text_are_you_sure: "Vai esat pārliecināts?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/mn.yml b/modules/costs/config/locales/crowdin/mn.yml index 27987d1429c0..fad09372cc74 100644 --- a/modules/costs/config/locales/crowdin/mn.yml +++ b/modules/costs/config/locales/crowdin/mn.yml @@ -33,6 +33,7 @@ mn: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ mn: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ mn: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ mn: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ mn: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ mn: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ mn: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ms.yml b/modules/costs/config/locales/crowdin/ms.yml index c7abc39db861..dc2575e77c91 100644 --- a/modules/costs/config/locales/crowdin/ms.yml +++ b/modules/costs/config/locales/crowdin/ms.yml @@ -33,6 +33,7 @@ ms: cost_type: unit: "Nama unit" unit_plural: "Nama majmuk unit" + default: "Jenis kos secara lalai" work_package: costs_by_type: "Unit yang telah dibelanjakan" labor_costs: "Kos buruh" @@ -44,12 +45,24 @@ ms: rate: "Kadar" user: default_rates: "Kadar default" + time_entry: + project: Project + user: User + work_package: Work package + hours: Jam + comments: Comment + activity: Aktiviti + spent_on: Tarikh + start_time: Start time + end_time: Finish time models: cost_type: other: "Jenis kos" rate: "Kadar" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Pakej kerja #%{id} bukan sasaran yang sah untuk penukaran kos entri." nullify_is_not_valid_for_cost_entries: "Kos entri tidak dapat ditugaskan ke sebuah projek." @@ -64,6 +77,7 @@ ms: fixed_date: "Tarikh tetap" button_add_rate: "Tambah kadar" button_log_costs: "Log kos unit" + button_log_time: "Log" caption_booked_on_project: "Ditempah pada projek" caption_default: "Default" caption_default_rate_history_for: "Sejarah kadar default untuk %{user}" @@ -75,6 +89,7 @@ ms: caption_save_rate: "Simpan kadar" caption_set_rate: "Tetapkan kadar semasa" caption_show_locked: "Papar jenis terkunci" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Tarikh untuk kadar baru" group_by_others: "tiada dalam mana-mana kumpulan" label_between: "antara" @@ -114,10 +129,12 @@ ms: label_until: "sehingga" label_valid_from: "Sah dari" label_yes: "Ya" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Ada ralat berlaku. Sila cuba lagi." notice_successful_restore: "Pemulihan berjaya." notice_successful_lock: "Berjaya dikunci." notice_cost_logged_successfully: "Unit kos berjaya dilog." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit kos unit yang ditempah" permission_edit_own_cost_entries: "Edit kos unit yang ditempah sendiri" permission_edit_hourly_rates: "Edit kadar jam" @@ -145,3 +162,7 @@ ms: week: "minggu" js: text_are_you_sure: "Adakah anda pasti?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ne.yml b/modules/costs/config/locales/crowdin/ne.yml index dee5a682d593..0d2d9e9855f3 100644 --- a/modules/costs/config/locales/crowdin/ne.yml +++ b/modules/costs/config/locales/crowdin/ne.yml @@ -33,6 +33,7 @@ ne: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ ne: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ ne: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ ne: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ ne: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ ne: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ ne: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/nl.yml b/modules/costs/config/locales/crowdin/nl.yml index 505efed26764..f7674150ec07 100644 --- a/modules/costs/config/locales/crowdin/nl.yml +++ b/modules/costs/config/locales/crowdin/nl.yml @@ -33,6 +33,7 @@ nl: cost_type: unit: "Naam eenheid" unit_plural: "Vermeerderde eenheid naam" + default: "Kostensoort als standaard" work_package: costs_by_type: "Eenheden uitgegeven" labor_costs: "Arbeidskosten" @@ -44,6 +45,16 @@ nl: rate: "Tarief" user: default_rates: "Standaard tarieven" + time_entry: + project: Project + user: Gebruiker + work_package: Werkpakket + hours: Uren + comments: Commentaar + activity: Activiteit + spent_on: Datum + start_time: Starttijd + end_time: Eindtijd models: cost_type: one: "Soort kosten" @@ -51,6 +62,8 @@ nl: rate: "Tarief" errors: models: + time_entry: + invalid_time: "moet tussen 00:00 en 23:59 liggen." work_package: is_not_a_valid_target_for_cost_entries: "Werkpakket #%{id} is geen geldig doel voor het opnieuw toewijzen van de kostenposten." nullify_is_not_valid_for_cost_entries: "Kostenposten kunnen niet worden toegewezen aan een project." @@ -65,6 +78,7 @@ nl: fixed_date: "Vaste datum" button_add_rate: "Tarief toevoegen" button_log_costs: "Registreer kost per eenheid" + button_log_time: "Registreer" caption_booked_on_project: "Gereserveerd op project" caption_default: "Standaard" caption_default_rate_history_for: "Standaard tarief geschiedenis voor %{user}" @@ -76,6 +90,7 @@ nl: caption_save_rate: "Tarief opslaan" caption_set_rate: "Stel huidige tarief in" caption_show_locked: "Toon vergrendelde types" + caption_log_time_dialog: "Registreer tijd" description_date_for_new_rate: "Datum voor nieuw tarief" group_by_others: "niet in een groep" label_between: "tussen" @@ -115,10 +130,12 @@ nl: label_until: "tot" label_valid_from: "Geldig vanaf" label_yes: "Ja" + placeholder_activity_select_work_package_first: Eerst moet u een werkpakket selecteren notice_something_wrong: "Er is iets fout gegaan. Probeer het opnieuw." notice_successful_restore: "Herstel geslaagd." notice_successful_lock: "Vergrendeld met succes." notice_cost_logged_successfully: "Kosten eenheid succesvol geregistreerd." + notice_different_time_zones: "Deze gebruiker heeft een andere tijdzone (%{tz}). De tijd wordt geregistreerd met hun tijdzone." permission_edit_cost_entries: "Geboekte kosten per eenheid bewerken" permission_edit_own_cost_entries: "Eigen geboekte kosten per eenheid bewerken" permission_edit_hourly_rates: "Bewerk uurtarieven" @@ -146,3 +163,7 @@ nl: week: "week" js: text_are_you_sure: "Weet u het zeker?" + api_v3: + errors: + validation: + start_time_different_date: "Het datumgedeelte van start tijd (%{start_time}) moet hetzelfde zijn als de uitgegeven op (%{spent_on}) datum." diff --git a/modules/costs/config/locales/crowdin/no.yml b/modules/costs/config/locales/crowdin/no.yml index fe530123aca6..bbc50eaf4614 100644 --- a/modules/costs/config/locales/crowdin/no.yml +++ b/modules/costs/config/locales/crowdin/no.yml @@ -33,6 +33,7 @@ cost_type: unit: "Enhetsnavn" unit_plural: "Flertallsnavn på enhet" + default: "Cost type by default" work_package: costs_by_type: "Brukte enheter" labor_costs: "Arbeidskostnad" @@ -44,6 +45,16 @@ rate: "Sats" user: default_rates: "Standard satser" + time_entry: + project: Project + user: User + work_package: Work package + hours: Timer + comments: Comment + activity: Aktivitet + spent_on: Dato + start_time: Start time + end_time: Finish time models: cost_type: one: "Kostnadstype" @@ -51,6 +62,8 @@ rate: "Sats" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Arbeidspakke #%{id} er ikke et gyldig mål for nytildeling av kostnadsoppføringer." nullify_is_not_valid_for_cost_entries: "Kostnadsoppføringer kan ikke tilordnes et prosjekt." @@ -65,6 +78,7 @@ fixed_date: "Fast dato" button_add_rate: "Legg til sats" button_log_costs: "Loggfør enhetskostnader" + button_log_time: "Log" caption_booked_on_project: "Bestilt i prosjektet" caption_default: "Standard" caption_default_rate_history_for: "Standardratehistorikk for %{user}" @@ -76,6 +90,7 @@ caption_save_rate: "Lagre sats" caption_set_rate: "Angi gjeldende sats" caption_show_locked: "Vis låste typer" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Dato for ny sats" group_by_others: "ikke i noen grupper" label_between: "mellom" @@ -115,10 +130,12 @@ label_until: "fram til" label_valid_from: "Gyldig fra" label_yes: "Ja" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Noe gikk galt. Prøv på nytt." notice_successful_restore: "Vellykket gjenoppretting." notice_successful_lock: "Låst vellykket." notice_cost_logged_successfully: "Enhetskostnaden er logget." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Rediger bokførte enhetskostnader" permission_edit_own_cost_entries: "Rediger egne bokførte enhetskostnader" permission_edit_hourly_rates: "Rediger timesatser" @@ -146,3 +163,7 @@ week: "uke" js: text_are_you_sure: "Er du sikker?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/pl.yml b/modules/costs/config/locales/crowdin/pl.yml index bbbc6aba7ac0..40eab7725ca0 100644 --- a/modules/costs/config/locales/crowdin/pl.yml +++ b/modules/costs/config/locales/crowdin/pl.yml @@ -33,6 +33,7 @@ pl: cost_type: unit: "Nazwa jednostki" unit_plural: "Liczba mnoga jednostki" + default: "Domyślny typ kosztu" work_package: costs_by_type: "Zużyte jednostki" labor_costs: "Koszty pracy" @@ -44,6 +45,16 @@ pl: rate: "Stawka" user: default_rates: "Domyślna stawka" + time_entry: + project: Projekt + user: Użytkownik + work_package: Pakiet roboczy + hours: Godziny + comments: Komentarz + activity: Działanie + spent_on: Data + start_time: Czas rozpoczęcia + end_time: Czas zakończenia models: cost_type: one: "Jednostki" @@ -53,6 +64,8 @@ pl: rate: "Stawka" errors: models: + time_entry: + invalid_time: "musi zawierać się między 00:00 a 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Zestaw zadań #%{id} nie jest poprawnym celem do ponownego rozpisania kosztów." nullify_is_not_valid_for_cost_entries: "Pozycje kosztów nie mogą być przypisane do projektu." @@ -67,6 +80,7 @@ pl: fixed_date: "Przypisana data" button_add_rate: "Dodaj stawkę" button_log_costs: "Rejestruj koszty jednostkowe" + button_log_time: "Dziennik" caption_booked_on_project: "Zarezerwowano na projekt" caption_default: "Domyślny" caption_default_rate_history_for: "Domyślna stawka historii dla %{user}" @@ -78,6 +92,7 @@ pl: caption_save_rate: "Zapisz stawkę" caption_set_rate: "Ustaw domyślną stawkę" caption_show_locked: "Pokaż zamknięte typy kosztów" + caption_log_time_dialog: "Czas wykonania wpisu" description_date_for_new_rate: "Data nowej stawki" group_by_others: "nie w każdej grupie" label_between: "pomiędzy" @@ -117,10 +132,12 @@ pl: label_until: "do" label_valid_from: "Ważny od" label_yes: "Tak" + placeholder_activity_select_work_package_first: W pierwszej kolejności wymagany jest wybór pakietu roboczego notice_something_wrong: "Coś poszło nie tak. Proszę spróbuj ponownie." notice_successful_restore: "Przywracanie się powiodło." notice_successful_lock: "Zablokowano." notice_cost_logged_successfully: "Koszt jednostkowy zarejestrowano pomyślnie." + notice_different_time_zones: "Ten użytkownik ma inną strefę czasową (%{tz}). Godzina będzie rejestrowana przy użyciu tej strefy czasowej." permission_edit_cost_entries: "Edytuj zapisane koszty jednostkowe" permission_edit_own_cost_entries: "Edytuj zarejestrowane własne koszty jednostkowe" permission_edit_hourly_rates: "Edycja stawek godzinowych" @@ -148,3 +165,7 @@ pl: week: "tydzień" js: text_are_you_sure: "Jesteś pewny?" + api_v3: + errors: + validation: + start_time_different_date: "Część daty startTime (%{start_time}) musi być taka sama jak data spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/pt-BR.yml b/modules/costs/config/locales/crowdin/pt-BR.yml index 9667fbec777a..45e33b39bd4e 100644 --- a/modules/costs/config/locales/crowdin/pt-BR.yml +++ b/modules/costs/config/locales/crowdin/pt-BR.yml @@ -33,6 +33,7 @@ pt-BR: cost_type: unit: "Nome da unidade" unit_plural: "Plural do nome da unidade" + default: "Tipo de custo por padrão" work_package: costs_by_type: "Unidades gastas" labor_costs: "Custos de trabalho" @@ -44,6 +45,16 @@ pt-BR: rate: "Taxa" user: default_rates: "Taxas padrão" + time_entry: + project: Projeto + user: Usuário + work_package: Pacote de trabalho + hours: horas + comments: Comentário + activity: Atividade + spent_on: Data + start_time: Hora de início + end_time: Hora Final models: cost_type: one: "Tipo de custo" @@ -51,6 +62,8 @@ pt-BR: rate: "Taxa" errors: models: + time_entry: + invalid_time: "deve estar entre 00:00 e 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Pacote de trabalho #%{id} não é válido para reatribuir as entradas de custo." nullify_is_not_valid_for_cost_entries: "Custos dos insumos não podem ser atribuídos a um projeto." @@ -65,6 +78,7 @@ pt-BR: fixed_date: "Data fixa" button_add_rate: "Adicionar taxa" button_log_costs: "Registrar custos unitários" + button_log_time: "Registro" caption_booked_on_project: "Reservado para o projeto" caption_default: "Padrão" caption_default_rate_history_for: "Taxa histórica padrão para %{user}" @@ -76,6 +90,7 @@ pt-BR: caption_save_rate: "Salvar taxa" caption_set_rate: "Fixar taxa atual" caption_show_locked: "Mostrar tipos bloqueados" + caption_log_time_dialog: "Horário do registro" description_date_for_new_rate: "Data para nova taxa" group_by_others: "Não em qualquer grupo" label_between: "entre" @@ -115,10 +130,12 @@ pt-BR: label_until: "até" label_valid_from: "Válido a partir de" label_yes: "Sim" + placeholder_activity_select_work_package_first: Primeiro é necessária a seleção do pacote de trabalho notice_something_wrong: "Algo deu errado. Por favor, tente novamente." notice_successful_restore: "Restauração bem-sucedida." notice_successful_lock: "Bloqueado com sucesso." notice_cost_logged_successfully: "Custo unitário registrado com sucesso." + notice_different_time_zones: "Este usuário tem um fuso horário diferente (%{tz}). A hora será registrada usando o fuso horário dele." permission_edit_cost_entries: "Editar custos unitários reservados" permission_edit_own_cost_entries: "Editar custos unitários próprios reservados" permission_edit_hourly_rates: "Editar taxas horárias" @@ -146,3 +163,7 @@ pt-BR: week: "semana" js: text_are_you_sure: "Você tem certeza?" + api_v3: + errors: + validation: + start_time_different_date: "A data de início (%{start_time}) deve ser a mesma da data de registro (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/pt-PT.yml b/modules/costs/config/locales/crowdin/pt-PT.yml index 452739465ddc..86737d40d7f5 100644 --- a/modules/costs/config/locales/crowdin/pt-PT.yml +++ b/modules/costs/config/locales/crowdin/pt-PT.yml @@ -33,6 +33,7 @@ pt-PT: cost_type: unit: "Nome da Unidade" unit_plural: "Nome da unidade no plural" + default: "Tipo de custo por padrão" work_package: costs_by_type: "Unidades gastas" labor_costs: "Custos de trabalho" @@ -44,6 +45,16 @@ pt-PT: rate: "Taxa" user: default_rates: "Taxas padrão" + time_entry: + project: Projeto + user: Utilizador + work_package: Pacote de trabalho + hours: Horas + comments: Comentário + activity: Atividade + spent_on: Data + start_time: Hora de início + end_time: Hora de fim models: cost_type: one: "Tipo de custo" @@ -51,6 +62,8 @@ pt-PT: rate: "Taxa" errors: models: + time_entry: + invalid_time: "tem de ser entre as 00:00 e as 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Pacote de trabalho #%{id} não é um destino válido para reatribuir os registos de custo." nullify_is_not_valid_for_cost_entries: "Entradas de custo não podem ser atribuídas a um projeto." @@ -65,6 +78,7 @@ pt-PT: fixed_date: "Data fixa" button_add_rate: "Adicionar Taxa" button_log_costs: "Registar custos unitários" + button_log_time: "Registo" caption_booked_on_project: "Marcado no projeto" caption_default: "Predefinido" caption_default_rate_history_for: "História de taxa padrão para %{user}" @@ -76,6 +90,7 @@ pt-PT: caption_save_rate: "Salvar Taxa" caption_set_rate: "Definir taxa atual" caption_show_locked: "Mostrar tipos bloqueados" + caption_log_time_dialog: "Registo de tempo" description_date_for_new_rate: "Data para nova taxa" group_by_others: "em nenhum grupo" label_between: "entre" @@ -115,10 +130,12 @@ pt-PT: label_until: "até" label_valid_from: "Válido desde" label_yes: "Sim" + placeholder_activity_select_work_package_first: A seleção do pacote de trabalho é necessária em primeiro lugar notice_something_wrong: "Ocorreu um erro. Por favor, tente novamente." notice_successful_restore: "Restauração bem-sucedida." notice_successful_lock: "Bloqueado com êxito." notice_cost_logged_successfully: "Custo unitário registado com êxito." + notice_different_time_zones: "Este utilizador tem um fuso horário diferente (%{tz}). A hora será registada utilizando o fuso horário do mesmo." permission_edit_cost_entries: "Editar custos unitários marcados" permission_edit_own_cost_entries: "Editar custos unitários próprios marcados" permission_edit_hourly_rates: "Editar taxas horárias" @@ -146,3 +163,7 @@ pt-PT: week: "semana" js: text_are_you_sure: "Tem a certeza?" + api_v3: + errors: + validation: + start_time_different_date: "A parte da data de startTime (%{start_time}) tem de ser a mesma que a data de spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/ro.yml b/modules/costs/config/locales/crowdin/ro.yml index d4f6711fe8c5..b21ec7b1ee69 100644 --- a/modules/costs/config/locales/crowdin/ro.yml +++ b/modules/costs/config/locales/crowdin/ro.yml @@ -33,6 +33,7 @@ ro: cost_type: unit: "Denumirea unității" unit_plural: "Numele unității pluralizate" + default: "Cost type by default" work_package: costs_by_type: "Unități consumate" labor_costs: "Costurile cu forța de muncă" @@ -44,6 +45,16 @@ ro: rate: "Tarif" user: default_rates: "Tarife" + time_entry: + project: Project + user: User + work_package: Work package + hours: Ore + comments: Comment + activity: Activitate + spent_on: Dată + start_time: Start time + end_time: Finish time models: cost_type: one: "Tipul de cost" @@ -52,6 +63,8 @@ ro: rate: "Evaluează" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Pachetul de lucru #%{id} nu este o ţintă validă pentru reasocierea timpilor de lucru." nullify_is_not_valid_for_cost_entries: "Înregistrările de costuri nu pot fi atribuite unui proiect." @@ -66,6 +79,7 @@ ro: fixed_date: "Dată fixă" button_add_rate: "Adaugă preț" button_log_costs: "Costurile unitare ale buștenilor" + button_log_time: "Log" caption_booked_on_project: "Rezervat pe proiect" caption_default: "Implicit" caption_default_rate_history_for: "Istoricul ratei de neplată pentru %{user}" @@ -77,6 +91,7 @@ ro: caption_save_rate: "Salvează tarif" caption_set_rate: "Setează tarif curent" caption_show_locked: "Afișați tipurile blocate" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Dată pentru noul tarif" group_by_others: "nici într-un grup" label_between: "între" @@ -116,10 +131,12 @@ ro: label_until: "până la" label_valid_from: "Valabil de la" label_yes: "Da" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Ceva n-a mers bine. Vă rugăm să încercați din nou." notice_successful_restore: "Restaurare reușită." notice_successful_lock: "Blocat cu succes." notice_cost_logged_successfully: "Costul unitar a fost înregistrat cu succes." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Editarea costurilor unitare înregistrate" permission_edit_own_cost_entries: "Editați propriile costuri unitare contabilizate" permission_edit_hourly_rates: "Editați tarifele orare" @@ -147,3 +164,7 @@ ro: week: "săptămână" js: text_are_you_sure: "Ești sigur?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/ru.yml b/modules/costs/config/locales/crowdin/ru.yml index 0978d24827af..1d577b913050 100644 --- a/modules/costs/config/locales/crowdin/ru.yml +++ b/modules/costs/config/locales/crowdin/ru.yml @@ -33,6 +33,7 @@ ru: cost_type: unit: "Наименование количественного показателя" unit_plural: "Множественное наименование количественного показателя" + default: "Тип затрат по умолчанию" work_package: costs_by_type: "Затраченное количество" labor_costs: "Трудовые расходы" @@ -44,6 +45,16 @@ ru: rate: "Тариф" user: default_rates: "Тариф по умолчанию" + time_entry: + project: Проект + user: Пользователь + work_package: Пакет работ + hours: Часы + comments: Комментарий + activity: Деятельность + spent_on: Дата + start_time: Время начала + end_time: Время окончания models: cost_type: one: "Тип затрат" @@ -53,6 +64,8 @@ ru: rate: "Ставка" errors: models: + time_entry: + invalid_time: "должно быть между 00:00 и 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Пакет работ #%{id} не является допустимым объектом для назначения стимостей." nullify_is_not_valid_for_cost_entries: "Записи о стоимостях не могут быть присвоены проекту." @@ -67,6 +80,7 @@ ru: fixed_date: "Дата исправления" button_add_rate: "Добавить тариф" button_log_costs: "Журналировать расходы на единицу" + button_log_time: "Журнал" caption_booked_on_project: "Заказано на проект" caption_default: "По умолчанию" caption_default_rate_history_for: "История тарифов по умолчанию для %{user}" @@ -78,6 +92,7 @@ ru: caption_save_rate: "Сохранить тариф" caption_set_rate: "Установить текущий тариф" caption_show_locked: "Показывать Заблокированные типы" + caption_log_time_dialog: "Журналировать время" description_date_for_new_rate: "Дата для нового тарифа" group_by_others: "не в какой-либо группе" label_between: "между" @@ -117,10 +132,12 @@ ru: label_until: "До" label_valid_from: "Действует с" label_yes: "Да" + placeholder_activity_select_work_package_first: Сначала необходимо выбрать пакет работ notice_something_wrong: "Произошла ошибка. Пожалуйста, попробуйте снова." notice_successful_restore: "Успешное восстановление." notice_successful_lock: "Успешно заблокировано." notice_cost_logged_successfully: "Стоимость единицы успешно зажурналировано " + notice_different_time_zones: "У этого пользователя другой часовой пояс (%{tz}). Время будет журналироваться с учетом его часового пояса." permission_edit_cost_entries: "Править зарегестрированные количественные затраты" permission_edit_own_cost_entries: "Править собственные зарегистрированные количественные затраты" permission_edit_hourly_rates: "Править почасовые тарифы" @@ -148,3 +165,7 @@ ru: week: "неделя" js: text_are_you_sure: "Уверены?" + api_v3: + errors: + validation: + start_time_different_date: "Дата startTime (%{start_time}) должна быть такой же, как дата spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/rw.yml b/modules/costs/config/locales/crowdin/rw.yml index f82dbbc274e9..5bea8d61c67b 100644 --- a/modules/costs/config/locales/crowdin/rw.yml +++ b/modules/costs/config/locales/crowdin/rw.yml @@ -33,6 +33,7 @@ rw: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ rw: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ rw: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ rw: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ rw: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ rw: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ rw: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/si.yml b/modules/costs/config/locales/crowdin/si.yml index 80ea91a43eca..35edfa7b57af 100644 --- a/modules/costs/config/locales/crowdin/si.yml +++ b/modules/costs/config/locales/crowdin/si.yml @@ -33,6 +33,7 @@ si: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ si: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: පැය + comments: Comment + activity: ක්‍රියාකාරකම + spent_on: දිනය + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ si: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ si: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "පෙරනිමි" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ si: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "අතර" @@ -115,10 +130,12 @@ si: label_until: "until" label_valid_from: "Valid from" label_yes: "ඔව්" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ si: week: "week" js: text_are_you_sure: "ඔබට විශ්වාසද?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/sk.yml b/modules/costs/config/locales/crowdin/sk.yml index 13ca609e4a89..52f4c0f16a56 100644 --- a/modules/costs/config/locales/crowdin/sk.yml +++ b/modules/costs/config/locales/crowdin/sk.yml @@ -33,6 +33,7 @@ sk: cost_type: unit: "Názov jednotky" unit_plural: "Názov jednotky v množnom čísle" + default: "Cost type by default" work_package: costs_by_type: "Použité jednotky" labor_costs: "Mzdové náklady" @@ -44,6 +45,16 @@ sk: rate: "Sadzba" user: default_rates: "Základné sadzby" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hodín + comments: Comment + activity: Činnosť + spent_on: Dátum + start_time: Start time + end_time: Finish time models: cost_type: one: "Typ nákladu" @@ -53,6 +64,8 @@ sk: rate: "Sadzba" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Pracovný balíček #%{id} nie je platný cieľ pre pridelenie položky nákladov." nullify_is_not_valid_for_cost_entries: "Nákladové položky nie je možné priradiť k projektu." @@ -67,6 +80,7 @@ sk: fixed_date: "Stanovený dátum" button_add_rate: "Pridať sadzbu" button_log_costs: "Zaúčtovať jednotkové náklady" + button_log_time: "Log" caption_booked_on_project: "Rezervované na projekte" caption_default: "Predvolené" caption_default_rate_history_for: "História predvolenej sadzby pre %{user}" @@ -78,6 +92,7 @@ sk: caption_save_rate: "Uložiť sadzbu" caption_set_rate: "Nastaviť aktuálnu sadzbu" caption_show_locked: "Zobraziť zablokované typy" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Dátum novej sadzby" group_by_others: "v žiadnej zo skupín" label_between: "medzi" @@ -117,10 +132,12 @@ sk: label_until: "do" label_valid_from: "Platný od" label_yes: "Áno" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Niečo sa pokazilo. Prosím skúste to znova." notice_successful_restore: "Úspešné obnovenie." notice_successful_lock: "Úspešne blokované." notice_cost_logged_successfully: "Jednotkové náklady boli úspešne zaznamenané." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Upraviť zaúčtované jednotkové náklady" permission_edit_own_cost_entries: "Upraviť vlastné zaúčtované jednotkové náklady" permission_edit_hourly_rates: "Upraviť hodinové sadzby" @@ -148,3 +165,7 @@ sk: week: "týždeň" js: text_are_you_sure: "Ste si istí?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/sl.yml b/modules/costs/config/locales/crowdin/sl.yml index 908e453f9d5d..fff1361e693d 100644 --- a/modules/costs/config/locales/crowdin/sl.yml +++ b/modules/costs/config/locales/crowdin/sl.yml @@ -33,6 +33,7 @@ sl: cost_type: unit: "Ime enote" unit_plural: "Pluralizirano ime enote" + default: "Cost type by default" work_package: costs_by_type: "Porabljene enote" labor_costs: "Stroški dela" @@ -44,6 +45,16 @@ sl: rate: "Stopnja" user: default_rates: "Privzeti tečaj" + time_entry: + project: Project + user: User + work_package: Work package + hours: Ure + comments: Comment + activity: Aktivnost + spent_on: Datum + start_time: Start time + end_time: Finish time models: cost_type: one: "Vrsta stroška" @@ -53,6 +64,8 @@ sl: rate: "Stopnja" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Delovni paket #%{id} ni veljaven cilj za prerazporeditev vnosov stroškov." nullify_is_not_valid_for_cost_entries: "Vnosa stroškov ni mogoče dodeliti projektu." @@ -67,6 +80,7 @@ sl: fixed_date: "Fiksen datum" button_add_rate: "Vnesi tečaj" button_log_costs: "Stroški enote dnevnika" + button_log_time: "Log" caption_booked_on_project: "Rezervirano na projektu" caption_default: "Privzeto" caption_default_rate_history_for: "Zgodovina privzetih tečajev za %{user}" @@ -78,6 +92,7 @@ sl: caption_save_rate: "Shrani tečaj" caption_set_rate: "Nastavite trenutni tečaj" caption_show_locked: "Pokaži zaklenjene enote" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Datum novega tečaja" group_by_others: "ni v nobeni skupini" label_between: "med" @@ -117,10 +132,12 @@ sl: label_until: "do" label_valid_from: "Veljavno od" label_yes: "Da" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "nekaj je šlo narobe. Prosim poskusite ponovno." notice_successful_restore: "Uspešna obnovitev." notice_successful_lock: "Uspešno zaklenjeno." notice_cost_logged_successfully: "Stroški na enoto so bili uspešno prijavljeni." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Uredite rezervirane stroške na enoto" permission_edit_own_cost_entries: "Uredite lastne rezervirane stroške na enoto" permission_edit_hourly_rates: "Urejanje urnih postavk" @@ -148,3 +165,7 @@ sl: week: "teden" js: text_are_you_sure: "Ste prepričani?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/sr.yml b/modules/costs/config/locales/crowdin/sr.yml index fa3c1c8404f9..e6e79c02dbe1 100644 --- a/modules/costs/config/locales/crowdin/sr.yml +++ b/modules/costs/config/locales/crowdin/sr.yml @@ -33,6 +33,7 @@ sr: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ sr: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Časovi + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -52,6 +63,8 @@ sr: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -66,6 +79,7 @@ sr: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -77,6 +91,7 @@ sr: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -116,10 +131,12 @@ sr: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -147,3 +164,7 @@ sr: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/sv.yml b/modules/costs/config/locales/crowdin/sv.yml index 585ecb6fc7af..70a5b8db0111 100644 --- a/modules/costs/config/locales/crowdin/sv.yml +++ b/modules/costs/config/locales/crowdin/sv.yml @@ -33,6 +33,7 @@ sv: cost_type: unit: "Enhetsnamn" unit_plural: "Enhetsnamn plural" + default: "Cost type by default" work_package: costs_by_type: "Bokade enheter" labor_costs: "Personalkostnader" @@ -44,6 +45,16 @@ sv: rate: "Timpris" user: default_rates: "Standardtimpris" + time_entry: + project: Project + user: User + work_package: Work package + hours: Timmar + comments: Comment + activity: Aktivitet + spent_on: Datum + start_time: Start time + end_time: Finish time models: cost_type: one: "Kostnadstyp" @@ -51,6 +62,8 @@ sv: rate: "Timpris" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Arbetspaket #%{id} är inte ett giltigt mål för omfördelning av kostnadsposterna." nullify_is_not_valid_for_cost_entries: "Kostnadsposterna kan inte tilldelas till ett projekt." @@ -65,6 +78,7 @@ sv: fixed_date: "Referensdatum" button_add_rate: "Lägg till timpris" button_log_costs: "Logga enhetskostnader" + button_log_time: "Log" caption_booked_on_project: "Bokade på projekt" caption_default: "Standard" caption_default_rate_history_for: "Historiskt standardtimpris för %{user}" @@ -76,6 +90,7 @@ sv: caption_save_rate: "Spara timpris" caption_set_rate: "Ange aktuellt timpris" caption_show_locked: "Visa låst typer" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Datum för nytt timpris" group_by_others: "inte i någon grupp" label_between: "mellan" @@ -115,10 +130,12 @@ sv: label_until: "fram till" label_valid_from: "Gäller från" label_yes: "Ja" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Ett fel inträffade. Försök igen." notice_successful_restore: "Lyckad återställning." notice_successful_lock: "Låst framgångsrikt." notice_cost_logged_successfully: "Enhetskostnaden loggad framgångsrikt." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Redigera bokade enhetskostnader" permission_edit_own_cost_entries: "Redigera egna bokade enhetskostnader" permission_edit_hourly_rates: "Redigera timpriser" @@ -146,3 +163,7 @@ sv: week: "vecka" js: text_are_you_sure: "Är du säker?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/th.yml b/modules/costs/config/locales/crowdin/th.yml index bf919dc07b02..b717081b2848 100644 --- a/modules/costs/config/locales/crowdin/th.yml +++ b/modules/costs/config/locales/crowdin/th.yml @@ -33,6 +33,7 @@ th: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,12 +45,24 @@ th: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: ชั่วโมง + comments: Comment + activity: กิจกรรม + spent_on: วันที่ + start_time: Start time + end_time: Finish time models: cost_type: other: "Cost types" rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -64,6 +77,7 @@ th: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "ค่าเริ่มต้น" caption_default_rate_history_for: "Default rate history for %{user}" @@ -75,6 +89,7 @@ th: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -114,10 +129,12 @@ th: label_until: "until" label_valid_from: "Valid from" label_yes: "ใช่" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -145,3 +162,7 @@ th: week: "week" js: text_are_you_sure: "คุณแน่ใจหรือไม่ ?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/tr.yml b/modules/costs/config/locales/crowdin/tr.yml index 44c1f75cc1fc..1048c18c95f4 100644 --- a/modules/costs/config/locales/crowdin/tr.yml +++ b/modules/costs/config/locales/crowdin/tr.yml @@ -33,6 +33,7 @@ tr: cost_type: unit: "Birim adı" unit_plural: "Birden fazla birim adı" + default: "Varsayılan maliyet türü" work_package: costs_by_type: "Harcanan maliyet" labor_costs: "İşçilik maliyetleri" @@ -43,7 +44,17 @@ tr: rate: rate: "Oran" user: - default_rates: "Varsayılan Fiyatlar" + default_rates: "Varsayılan ücretler" + time_entry: + project: Proje + user: Kullanıcı + work_package: İş paketi + hours: Saat + comments: Yorum + activity: Etkinlik + spent_on: Tarih + start_time: Başlangıç zamanı + end_time: Bitiş zamanı models: cost_type: one: "Maliyet türü" @@ -51,11 +62,13 @@ tr: rate: "Oranlar" errors: models: + time_entry: + invalid_time: "00:00 ile 23:59 arasında olmalı." work_package: is_not_a_valid_target_for_cost_entries: "İş numarası # {id}, maliyet girişlerini yeniden atamak için geçerli bir hedef değil.%{id}." nullify_is_not_valid_for_cost_entries: "Maliyet girdileri bir projeye atanamaz." attributes: - comment: "Yorumlar" + comment: "Yorum" cost_type: "Maliyet türü" costs: "Ücretler" current_rate: "Aktüel oran" @@ -65,6 +78,7 @@ tr: fixed_date: "Düzenleme Tarihi" button_add_rate: "Oran ekle" button_log_costs: "Günlük birim maliyetleri" + button_log_time: "Kayıt" caption_booked_on_project: "Proje rezervasyonu yaptırdı" caption_default: "Varsayılan" caption_default_rate_history_for: "%{user} için varsayılan hızı geçmişi" @@ -76,6 +90,7 @@ tr: caption_save_rate: "Oranı kaydet" caption_set_rate: "Güncel oranı ayarla" caption_show_locked: "Kilitli türleri göster" + caption_log_time_dialog: "Zaman kaydet" description_date_for_new_rate: "Yeni oran için tarih" group_by_others: "herhangi bir grupta değil" label_between: "arasında" @@ -115,10 +130,12 @@ tr: label_until: "kadar" label_valid_from: "Geçerlilik" label_yes: "Evet" + placeholder_activity_select_work_package_first: Öncelikle iş paketi seçimi gereklidir notice_something_wrong: "Bir şeyler yanlış gitti. Lütfen tekrar deneyin." notice_successful_restore: "Başarılı bir geri yükleme." notice_successful_lock: "Başarıyla kilitlendi." notice_cost_logged_successfully: "Birim maliyet başarıyla kaydedildi." + notice_different_time_zones: "Bu kullanıcı farklı bir saat dilimine sahiptir (%{tz}). Zaman, onun zaman dilimi kullanılarak kaydedilecektir." permission_edit_cost_entries: "Rezervasyon birimi maliyetlerini düzenle" permission_edit_own_cost_entries: "Kendi rezervasyonu birim maliyetlerini düzenleme" permission_edit_hourly_rates: "Saatlik oranları düzenleme" @@ -146,3 +163,7 @@ tr: week: "hafta" js: text_are_you_sure: "Emin misiniz?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/uk.yml b/modules/costs/config/locales/crowdin/uk.yml index fe80e32144a8..4fb31e8e0cc3 100644 --- a/modules/costs/config/locales/crowdin/uk.yml +++ b/modules/costs/config/locales/crowdin/uk.yml @@ -33,6 +33,7 @@ uk: cost_type: unit: "Назва одиниці" unit_plural: "Назва плуралізованої одиниці" + default: "Тип витрат за замовчуванням" work_package: costs_by_type: "Витрачені одиниці" labor_costs: "Витрати на оплату праці" @@ -44,6 +45,16 @@ uk: rate: "Оцінити" user: default_rates: "Стандартні ставки" + time_entry: + project: Проєкт + user: Користувач + work_package: Пакет робіт + hours: Години + comments: Коментар + activity: Активність + spent_on: Дата + start_time: Час початку + end_time: Час закінчення models: cost_type: one: "Тип вартості" @@ -53,6 +64,8 @@ uk: rate: "Оцінити" errors: models: + time_entry: + invalid_time: "має бути в діапазоні від 00:00 до 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Робочий пакет #%{id} не є дійсною ціллю для перепризначення записів витрат." nullify_is_not_valid_for_cost_entries: "Записи витрат не можуть бути призначені проекту." @@ -67,6 +80,7 @@ uk: fixed_date: "Певна дата " button_add_rate: "Додати ставку" button_log_costs: "Витрати лог-одиниць" + button_log_time: "Записати" caption_booked_on_project: "Записаний на проект" caption_default: "За замовчуванням" caption_default_rate_history_for: "Історія ставок за умовчанням для %{user}" @@ -78,6 +92,7 @@ uk: caption_save_rate: "Зберегти ставку" caption_set_rate: "Встановити поточну швидкість" caption_show_locked: "Показати заблоковані типи" + caption_log_time_dialog: "Записування часу" description_date_for_new_rate: "Дата нової ставки" group_by_others: "ні в якій групі" label_between: "між ними" @@ -117,10 +132,12 @@ uk: label_until: "до" label_valid_from: "Діє з" label_yes: "Так" + placeholder_activity_select_work_package_first: Спочатку потрібно вибрати пакет робіт notice_something_wrong: "Щось пішло не так. Будь ласка спробуйте ще раз." notice_successful_restore: "Успішне відновлення." notice_successful_lock: "Успішно заблоковано." notice_cost_logged_successfully: "Вартість одиниць успішно зареєстрована." + notice_different_time_zones: "Часовий пояс цього користувача (%{tz}) відрізняється. Час записуватиметься за його поясом." permission_edit_cost_entries: "Відредагувати витрати на одиницю" permission_edit_own_cost_entries: "Редагування власних витрат на одиницю" permission_edit_hourly_rates: "Редагування погодинних ставок" @@ -148,3 +165,7 @@ uk: week: "тиждень" js: text_are_you_sure: "Ви впевненені?" + api_v3: + errors: + validation: + start_time_different_date: "Частина дати в значенні startTime (%{start_time}) має збігатися зі значенням дати spentOn (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/uz.yml b/modules/costs/config/locales/crowdin/uz.yml index f7cb884bd593..4899aa77378b 100644 --- a/modules/costs/config/locales/crowdin/uz.yml +++ b/modules/costs/config/locales/crowdin/uz.yml @@ -33,6 +33,7 @@ uz: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -44,6 +45,16 @@ uz: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time models: cost_type: one: "Cost type" @@ -51,6 +62,8 @@ uz: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -65,6 +78,7 @@ uz: fixed_date: "Fixed date" button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" caption_default_rate_history_for: "Default rate history for %{user}" @@ -76,6 +90,7 @@ uz: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" group_by_others: "not in any group" label_between: "between" @@ -115,10 +130,12 @@ uz: label_until: "until" label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" permission_edit_hourly_rates: "Edit hourly rates" @@ -146,3 +163,7 @@ uz: week: "week" js: text_are_you_sure: "Are you sure?" + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/locales/crowdin/vi.yml b/modules/costs/config/locales/crowdin/vi.yml index ba1eb5e67e5b..1e5622c99dc7 100644 --- a/modules/costs/config/locales/crowdin/vi.yml +++ b/modules/costs/config/locales/crowdin/vi.yml @@ -33,6 +33,7 @@ vi: cost_type: unit: "Tên đơn vị" unit_plural: "Tên đơn vị đa năng" + default: "Loại chi phí theo mặc định" work_package: costs_by_type: "Các đơn vị đã chi" labor_costs: "Chi phí nhân công" @@ -44,12 +45,24 @@ vi: rate: "Tỷ giá" user: default_rates: "Tỷ lệ mặc định" + time_entry: + project: Dự án + user: Người dùng + work_package: Gói công việc + hours: Giờ + comments: Bình luận + activity: Hoạt động + spent_on: Ngày + start_time: Thời gian bắt đầu + end_time: Thời gian hoàn thành models: cost_type: other: "Loại chi phí" rate: "Tỉ giá" errors: models: + time_entry: + invalid_time: "phải ở giữa khoảng 00:00 đến 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Gói công việc #%{id} không phải là mục tiêu hợp lệ để phân bổ lại các mục chi phí." nullify_is_not_valid_for_cost_entries: "Các mục chi phí không thể được phân bổ cho một dự án." @@ -64,6 +77,7 @@ vi: fixed_date: "Ngày cố định" button_add_rate: "Thêm tỷ lệ" button_log_costs: "Ghi lại chi phí đơn vị" + button_log_time: "Nhật ký" caption_booked_on_project: "Đã ghi trên dự án" caption_default: "Mặc định" caption_default_rate_history_for: "Lịch sử tỷ lệ mặc định cho %{user}" @@ -75,6 +89,7 @@ vi: caption_save_rate: "Lưu tỷ lệ" caption_set_rate: "Đặt tỷ lệ hiện tại" caption_show_locked: "Hiển thị các loại đã khóa" + caption_log_time_dialog: "Thời gian nhật ký" description_date_for_new_rate: "Ngày cho tỷ lệ mới" group_by_others: "không thuộc nhóm nào" label_between: "giữa" @@ -114,10 +129,12 @@ vi: label_until: "đến" label_valid_from: "Có hiệu lực từ" label_yes: "Có" + placeholder_activity_select_work_package_first: Phải chọn gói công việc trước đã notice_something_wrong: "Đã xảy ra lỗi. Vui lòng thử lại." notice_successful_restore: "Khôi phục thành công." notice_successful_lock: "Khóa thành công." notice_cost_logged_successfully: "Chi phí đơn vị đã được ghi lại thành công." + notice_different_time_zones: "Người dùng này có múi giờ khác (%{tz}). Nhật ký sẽ được ghi lại theo múi giờ của họ." permission_edit_cost_entries: "Chỉnh sửa chi phí đơn vị đã ghi" permission_edit_own_cost_entries: "Chỉnh sửa chi phí đơn vị đã ghi của chính mình" permission_edit_hourly_rates: "Chỉnh sửa tỷ lệ theo giờ" @@ -145,3 +162,7 @@ vi: week: "tuần" js: text_are_you_sure: "Bạn có chắc không?" + api_v3: + errors: + validation: + start_time_different_date: "Phần ngày của thời gian bắt đầu (%{start_time}) phải giống với ngày tiêu phí (%{spent_on})." diff --git a/modules/costs/config/locales/crowdin/zh-CN.yml b/modules/costs/config/locales/crowdin/zh-CN.yml index 0c9a931ecc2e..7b816fa4e7d3 100644 --- a/modules/costs/config/locales/crowdin/zh-CN.yml +++ b/modules/costs/config/locales/crowdin/zh-CN.yml @@ -33,6 +33,7 @@ zh-CN: cost_type: unit: "单位名称" unit_plural: "单位名称（复数）" + default: "默认成本类型" work_package: costs_by_type: "支出单位" labor_costs: "人工成本" @@ -44,12 +45,24 @@ zh-CN: rate: "费率" user: default_rates: "基本费率" + time_entry: + project: 项目 + user: 用户 + work_package: 工作包 + hours: 小时 + comments: 评论 + activity: 活动 + spent_on: 日期 + start_time: 开始时间 + end_time: 结束时间 models: cost_type: other: "成本类型" rate: "费率" errors: models: + time_entry: + invalid_time: "必须在 00:00-23:59之间。" work_package: is_not_a_valid_target_for_cost_entries: "工作包 #%{id} 不是重新分配成本条目的有效目标。" nullify_is_not_valid_for_cost_entries: "无法将成本条目分配到项目。" @@ -64,6 +77,7 @@ zh-CN: fixed_date: "固定日期" button_add_rate: "添加费率" button_log_costs: "记录单位成本" + button_log_time: "日志" caption_booked_on_project: "已记录在项目上" caption_default: "基本" caption_default_rate_history_for: "%{user} 的基本费率历史记录" @@ -75,6 +89,7 @@ zh-CN: caption_save_rate: "保存费率" caption_set_rate: "设置当前费率" caption_show_locked: "显示锁定类型" + caption_log_time_dialog: "日志时间" description_date_for_new_rate: "新费率的日期" group_by_others: "不在任何组中" label_between: "介于" @@ -114,10 +129,12 @@ zh-CN: label_until: "到" label_valid_from: "有效起始日期" label_yes: "是" + placeholder_activity_select_work_package_first: 首先需要选择工作包 notice_something_wrong: "出错了。请重试。" notice_successful_restore: "成功恢复。" notice_successful_lock: "锁定成功。" notice_cost_logged_successfully: "单位成本记录成功。" + notice_different_time_zones: "该用户使用不同的时区 (%{tz})。将使用其时区记录时间。" permission_edit_cost_entries: "编辑记录的单位成本" permission_edit_own_cost_entries: "编辑自己记录的单位成本" permission_edit_hourly_rates: "编辑小时费率" @@ -145,3 +162,7 @@ zh-CN: week: "周" js: text_are_you_sure: "是否确定？" + api_v3: + errors: + validation: + start_time_different_date: "开始时间 (%{start_time}) 的日期部分必须与 支出日期(%{spent_on})相同。" diff --git a/modules/costs/config/locales/crowdin/zh-TW.yml b/modules/costs/config/locales/crowdin/zh-TW.yml index 8920221aa598..b25560d5b616 100644 --- a/modules/costs/config/locales/crowdin/zh-TW.yml +++ b/modules/costs/config/locales/crowdin/zh-TW.yml @@ -33,6 +33,7 @@ zh-TW: cost_type: unit: "單位名稱" unit_plural: "單位名稱(複數)" + default: "預設成本類型" work_package: costs_by_type: "支出單位" labor_costs: "工資" @@ -44,12 +45,24 @@ zh-TW: rate: "費率" user: default_rates: "預設費率" + time_entry: + project: 專案 + user: 使用者 + work_package: 工作項目 + hours: 小時 + comments: 留言 + activity: 活動 + spent_on: 日期 + start_time: 開始時間 + end_time: 完成時間 models: cost_type: other: "費用類別" rate: "費率" errors: models: + time_entry: + invalid_time: "必須在 00:00 到 23:59 之間。" work_package: is_not_a_valid_target_for_cost_entries: "工作項目 #%{id} 不是重新分配支出的有效目標" nullify_is_not_valid_for_cost_entries: "支出項目無法分配至專案" @@ -64,6 +77,7 @@ zh-TW: fixed_date: "固定日期" button_add_rate: "新增費率" button_log_costs: "紀錄單位成本" + button_log_time: "日誌" caption_booked_on_project: "已記錄在專案上" caption_default: "預設" caption_default_rate_history_for: "%{user} 的費率歷史記錄" @@ -75,6 +89,7 @@ zh-TW: caption_save_rate: "保存費率" caption_set_rate: "設定當前費率" caption_show_locked: "顯示鎖定類型" + caption_log_time_dialog: "日誌時間" description_date_for_new_rate: "新費率的日期" group_by_others: "不在任何群組中" label_between: "介於" @@ -114,10 +129,12 @@ zh-TW: label_until: "到" label_valid_from: "有效期從" label_yes: "是" + placeholder_activity_select_work_package_first: 需要先選擇工作項目 notice_something_wrong: "發生錯誤，請重試。" notice_successful_restore: "復原成功。" notice_successful_lock: "停用成功。" notice_cost_logged_successfully: "單位成本紀錄成功。" + notice_different_time_zones: "此使用者使用不同的時區 (%{tz})。將使用他們的時區記錄時間。" permission_edit_cost_entries: "編輯自己紀錄的單位成本" permission_edit_own_cost_entries: "編輯自己紀錄的單位成本" permission_edit_hourly_rates: "編輯小時費率" @@ -145,3 +162,7 @@ zh-TW: week: "週" js: text_are_you_sure: "是否確定？" + api_v3: + errors: + validation: + start_time_different_date: "startTime (%{start_time}) 的日期部分必須與 spentOn (%{spent_on}) 的日期相同。" diff --git a/modules/costs/config/locales/en.yml b/modules/costs/config/locales/en.yml index 9fee7d5e047a..bbbc33a33279 100644 --- a/modules/costs/config/locales/en.yml +++ b/modules/costs/config/locales/en.yml @@ -42,6 +42,7 @@ en: cost_type: unit: "Unit name" unit_plural: "Pluralized unit name" + default: "Cost type by default" work_package: costs_by_type: "Spent units" labor_costs: "Labor costs" @@ -53,6 +54,17 @@ en: rate: "Rate" user: default_rates: "Default rates" + time_entry: + project: Project + user: User + work_package: Work package + hours: Hours + comments: Comment + activity: Activity + spent_on: Date + start_time: Start time + end_time: Finish time + models: cost_type: one: "Cost type" @@ -60,6 +72,8 @@ en: rate: "Rate" errors: models: + time_entry: + invalid_time: "must be between 00:00 and 23:59." work_package: is_not_a_valid_target_for_cost_entries: "Work package #%{id} is not a valid target for reassigning the cost entries." nullify_is_not_valid_for_cost_entries: "Cost entries can not be assigned to a project." @@ -75,6 +89,7 @@ en: button_add_rate: "Add rate" button_log_costs: "Log unit costs" + button_log_time: "Log" caption_booked_on_project: "Booked on project" caption_default: "Default" @@ -87,6 +102,7 @@ en: caption_save_rate: "Save rate" caption_set_rate: "Set current rate" caption_show_locked: "Show locked types" + caption_log_time_dialog: "Log time" description_date_for_new_rate: "Date for new rate" @@ -130,10 +146,13 @@ en: label_valid_from: "Valid from" label_yes: "Yes" + placeholder_activity_select_work_package_first: Work package selection is required first + notice_something_wrong: "Something went wrong. Please try again." notice_successful_restore: "Successful restore." notice_successful_lock: "Locked successfully." notice_cost_logged_successfully: "Unit cost logged successfully." + notice_different_time_zones: "This user has a different time zone (%{tz}). Time will be logged using their time zone." permission_edit_cost_entries: "Edit booked unit costs" permission_edit_own_cost_entries: "Edit own booked unit costs" @@ -167,3 +186,8 @@ en: js: text_are_you_sure: "Are you sure?" + + api_v3: + errors: + validation: + start_time_different_date: "Date part of startTime (%{start_time}) must be the same as the spentOn (%{spent_on}) date." diff --git a/modules/costs/config/routes.rb b/modules/costs/config/routes.rb index 1619251f6eab..bf5540981ee8 100644 --- a/modules/costs/config/routes.rb +++ b/modules/costs/config/routes.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -27,12 +29,21 @@ #++ Rails.application.routes.draw do + resources :time_entries, only: %i[create update destroy] do + get :dialog, on: :collection + get :dialog, on: :member + get "/users/:user_id/tz_caption", action: :user_tz_caption, on: :collection + post :refresh_form, on: :collection + end + scope "projects/:project_id", as: "projects" do resources :cost_entries, controller: "costlog", only: %i[new create] resources :hourly_rates, only: %i[show edit update] do post :set_rate, on: :member end + + get "/time_entries/dialog" => "time_entries#dialog" end scope "my" do @@ -47,6 +58,7 @@ scope "work_packages/:work_package_id", as: "work_packages" do resources :cost_entries, controller: "costlog", only: %i[new] + get "/time_entries/dialog" => "time_entries#dialog" end resources :cost_entries, controller: "costlog", only: %i[edit update destroy] diff --git a/modules/costs/lib/api/v3/time_entries/schemas/time_entry_schema_representer.rb b/modules/costs/lib/api/v3/time_entries/schemas/time_entry_schema_representer.rb index ef7efd5f5542..c5906a0e9d3e 100644 --- a/modules/costs/lib/api/v3/time_entries/schemas/time_entry_schema_representer.rb +++ b/modules/costs/lib/api/v3/time_entries/schemas/time_entry_schema_representer.rb @@ -50,6 +50,15 @@ def self.represented_class schema :spent_on, type: "Date" + schema :start_time, + type: "DateTime", + required: -> { TimeEntry.must_track_start_and_end_time? }, + writable: -> { TimeEntry.can_track_start_and_end_time? } + + schema :end_time, + type: "DateTime", + writable: false + schema :hours, type: "Duration" diff --git a/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb b/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb index ad87f115e7a3..07c4ab92a4c7 100644 --- a/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb +++ b/modules/costs/lib/api/v3/time_entries/time_entry_representer.rb @@ -98,6 +98,20 @@ class TimeEntryRepresenter < ::API::Decorators::Single associated_resource :user + date_time_property :start_time, + exec_context: :decorator, + getter: ->(*) { + datetime_formatter.format_datetime(represented.start_timestamp, allow_nil: true) + }, + if: ->(*) { TimeEntry.can_track_start_and_end_time? } + + date_time_property :end_time, + exec_context: :decorator, + getter: ->(*) { + datetime_formatter.format_datetime(represented.end_timestamp, allow_nil: true) + }, + if: ->(*) { TimeEntry.can_track_start_and_end_time? } + associated_resource :activity, representer: TimeEntriesActivityRepresenter, v3_path: :time_entries_activity, @@ -129,6 +143,35 @@ def hours=(value) allow_nil: true) end + def start_time=(value) # rubocop:disable Metrics/AbcSize, Metrics/PerceivedComplexity + ts = datetime_formatter.parse_datetime(value, "start_time", allow_nil: true) + + if ts.nil? + represented.start_time = nil + return + end + + tz_specific_time = if represented.user_id.present? && represented.user_id != current_user.id + user = User.visible.find_by(id: represented.user_id) + if user + ts.in_time_zone(user.time_zone) + else + ts.in_time_zone(current_user.time_zone) + end + else + ts.in_time_zone(current_user.time_zone) + end + + if tz_specific_time.to_date == represented.spent_on + represented.start_time = tz_specific_time.strftime("%H:%M") + else + raise API::Errors::Validation.new("start_time", + I18n.t("api_v3.errors.validation.start_time_different_date", + spent_on: represented.spent_on, + start_time: tz_specific_time.to_date)) + end + end + self.to_eager_load = [:work_package, :user, :activity, diff --git a/modules/costs/lib/costs/patches/permitted_params_patch.rb b/modules/costs/lib/costs/patches/permitted_params_patch.rb index 783e45c43968..c3d4d269c683 100644 --- a/modules/costs/lib/costs/patches/permitted_params_patch.rb +++ b/modules/costs/lib/costs/patches/permitted_params_patch.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -62,5 +64,27 @@ def user_rates params.require(:user).permit(new_rate_attributes: %i[valid_from rate], existing_rate_attributes: %i[valid_from rate]) end + + def time_entries + additional_fields = [] + + additional_fields << :start_time if TimeEntry.can_track_start_and_end_time? + + params + .require(:time_entry) + .permit( + *additional_fields, + :hours, + :comments, + :spent_on, + :work_package_id, + :activity_id, + :project_id, + :issue_id, + :user_id, + :ongoing + ) + .merge(custom_field_values(:time_entry)) + end end end diff --git a/modules/costs/spec/contracts/time_entries/create_contract_spec.rb b/modules/costs/spec/contracts/time_entries/create_contract_spec.rb index e5772207f15b..e7ba87969dba 100644 --- a/modules/costs/spec/contracts/time_entries/create_contract_spec.rb +++ b/modules/costs/spec/contracts/time_entries/create_contract_spec.rb @@ -109,6 +109,14 @@ end end + context "if the user is set to a user that the user has no access to" do + let(:user_visible) { false } + + it "is invalid" do + expect_valid(false, user_id: %i(invalid)) + end + end + context "if time_entry user was not set by system" do let(:other_user) { build_stubbed(:user) } let(:time_entry_user) { other_user } diff --git a/modules/costs/spec/contracts/time_entries/shared_contract_examples.rb b/modules/costs/spec/contracts/time_entries/shared_contract_examples.rb index d2772e659ad1..c8027517da67 100644 --- a/modules/costs/spec/contracts/time_entries/shared_contract_examples.rb +++ b/modules/costs/spec/contracts/time_entries/shared_contract_examples.rb @@ -51,6 +51,7 @@ let(:time_entry_hours) { 5 } let(:time_entry_comments) { "A comment" } let(:work_package_visible) { true } + let(:user_visible) { true } let(:time_entry_day_sum) { 5 } let(:activities_scope) do scope = class_double(TimeEntryActivity) @@ -97,6 +98,8 @@ .to receive(:active_in_project) .with(time_entry_project) .and_return(activities_scope) + + allow(time_entry_user).to receive(:visible?).and_return(user_visible) end def expect_valid(valid, symbols = {}) diff --git a/modules/costs/spec/contracts/time_entries/update_contract_spec.rb b/modules/costs/spec/contracts/time_entries/update_contract_spec.rb index eaa8c9d17900..90a2595bc347 100644 --- a/modules/costs/spec/contracts/time_entries/update_contract_spec.rb +++ b/modules/costs/spec/contracts/time_entries/update_contract_spec.rb @@ -43,7 +43,7 @@ end subject(:contract) { described_class.new(time_entry, current_user) } - let(:permissions) { %i(edit_time_entries) } + let(:permissions) { %i(edit_time_entries log_time) } context "if user is not allowed to edit time entries" do let(:permissions) { [] } @@ -127,6 +127,19 @@ end end + context "if the user is changed to a user that the user has no access to" do + let(:new_user) do + create(:user).tap do |user| + allow(user).to receive(:visible?).and_return(false) + end + end + + it "is invalid" do + time_entry.user = new_user + expect_valid(false, user_id: %i(invalid)) + end + end + context "if time_entry user is not contract user" do let(:time_entry_user) { other_user } diff --git a/modules/costs/spec/controllers/time_entries_controller_spec.rb b/modules/costs/spec/controllers/time_entries_controller_spec.rb new file mode 100644 index 000000000000..7b426c086264 --- /dev/null +++ b/modules/costs/spec/controllers/time_entries_controller_spec.rb @@ -0,0 +1,293 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper.rb") + +RSpec.describe TimeEntriesController do + include Redmine::I18n + let(:user) { create(:user) } + let(:other_user) { create(:user) } + + let!(:project1) { create(:project) } + let!(:work_package1) { create(:work_package, project: project1) } + let!(:work_package2) { create(:work_package, project: project1) } + + let(:project2) { create(:project) } + let(:work_package3) { create(:work_package, project: project2) } + let(:work_package4) { create(:work_package, project: project2) } + + before do + login_as user + end + + describe "#dialog" do + describe "authorization checks" do + context "when opening dialog on an existing time entry" do + let!(:time_entry1) { create(:time_entry, user: user, work_package: work_package1) } + let!(:time_entry2) { create(:time_entry, user: other_user, work_package: work_package1) } + + context "and the user has the edit_own_time_entries permission on the work package" do + before do + role = create(:work_package_role, permissions: %i[view_own_time_entries edit_own_time_entries]) + create(:work_package_member, user: user, entity: work_package1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { id: time_entry1.id }, format: :turbo_stream + expect(response).to be_successful + expect(assigns(:time_entry)).to eq time_entry1 + end + + it "does not allow opening the dialog when the time entry belongs to another user" do + get :dialog, params: { id: time_entry2.id }, format: :turbo_stream + expect(response).to be_not_found + end + end + + context "and the user has the edit_own_time_entries permission on the project" do + before do + role = create(:project_role, permissions: %i[view_own_time_entries edit_own_time_entries]) + user.members.find_by(project: project1).roles << role + end + + it "allows the user to open the dialog" do + get :dialog, params: { id: time_entry1.id }, format: :turbo_stream + expect(response).to be_successful + expect(assigns(:time_entry)).to eq time_entry1 + end + + it "does not allow opening the dialog when the time entry belongs to another user" do + get :dialog, params: { id: time_entry2.id }, format: :turbo_stream + expect(response).to be_not_found + end + end + + context "and the user has the edit_time_entries permission on the project" do + before do + role = create(:project_role, permissions: %i[view_time_entries edit_time_entries]) + user.members.find_by(project: project1).roles << role + end + + it "allows the user to open the dialog" do + get :dialog, params: { id: time_entry1.id }, format: :turbo_stream + expect(response).to be_successful + expect(assigns(:time_entry)).to eq time_entry1 + end + + it "allows opening the dialog when the time entry belongs to another user" do + get :dialog, params: { id: time_entry2.id }, format: :turbo_stream + expect(response).to be_successful + expect(assigns(:time_entry)).to eq time_entry2 + end + end + + context "and the user has no edit permissions" do + it "renders a 404" do + get :dialog, params: { id: time_entry1.id }, format: :turbo_stream + + expect(response).to be_not_found + end + end + end + + context "when opening dialog on a project" do + context "and the user has the log_own_time permission on a work package within the project" do + before do + role = create(:work_package_role, permissions: %i[log_own_time]) + create(:work_package_member, user: user, entity: work_package1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { project_id: project1 }, format: :turbo_stream + expect(response).to be_successful + + time_entry = assigns(:time_entry) + expect(time_entry).to be_new_record + expect(time_entry.project).to eq(project1) + end + + it "does not allow to open the dialog for another project" do + get :dialog, params: { project_id: project2 }, format: :turbo_stream + expect(response).to be_not_found + end + end + + context "and the user has the log_own_time permission on the project" do + before do + role = create(:project_role, permissions: %i[view_project log_own_time]) + create(:member, user: user, project: project1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { project_id: project1 }, format: :turbo_stream + expect(response).to be_successful + + time_entry = assigns(:time_entry) + expect(time_entry).to be_new_record + expect(time_entry.project).to eq(project1) + end + end + + context "and the user has the log_time permission on the project" do + before do + role = create(:project_role, permissions: %i[view_project log_time]) + create(:member, user: user, project: project1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { project_id: project1 }, format: :turbo_stream + expect(response).to be_successful + + time_entry = assigns(:time_entry) + expect(time_entry).to be_new_record + expect(time_entry.project).to eq(project1) + end + end + + context "and the user has no log permissions, but can view the project" do + before do + role = create(:project_role, permissions: %i[view_project]) + create(:member, user: user, project: project1, roles: [role]) + end + + it "does not allow to open the dialog" do + get :dialog, params: { project_id: project1 }, format: :turbo_stream + expect(response).to be_forbidden + end + end + end + + context "when opening a dialog on a work package" do + context "and the user has the log_own_time permission on the work package" do + before do + role = create(:work_package_role, permissions: %i[view_work_packages log_own_time]) + create(:work_package_member, user: user, entity: work_package1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { work_package_id: work_package1.id }, format: :turbo_stream + expect(response).to be_successful + + time_entry = assigns(:time_entry) + expect(time_entry).to be_new_record + expect(time_entry.project).to eq(project1) + expect(time_entry.work_package).to eq(work_package1) + end + + it "does not allow to open the dialog for another work package" do + get :dialog, params: { work_package_id: work_package2.id }, format: :turbo_stream + expect(response).to be_not_found + end + end + + context "and the user has the log_own_time permission on the project" do + before do + role = create(:project_role, permissions: %i[view_work_packages log_own_time]) + create(:member, user: user, project: project1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { work_package_id: work_package1.id }, format: :turbo_stream + expect(response).to be_successful + end + + it "does not allow to open the dialog for work package from another project" do + get :dialog, params: { work_package_id: work_package3.id }, format: :turbo_stream + expect(response).to be_not_found + end + end + + context "and the user has the log_time permission on the project" do + before do + role = create(:project_role, permissions: %i[view_work_packages log_time]) + create(:member, user: user, project: project1, roles: [role]) + end + + it "allows the user to open the dialog" do + get :dialog, params: { work_package_id: work_package1.id }, format: :turbo_stream + expect(response).to be_successful + end + + it "does not allow to open the dialog for work package from another project" do + get :dialog, params: { work_package_id: work_package3.id }, format: :turbo_stream + expect(response).to be_not_found + end + end + + context "and the user has no log permission but can view the work package" do + before do + role = create(:work_package_role, permissions: %i[view_work_packages]) + create(:work_package_member, user: user, entity: work_package1, roles: [role]) + end + + it "does not allow to open the dialog" do + get :dialog, params: { work_package_id: work_package1.id }, format: :turbo_stream + expect(response).to be_forbidden + end + end + end + end + end + + describe "#user_tz_caption" do + let(:user) { create(:admin) } # so we don't have to mock permissions' + + render_views + + context "when current user and other user have different timezones" do + before do + user.pref.time_zone = "Europe/Berlin" + other_user.pref.time_zone = "Asia/Tokyo" + other_user.save + end + + it "returns a notice about the different timezone" do + get :user_tz_caption, params: { user_id: other_user.id }, format: :turbo_stream + expect(response.body).to include( + "caption=\"#{I18n.t('notice_different_time_zones', + tz: friendly_timezone_name(other_user.time_zone))}\"" + ) + end + end + + context "when current user and other user have the same timezone" do + before do + user.pref.time_zone = "Europe/Berlin" + other_user.pref.time_zone = "Europe/Berlin" + other_user.save + end + + it "returns no notice" do + get :user_tz_caption, params: { user_id: other_user.id }, format: :turbo_stream + expect(response.body).to include("caption=\"\"") + end + end + end +end diff --git a/modules/costs/spec/factories/time_entry_factory.rb b/modules/costs/spec/factories/time_entry_factory.rb index 325985cff303..413839143bfa 100644 --- a/modules/costs/spec/factories/time_entry_factory.rb +++ b/modules/costs/spec/factories/time_entry_factory.rb @@ -30,7 +30,7 @@ factory :time_entry do user work_package - spent_on { Date.today } + spent_on { Time.zone.today } activity factory: :time_entry_activity hours { 1.0 } logged_by { user } @@ -38,5 +38,23 @@ after(:build) do |time_entry| time_entry.project ||= time_entry.work_package.project end + + after(:create) do |time_entry| + if time_entry.work_package.present? + time_entry.update(project: time_entry.work_package.project) + end + + # ensure user is member of project + unless Member.exists?(principal: time_entry.user, project: time_entry.project) + role = create(:project_role, permissions: [:view_project]) + create(:member, principal: time_entry.user, project: time_entry.project, roles: [role]) + end + end + + trait :with_start_and_end_time do + time_zone { "Asia/Tokyo" } + start_time { 390 } # 6:30 AM + hours { 2.5 } + end end end diff --git a/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb b/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb index ed6e6b39dd15..d7879c83bdaf 100644 --- a/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb +++ b/modules/costs/spec/features/cost_entries/add_cost_entry_spec.rb @@ -70,12 +70,8 @@ it "does not show read-only fields" do full_view.visit! - # Go to add cost entry page - SeleniumHubWaiter.wait - find("#action-show-more-dropdown-menu .button").click - find(".menu-item", text: "Log unit costs").click + full_view.select_log_unit_costs_action - SeleniumHubWaiter.wait # Set single value, should update suffix select "A", from: "cost_entry_cost_type_id" fill_in "cost_entry_units", with: "1" @@ -116,15 +112,12 @@ I18n.locale = :de full_view.visit! + full_view.select_log_unit_costs_action - # Go to add cost entry page - SeleniumHubWaiter.wait - find("#action-show-more-dropdown-menu .button").click - find(".menu-item", text: I18n.t(:button_log_costs)).click + fill_in CostEntry.human_attribute_name(:units), with: "1,42" + expect(page).to have_css("#cost_entry_costs", text: "1,42 EUR") - SeleniumHubWaiter.wait - fill_in "cost_entry_units", with: "1,42" - select "B", from: "cost_entry_cost_type_id" + select "B", from: CostEntry.human_attribute_name(:cost_type) expect(page).to have_css("#cost_entry_unit_name", text: "B plural") expect(page).to have_css("#cost_entry_costs", text: "2,84 EUR") @@ -174,11 +167,7 @@ expect(placeholder_user).to be_present expect(Principal.possible_assignee(project).to_a).to include placeholder_user full_view.visit! - - # Go to add cost entry page - SeleniumHubWaiter.wait - find("#action-show-more-dropdown-menu .button").click - find(".menu-item", text: I18n.t(:button_log_costs)).click + full_view.select_log_unit_costs_action SeleniumHubWaiter.wait expect(page).to have_no_css("#cost_entry_user_id option", text: placeholder_user.name, visible: :all) diff --git a/modules/costs/spec/features/time_entries_spec.rb b/modules/costs/spec/features/time_entries_spec.rb index a754a7dc51f5..1ea9a23c9731 100644 --- a/modules/costs/spec/features/time_entries_spec.rb +++ b/modules/costs/spec/features/time_entries_spec.rb @@ -28,7 +28,7 @@ require_relative "../spec_helper" -RSpec.describe "Work Package table cost entries", :js do +RSpec.describe "Work Package table time entries", :js do shared_let(:project) { create(:project_with_types) } shared_let(:user) { create(:admin) } diff --git a/modules/costs/spec/features/time_entry_dialog_spec.rb b/modules/costs/spec/features/time_entry_dialog_spec.rb new file mode 100644 index 000000000000..ac2f56cb27ae --- /dev/null +++ b/modules/costs/spec/features/time_entry_dialog_spec.rb @@ -0,0 +1,214 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require File.expand_path("#{File.dirname(__FILE__)}/../spec_helper.rb") + +RSpec.describe "time entry dialog", :js, with_flag: :track_start_and_end_times_for_time_entries do + include Redmine::I18n + + shared_let(:project) { create(:project_with_types) } + + shared_let(:work_package_a) { create(:work_package, subject: "WP A", project:) } + shared_let(:work_package_b) { create(:work_package, subject: "WP B", project:) } + + let(:time_logging_modal) { Components::TimeLoggingModal.new } + + let(:user) { create(:user, member_with_permissions: { project => permissions }) } + + before do + login_as user + end + + context "when user has permission to log own time" do + let(:permissions) { %i[log_own_time view_own_time_entries view_work_packages] } + + before do + visit work_package_path(work_package_a) + + find("#action-show-more-dropdown-menu .button").click + find(".menu-item", text: "Log time").click + end + + it "does not show the user autocompleter" do + time_logging_modal.is_visible(true) + time_logging_modal.shows_field("user_id", false) + end + + context "when start and end time is not allowed", with_settings: { allow_tracking_start_and_end_times: false } do + it "does not show fields to track start and end times" do + time_logging_modal.shows_field("start_time", false) + time_logging_modal.shows_field("end_time", false) + time_logging_modal.shows_field("hours", true) + end + end + + context "when start and end time is allowed", with_settings: { allow_tracking_start_and_end_times: true } do + it "shows fields to track start and end times" do + time_logging_modal.shows_field("start_time", true) + time_logging_modal.requires_field("start_time", required: false) + time_logging_modal.shows_field("end_time", true) + time_logging_modal.requires_field("end_time", required: false) + time_logging_modal.shows_field("hours", true) + end + end + + context "when start and end time is enforced", + with_settings: { allow_tracking_start_and_end_times: true, enforce_tracking_start_and_end_times: true } do + it "shows fields to track start and end times" do + time_logging_modal.shows_field("start_time", true) + time_logging_modal.requires_field("start_time") + time_logging_modal.shows_field("end_time", true) + time_logging_modal.requires_field("end_time") + time_logging_modal.shows_field("hours", true) + end + end + end + + context "when user has permission to log time for others" do + let!(:other_user) do + create( + :user, + firstname: "Max", + lastname: "Mustermann", + preferences: { + time_zone: "Asia/Tokyo" + }, + member_with_permissions: { project => [:view_project] } + ) + end + let(:permissions) { %i[log_time view_time_entries view_work_packages] } + + before do + visit work_package_path(work_package_a) + + find("#action-show-more-dropdown-menu .button").click + find(".menu-item", text: "Log time").click + end + + it "shows the user autocompleter and prefills it with the current user" do + time_logging_modal.is_visible(true) + time_logging_modal.shows_field("user_id", true) + time_logging_modal.expect_user(user) + + time_logging_modal.update_field("user_id", other_user.name) + + time_logging_modal.expect_user(other_user) + time_logging_modal.shows_caption(I18n.t("notice_different_time_zones", tz: friendly_timezone_name(other_user.time_zone))) + end + end + + describe "calculating logic", with_settings: { allow_tracking_start_and_end_times: true } do + let(:permissions) { %i[log_own_time view_own_time_entries view_work_packages] } + + before do + visit work_package_path(work_package_a) + + find("#action-show-more-dropdown-menu .button").click + find(".menu-item", text: "Log time").click + end + + it "normalizes the hour input" do + time_logging_modal.update_field("hours", "6h 45min") + time_logging_modal.has_field_with_value("hours", "6.75h") + + time_logging_modal.update_field("hours", "4:15") + time_logging_modal.has_field_with_value("hours", "4.25h") + + time_logging_modal.update_field("hours", "1m 2w 3d 4h 5m") + time_logging_modal.has_field_with_value("hours", "412.1h") + + time_logging_modal.update_field("hours", "1.5") + time_logging_modal.has_field_with_value("hours", "1.5h") + + time_logging_modal.update_field("hours", "3,7") + time_logging_modal.has_field_with_value("hours", "3.7h") + end + + it "calculates the hours based on the start and end time" do + time_logging_modal.update_time_field("start_time", hour: 10, minute: 0) + time_logging_modal.update_time_field("end_time", hour: 12, minute: 30) + + time_logging_modal.has_field_with_value("hours", "2.5h") + end + + it "correctly handles when end_time < start_time (multiple days)" do + time_logging_modal.update_time_field("start_time", hour: 10, minute: 0) + time_logging_modal.update_time_field("end_time", hour: 9, minute: 45) + + time_logging_modal.has_field_with_value("hours", "23.75h") + time_logging_modal.shows_caption("+1 day") + end + + it "correctly handles when hours > 24" do + time_logging_modal.update_time_field("start_time", hour: 10, minute: 0) + time_logging_modal.update_field("hours", "50h") + + time_logging_modal.has_field_with_value("end_time", "12:00") + time_logging_modal.shows_caption("+2 days") + end + + it "calculates the end time based on start time and hours" do + time_logging_modal.update_time_field("start_time", hour: 10, minute: 0) + time_logging_modal.update_field("hours", "3h") + + time_logging_modal.has_field_with_value("end_time", "13:00") + end + + it "calculates the start time based on end time and hours" do + time_logging_modal.update_time_field("end_time", hour: 10, minute: 0) + time_logging_modal.update_field("hours", "3h") + + time_logging_modal.has_field_with_value("start_time", "07:00") + end + + it "recalculates the end time, when changing the hours field" do + time_logging_modal.update_time_field("start_time", hour: 10, minute: 0) + time_logging_modal.update_time_field("end_time", hour: 12, minute: 30) + + time_logging_modal.has_field_with_value("hours", "2.5h") + + time_logging_modal.update_field("hours", "6h") + + time_logging_modal.has_field_with_value("end_time", "16:00") + end + + it "recalculates the end time, when changing the start_time field" do + time_logging_modal.update_time_field("start_time", hour: 10, minute: 0) + time_logging_modal.update_time_field("end_time", hour: 12, minute: 30) + + time_logging_modal.has_field_with_value("hours", "2.5h") + + time_logging_modal.update_time_field("start_time", hour: 12, minute: 0) + + time_logging_modal.has_field_with_value("end_time", "14:30") + time_logging_modal.has_field_with_value("hours", "2.5h") + end + end +end diff --git a/modules/costs/spec/features/timer_spec.rb b/modules/costs/spec/features/timer_spec.rb index 1f3045c48d04..5dbfd03edc18 100644 --- a/modules/costs/spec/features/timer_spec.rb +++ b/modules/costs/spec/features/timer_spec.rb @@ -28,7 +28,7 @@ require_relative "../spec_helper" -RSpec.describe "Work Package timer", :js do +RSpec.describe "Work Package timer", :js, :selenium do shared_let(:project) { create(:project_with_types) } shared_let(:work_package_a) { create(:work_package, subject: "WP A", project:) } @@ -65,16 +65,15 @@ time_logging_modal.is_visible true - time_logging_modal.has_field_with_value "spentOn", Date.current.strftime + time_logging_modal.has_field_with_value "spent_on", Date.current.strftime time_logging_modal.has_field_with_value "hours", /(\d\.)?\d+/ - time_logging_modal.work_package_is_missing false + time_logging_modal.activity_input_disabled_because_work_package_missing? false # wait for available_work_packages query to finish before saving - time_logging_modal.expect_work_package(work_package_a.subject) + time_logging_modal.expect_work_package(work_package_a) - time_logging_modal.perform_action "Save" + time_logging_modal.submit time_logging_modal.is_visible false - wp_view_a.expect_and_dismiss_toaster message: I18n.t(:notice_successful_update) timer_button.expect_inactive timer_entry.reload @@ -101,18 +100,17 @@ expect(timer_entry.work_package).to eq work_package_a expect(timer_entry.hours).to be_nil - page.within(".spot-modal") { click_button "Stop current timer" } + page.within(".spot-modal") { click_on "Stop current timer" } time_logging_modal.is_visible true - time_logging_modal.has_field_with_value "spentOn", Date.current.strftime + time_logging_modal.has_field_with_value "spent_on", Date.current.strftime time_logging_modal.has_field_with_value "hours", /(\d\.)?\d+/ - time_logging_modal.work_package_is_missing false + time_logging_modal.activity_input_disabled_because_work_package_missing? false # wait for available_work_packages query to finish before saving - time_logging_modal.expect_work_package(work_package_a.subject) + time_logging_modal.expect_work_package(work_package_a) - time_logging_modal.perform_action "Save" + time_logging_modal.submit # Closing the modal starts the next timer - wp_view_b.expect_and_dismiss_toaster message: I18n.t(:notice_successful_update) time_logging_modal.is_visible false timer_button.expect_active @@ -130,7 +128,7 @@ end context "when user has permission to log time" do - let(:permissions) { %i[log_own_time edit_own_time_entries view_own_time_entries view_work_packages] } + let(:permissions) { %i[log_own_time edit_own_time_entries view_own_time_entries view_work_packages view_project] } it_behaves_like "allows time tracking" @@ -166,42 +164,40 @@ expect(page).to have_css(".op-timer-stop-modal") expect(page).to have_text("Tracking time:") - page.within(".spot-modal") { click_button "Stop current timer" } + page.within(".spot-modal") { click_on "Stop current timer" } + time_logging_modal.is_visible true - time_logging_modal.has_field_with_value "spentOn", Date.current.strftime + time_logging_modal.has_field_with_value "spent_on", Date.current.strftime time_logging_modal.has_field_with_value "hours", /(\d\.)?\d+/ - time_logging_modal.work_package_is_missing false + time_logging_modal.activity_input_disabled_because_work_package_missing? false # wait for available_work_packages query to finish before saving - time_logging_modal.expect_work_package(work_package_a.subject) + time_logging_modal.expect_work_package(work_package_a) - time_logging_modal.perform_action "Save" - wp_view_b.expect_and_dismiss_toaster message: I18n.t(:notice_successful_update) + time_logging_modal.submit time_logging_modal.is_visible false timer_button.expect_active timer_button.stop time_logging_modal.is_visible true - time_logging_modal.has_field_with_value "spentOn", Date.current.strftime + time_logging_modal.has_field_with_value "spent_on", Date.current.strftime time_logging_modal.has_field_with_value "hours", /(\d\.)?\d+/ - time_logging_modal.work_package_is_missing false + time_logging_modal.activity_input_disabled_because_work_package_missing? false # wait for available_work_packages query to finish before saving - time_logging_modal.expect_work_package(work_package_a.subject) + time_logging_modal.expect_work_package(work_package_a) - time_logging_modal.perform_action "Save" - wp_view_b.expect_and_dismiss_toaster message: I18n.t(:notice_successful_update) + time_logging_modal.submit time_logging_modal.is_visible false timer_button.expect_inactive within_window(second_window) do timer_button.expect_active timer_button.stop - wp_view_b.expect_and_dismiss_toaster message: I18n.t("js.timer.timer_already_stopped"), type: :warning end end end context "when user has no permission to log time" do - let(:permissions) { %i[view_work_packages] } + let(:permissions) { %i[view_work_packages view_project] } it "does not show the timer" do wp_view_a.visit! @@ -213,13 +209,13 @@ end context "when user has permission to add, but not edit or view" do - let(:permissions) { %i[view_work_packages log_own_time] } + let(:permissions) { %i[view_work_packages log_own_time view_project] } it_behaves_like "allows time tracking" end context "when user has permission to add and view but not edit" do - let(:permissions) { %i[view_work_packages log_own_time view_own_logged_time] } + let(:permissions) { %i[view_work_packages log_own_time view_own_logged_time view_project] } it_behaves_like "allows time tracking" end diff --git a/modules/costs/spec/lib/api/v3/time_entries/schemas/time_entry_schema_representer_spec.rb b/modules/costs/spec/lib/api/v3/time_entries/schemas/time_entry_schema_representer_spec.rb index 3eee3e2c1383..c30734b03dff 100644 --- a/modules/costs/spec/lib/api/v3/time_entries/schemas/time_entry_schema_representer_spec.rb +++ b/modules/costs/spec/lib/api/v3/time_entries/schemas/time_entry_schema_representer_spec.rb @@ -108,6 +108,53 @@ end end + describe "startTime" do + let(:path) { "startTime" } + + before do + allow(TimeEntry).to receive_messages( + can_track_start_and_end_time?: can_track_times, + must_track_start_and_end_time?: must_track_times + ) + end + + context "when start- and end-time tracking is disabled" do + let(:can_track_times) { false } + let(:must_track_times) { false } + + it_behaves_like "has basic schema properties" do + let(:type) { "DateTime" } + let(:name) { TimeEntry.human_attribute_name("start_time") } + let(:required) { false } + let(:writable) { false } + end + end + + context "when start- and end-time tracking is enabled" do + let(:can_track_times) { true } + let(:must_track_times) { false } + + it_behaves_like "has basic schema properties" do + let(:type) { "DateTime" } + let(:name) { TimeEntry.human_attribute_name("start_time") } + let(:required) { false } + let(:writable) { true } + end + end + + context "when start- and end-time tracking is enforced" do + let(:can_track_times) { true } + let(:must_track_times) { true } + + it_behaves_like "has basic schema properties" do + let(:type) { "DateTime" } + let(:name) { TimeEntry.human_attribute_name("start_time") } + let(:required) { true } + let(:writable) { true } + end + end + end + describe "hours" do let(:path) { "hours" } diff --git a/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb b/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb index 0c7afd3b3dee..feabb3003911 100644 --- a/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb +++ b/modules/costs/spec/lib/api/v3/time_entries/time_entry_representer_parsing_spec.rb @@ -81,6 +81,7 @@ "raw" => "some comment" }, "spentOn" => "2017-07-28", + "startTime" => "2017-07-28T12:30:00Z", text_custom_field.attribute_name(:camel_case) => { "raw" => "some text" } @@ -129,7 +130,7 @@ end describe "properties" do - context "spentOn" do + describe "spentOn" do it "updates spent_on" do time_entry = representer.from_hash(hash) expect(time_entry.spent_on) @@ -137,7 +138,62 @@ end end - context "hours" do + describe "startTime" do + context "when not tracking start and end time" do + before do + allow(TimeEntry).to receive_messages( + can_track_start_and_end_time?: false, + must_track_start_and_end_time?: false + ) + end + + it "does not set start_time" do + time_entry = representer.from_hash(hash) + expect(time_entry.start_time).to be_nil + end + end + + context "when tracking start and end time" do + before do + allow(TimeEntry).to receive_messages( + can_track_start_and_end_time?: true, + must_track_start_and_end_time?: false + ) + end + + context "when spent_on != start_time date" do + before do + hash["startTime"] = "1980-12-22T12:00:00Z" + end + + it "raises an error" do + expect do + representer.from_hash(hash) + end.to raise_error(API::Errors::Validation) + end + end + + it "sets start_time" do + user.pref[:time_zone] = "Asia/Tokyo" + + time_entry = representer.from_hash(hash) + + # timezone on the TimeEntry would be set to the user's TimeZone via the SetAttribute service, so we need to + # manually set it here + time_entry.time_zone = "Asia/Tokyo" + + # We are sending in 12:30:00 UTC as the start time, in Tokyo time (for 2017-07-28) that equals + # 21:30:00 in Japan Standard Time (JST), so the time should be set to 21:30 + + expect(time_entry.start_time).to eq((21 * 60) + 30) # 21:30 + + expect(time_entry.start_timestamp).to eq(DateTime.parse("2017-07-28T12:30:00Z")) + expect(time_entry.end_timestamp).to eq(DateTime.parse("2017-07-28T17:30:00Z")) + end + end + end + + describe "hours" do it "updates hours" do time_entry = representer.from_hash(hash) expect(time_entry.hours) @@ -159,7 +215,7 @@ end end - context "comment" do + describe "comment" do it "updates comment" do time_entry = representer.from_hash(hash) expect(time_entry.comments) @@ -167,7 +223,7 @@ end end - context "property custom field" do + describe "property custom field" do it "updates the custom value" do time_entry = representer.from_hash(hash) diff --git a/modules/costs/spec/models/time_entry_spec.rb b/modules/costs/spec/models/time_entry_spec.rb index 8f3fa58884d8..10cba11697cd 100644 --- a/modules/costs/spec/models/time_entry_spec.rb +++ b/modules/costs/spec/models/time_entry_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -43,7 +45,7 @@ end let(:user) { create(:user) } let(:user2) { create(:user) } - let(:date) { Date.today } + let(:date) { Time.zone.today } let(:rate) { build(:cost_rate) } let!(:hourly_one) { create(:hourly_rate, valid_from: 2.days.ago, project:, user:) } let!(:hourly_three) { create(:hourly_rate, valid_from: 4.days.ago, project:, user:) } @@ -78,13 +80,19 @@ end def ensure_membership(project, user, permissions) - create(:member, - project:, - user:, - roles: [create(:project_role, permissions:)]) + member = Member.find_by(principal: user, project: project) + + if member + member.roles << create(:project_role, permissions:) + else + create(:member, + project:, + user:, + roles: [create(:project_role, permissions:)]) + end end - describe "#hours" do + describe "#hours=" do formats = { "2" => 2.0, "21.1" => 21.1, "2,1" => 2.1, @@ -104,13 +112,28 @@ def ensure_membership(project, user, permissions) formats.each do |from, to| it "formats '#{from}'" do - t = TimeEntry.new(hours: from) + t = described_class.new(hours: from) expect(t.hours) .to eql to end end end + describe "#start_time=" do + formats = { + "720" => 720, + "12:00" => 720, + "13:37" => 817 + } + + formats.each do |from, to| + it "formats '#{from}'" do + t = described_class.new(start_time: from) + expect(t.start_time).to eql(to) + end + end + end + it "always prefers overridden_costs" do allow(User).to receive(:current).and_return(user) @@ -424,6 +447,17 @@ def ensure_membership(project, user, permissions) expect(time_entry).to be_valid end + it "allows string time values" do + time_entry.start_time = "12:00" + expect(time_entry).to be_valid + end + + it "does not allow times > 23:59" do + time_entry.start_time = "26:00" + expect(time_entry).not_to be_valid + expect(time_entry.errors.full_messages).to include("Start time must be between 00:00 and 23:59.") + end + it "does not allow non integer values" do time_entry.start_time = 1.5 expect(time_entry).not_to be_valid @@ -433,9 +467,7 @@ def ensure_membership(project, user, permissions) time_entry.start_time = -42 expect(time_entry).not_to be_valid end - end - describe "start_time and end_time" do context "when enforcing times" do before do allow(described_class).to receive(:must_track_start_and_end_time?).and_return(true) diff --git a/modules/costs/spec/requests/api/time_entries/create_resource_spec.rb b/modules/costs/spec/requests/api/time_entries/create_resource_spec.rb new file mode 100644 index 000000000000..2c0c4c09ba76 --- /dev/null +++ b/modules/costs/spec/requests/api/time_entries/create_resource_spec.rb @@ -0,0 +1,125 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" +require "rack/test" + +RSpec.describe "API v3 Time Entries resource", + content_type: :json, + with_flag: :track_start_and_end_times_for_time_entries, + with_settings: { allow_tracking_start_and_end_times: true } do + include Rack::Test::Methods + include API::V3::Utilities::PathHelper + + let(:project) { create(:project) } + let(:active_activity) { create(:time_entry_activity) } + let(:work_package) { create(:work_package, project:) } + let(:permissions) { %i[log_time view_work_packages] } + + let(:german_user) do + create(:user, member_with_permissions: { project => permissions }, preferences: { time_zone: "Europe/Berlin" }) + end + let(:japanese_user) do + create(:user, member_with_permissions: { project => [:view_project] }, preferences: { time_zone: "Asia/Tokyo" }) + end + + let(:path) { api_v3_paths.time_entries } + let(:parameters) { {} } + let(:json_response) { JSON.parse(response.body) } + + subject(:response) { last_response } + + describe "#POST /api/v3/time_entries" do + before do + login_as(german_user) + end + + describe "correct time zone handling for start time" do + context "when logging time for yourself" do + let(:parameters) do + { + _links: { + workPackage: { href: api_v3_paths.work_package(work_package.id) }, + project: { href: api_v3_paths.project(project.id) }, + activity: { href: api_v3_paths.time_entries_activity(active_activity.id) } + }, + spentOn: "2024-12-24", + hours: "PT2H", + startTime: "2024-12-24T12:00:00Z" + } + end + + it "creates the time entry and sets the start time to the users timezone" do + post path, parameters.to_json + + expect(subject).to have_http_status(:created) + time_entry_id = json_response["id"] + time_entry = TimeEntry.find(time_entry_id) + + expect(time_entry.spent_on).to eq(Date.new(2024, 12, 24)) + expect(time_entry.hours).to eq(2) + expect(time_entry.start_time).to eq(13 * 60) # 12:00 UTC = 13:00 Berlin on December 24th, 2024 + expect(time_entry.time_zone).to eq("Europe/Berlin") + expect(time_entry.user).to eq(german_user) + end + end + + context "when logging time for another user" do + let(:parameters) do + { + _links: { + user: { href: api_v3_paths.user(japanese_user.id) }, + workPackage: { href: api_v3_paths.work_package(work_package.id) }, + project: { href: api_v3_paths.project(project.id) }, + activity: { href: api_v3_paths.time_entries_activity(active_activity.id) } + }, + spentOn: "2024-12-24", + hours: "PT2H", + startTime: "2024-12-24T12:00:00Z" + } + end + + it "creates the time entry and sets the start time to the users timezone" do + post path, parameters.to_json + + expect(subject).to have_http_status(:created) + time_entry_id = json_response["id"] + time_entry = TimeEntry.find(time_entry_id) + + expect(time_entry.spent_on).to eq(Date.new(2024, 12, 24)) + expect(time_entry.hours).to eq(2) + expect(time_entry.start_time).to eq(21 * 60) # 12:00 UTC = 21:00 Tokyo on Dec 24th, 2024 + expect(time_entry.time_zone).to eq("Asia/Tokyo") + expect(time_entry.user).to eq(japanese_user) + end + end + end + end +end diff --git a/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb b/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb index 77a9df6785cd..6451e6030c7e 100644 --- a/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb +++ b/modules/costs/spec/requests/api/time_entries/update_form_resource_spec.rb @@ -196,10 +196,10 @@ let(:user) do user = time_entry.user - create(:member, - project: time_entry.project, - roles: [create(:project_role, permissions:)], - principal: user) + user + .members + .find_by(project: project) + .update(roles: [create(:project_role, permissions: permissions)]) user end diff --git a/modules/costs/spec/requests/api/time_entry_resource_spec.rb b/modules/costs/spec/requests/api/time_entry_resource_spec.rb index 1117df243b15..745961034f6f 100644 --- a/modules/costs/spec/requests/api/time_entry_resource_spec.rb +++ b/modules/costs/spec/requests/api/time_entry_resource_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -284,10 +286,7 @@ end before do - create(:member, - roles: [role], - project: other_project, - user: current_user) + current_user.members.find_by(project: other_project).roles << role get path end @@ -330,6 +329,76 @@ .at_path("errorIdentifier") end end + + context "when start- & end-time tracking is enabled", + with_flag: { track_start_and_end_times_for_time_entries: true }, + with_settings: { allow_tracking_start_and_end_times: true } do + context "when start and end time were tracked" do + let!(:time_entry) do + create(:time_entry, :with_start_and_end_time, project:, work_package:, user: current_user) + end + + it "includes start and end timestamps in the API response" do + get api_v3_paths.time_entries + + expect(subject.body) + .to be_json_eql(time_entry.start_timestamp.utc.to_json) + .at_path("_embedded/elements/0/startTime") + + expect(subject.body) + .to be_json_eql(time_entry.end_timestamp.utc.to_json) + .at_path("_embedded/elements/0/endTime") + end + end + + context "when start and end time were not tracked" do + let!(:time_entry) do + create(:time_entry, project:, work_package:, user: current_user) + end + + it "returns nil as start and end timestamps in the API response" do + get api_v3_paths.time_entries + + expect(subject.body) + .to be_json_eql(nil.to_json) + .at_path("_embedded/elements/0/startTime") + + expect(subject.body) + .to be_json_eql(nil.to_json) + .at_path("_embedded/elements/0/endTime") + end + end + end + + context "when start- & end-time tracking is disabled", + with_flag: { track_start_and_end_times_for_time_entries: false }, + with_settings: { allow_tracking_start_and_end_times: false } do + context "when start and end time were tracked" do + let!(:time_entry) do + create(:time_entry, :with_start_and_end_time, project:, work_package:, user: current_user) + end + + it "does not include start and end time fields" do + get api_v3_paths.time_entries + + expect(subject.body).not_to have_json_path("_embedded/elements/0/startTime") + expect(subject.body).not_to have_json_path("_embedded/elements/0/endTime") + end + end + + context "when start and end time were not tracked" do + let!(:time_entry) do + create(:time_entry, project:, work_package:, user: current_user) + end + + it "does not include start and end time fields" do + get api_v3_paths.time_entries + + expect(subject.body).not_to have_json_path("_embedded/elements/0/startTime") + expect(subject.body).not_to have_json_path("_embedded/elements/0/endTime") + end + end + end end describe "GET /api/v3/time_entries/:id" do @@ -617,7 +686,7 @@ end it "removes the time_entry from the DB" do - expect(TimeEntry.exists?(time_entry.id)).to be_falsey + expect(TimeEntry).not_to exist(time_entry.id) end end @@ -627,7 +696,7 @@ end it "does not delete the time_entry" do - expect(TimeEntry.exists?(time_entry.id)).to be_truthy + expect(TimeEntry).to exist(time_entry.id) end end diff --git a/modules/costs/spec/services/time_entries/set_attributes_service_spec.rb b/modules/costs/spec/services/time_entries/set_attributes_service_spec.rb index c80114b25eb1..f04a650832ba 100644 --- a/modules/costs/spec/services/time_entries/set_attributes_service_spec.rb +++ b/modules/costs/spec/services/time_entries/set_attributes_service_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -38,14 +40,12 @@ let(:hours) { 5.0 } let(:comments) { "some comment" } let(:contract_instance) do - contract = double("contract_instance") # rubocop:disable RSpec/VerifiedDoubles - allow(contract) - .to receive(:validate) - .and_return(contract_valid) - allow(contract) - .to receive(:errors) - .and_return(contract_errors) - contract + double("contract_instance").tap do |contract| # rubocop:disable RSpec/VerifiedDoubles + allow(contract).to receive_messages( + validate: contract_valid, + errors: contract_errors + ) + end end let(:contract_errors) { double("contract_errors") } # rubocop:disable RSpec/VerifiedDoubles @@ -101,17 +101,6 @@ .to eql [nil, user.id] end - it "assigns the default TimeEntryActivity" do - allow(TimeEntryActivity) - .to receive(:default) - .and_return(default_activity) - - subject - - expect(time_entry_instance.activity) - .to eql default_activity - end - context "with params" do let(:params) do { @@ -148,6 +137,58 @@ end end + context "with a user with a defined timezone" do + it "extracts the current timezone from the user and stores it in the time entry" do + user.pref[:time_zone] = "America/Los_Angeles" + subject + + expect(time_entry_instance.time_zone).to eq "America/Los_Angeles" + end + end + + context "with an ongoing time entry" do + let(:params) do + { + spent_on: Time.zone.today, + ongoing: true, + user_id: user.id, + work_package_id: work_package.id, + activity_id: activity.id + } + end + + before do + user.pref[:time_zone] = "America/Los_Angeles" + end + + context "when start_time is allowed" do + before do + allow(TimeEntry).to receive(:can_track_start_and_end_time?).and_return(true) + end + + it "sets the start_time to the users current time" do + Timecop.freeze do + subject + + current_time = ActiveSupport::TimeZone[user.time_zone].now + + expect(time_entry_instance.start_time).to eq((current_time.hour * 60) + current_time.min) + end + end + end + + context "when start_time is not allowed" do + before do + allow(TimeEntry).to receive(:can_track_start_and_end_time?).and_return(false) + end + + it "does not set the start_time" do + subject + expect(time_entry_instance.start_time).to be_nil + end + end + end + context "with hours == 0" do let(:params) do { diff --git a/modules/dashboards/config/locales/crowdin/tr.yml b/modules/dashboards/config/locales/crowdin/tr.yml index bd97cc265160..9fb6f369b4e8 100644 --- a/modules/dashboards/config/locales/crowdin/tr.yml +++ b/modules/dashboards/config/locales/crowdin/tr.yml @@ -1,4 +1,4 @@ tr: dashboards: - label: 'Gösterge panosu' - project_module_dashboards: 'Gösterge paneli' + label: 'Gösterge panelleri' + project_module_dashboards: 'Gösterge panelleri' diff --git a/modules/dashboards/spec/features/project_status_spec.rb b/modules/dashboards/spec/features/project_status_spec.rb index 60eaa9a6ffec..ae1fa82de54a 100644 --- a/modules/dashboards/spec/features/project_status_spec.rb +++ b/modules/dashboards/spec/features/project_status_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/dashboard" -RSpec.describe "Project status widget on dashboard", :js do +RSpec.describe "Project status widget on dashboard", :js, :selenium do let!(:project) do create(:project, status_code: "on_track", diff --git a/modules/dashboards/spec/features/time_entries_spec.rb b/modules/dashboards/spec/features/time_entries_spec.rb index 5f223fa94058..c4083285ee1b 100644 --- a/modules/dashboards/spec/features/time_entries_spec.rb +++ b/modules/dashboards/spec/features/time_entries_spec.rb @@ -30,22 +30,18 @@ require_relative "../support/pages/dashboard" -RSpec.describe "Time entries widget on dashboard", :js do +RSpec.describe "Time entries widget on dashboard", :js, :with_cuprite do let!(:type) { create(:type) } let!(:project) { create(:project, types: [type]) } let!(:other_project) { create(:project, types: [type]) } - let!(:work_package) do - create(:work_package, - project:, - type:, - author: user) - end + let!(:work_package) { create(:work_package, project:, type:, author: user) } + let!(:other_work_package) { create(:work_package, project: other_project, type:, author: user) } let!(:visible_time_entry) do create(:time_entry, work_package:, project:, user:, - spent_on: Date.today, + spent_on: Time.zone.today, hours: 6, comments: "My comment") end @@ -54,13 +50,13 @@ work_package:, project:, user: other_user, - spent_on: Date.today - 1.day, + spent_on: 1.day.ago.to_date, hours: 5, comments: "Another`s comment") end let!(:invisible_time_entry) do create(:time_entry, - work_package:, + work_package: other_work_package, project: other_project, user:, hours: 4) @@ -102,30 +98,19 @@ spent_time_widget = Components::Grids::GridArea.new(".grid--area.-widgeted:nth-of-type(1)") within spent_time_widget.area do - expect(page) - .to have_content "Total: 11 h" - - expect(page) - .to have_content Date.today.strftime("%m/%d/%Y") - expect(page) - .to have_css(".activity", text: visible_time_entry.activity.name) - expect(page) - .to have_css(".subject", text: "#{project.name} - ##{work_package.id}: #{work_package.subject}") - expect(page) - .to have_css(".comments", text: visible_time_entry.comments) - expect(page) - .to have_css(".hours", text: visible_time_entry.hours) - - expect(page) - .to have_content((Date.today - 1.day).strftime("%m/%d/%Y")) - expect(page) - .to have_css(".activity", text: other_visible_time_entry.activity.name) - expect(page) - .to have_css(".subject", text: "#{project.name} - ##{work_package.id}: #{work_package.subject}") - expect(page) - .to have_css(".comments", text: other_visible_time_entry.comments) - expect(page) - .to have_css(".hours", text: other_visible_time_entry.hours) + expect(page).to have_content "Total: 11 h" + + expect(page).to have_content Time.zone.today.strftime("%m/%d/%Y") + expect(page).to have_css(".activity", text: visible_time_entry.activity.name) + expect(page).to have_css(".subject", text: "#{project.name} - ##{work_package.id}: #{work_package.subject}") + expect(page).to have_css(".comments", text: visible_time_entry.comments) + expect(page).to have_css(".hours", text: visible_time_entry.hours) + + expect(page).to have_content(1.day.ago.strftime("%m/%d/%Y")) + expect(page).to have_css(".activity", text: other_visible_time_entry.activity.name) + expect(page).to have_css(".subject", text: "#{project.name} - ##{work_package.id}: #{work_package.subject}") + expect(page).to have_css(".comments", text: other_visible_time_entry.comments) + expect(page).to have_css(".hours", text: other_visible_time_entry.hours) # Allows to edit page.find_test_selector("edit-time-entry-#{visible_time_entry.id}").click @@ -133,13 +118,13 @@ time_logging_modal.is_visible true - time_logging_modal.expect_work_package work_package.subject + time_logging_modal.expect_work_package work_package time_logging_modal.update_field "hours", 4 sleep(0.1) - time_logging_modal.perform_action "Save" + time_logging_modal.submit time_logging_modal.is_visible false within spent_time_widget.area do diff --git a/modules/dashboards/spec/features/work_package_graph_overview_spec.rb b/modules/dashboards/spec/features/work_package_graph_overview_spec.rb index b98bc0f99cf5..19b7231c2179 100644 --- a/modules/dashboards/spec/features/work_package_graph_overview_spec.rb +++ b/modules/dashboards/spec/features/work_package_graph_overview_spec.rb @@ -82,7 +82,7 @@ end # As a graph is rendered as a canvas, we have limited abilities to test the widget - it "can add the widget" do + it "can add the widget", :selenium do sleep(0.1) dashboard.add_widget(1, 1, :within, "Work packages overview") diff --git a/modules/dashboards/spec/features/work_package_graph_spec.rb b/modules/dashboards/spec/features/work_package_graph_spec.rb index dfd6c8885b2b..4f71d0c9e45a 100644 --- a/modules/dashboards/spec/features/work_package_graph_spec.rb +++ b/modules/dashboards/spec/features/work_package_graph_spec.rb @@ -30,7 +30,10 @@ require_relative "../support/pages/dashboard" -RSpec.describe "Arbitrary WorkPackage query graph widget dashboard", :js, with_ee: %i[grid_widget_wp_graph] do +RSpec.describe "Arbitrary WorkPackage query graph widget dashboard", + :js, + :selenium, + with_ee: %i[grid_widget_wp_graph] do let!(:type) { create(:type) } let!(:other_type) { create(:type) } let!(:priority) { create(:default_priority) } diff --git a/modules/dashboards/spec/features/work_package_table_spec.rb b/modules/dashboards/spec/features/work_package_table_spec.rb index efd15a765a84..88b254bf8fad 100644 --- a/modules/dashboards/spec/features/work_package_table_spec.rb +++ b/modules/dashboards/spec/features/work_package_table_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/dashboard" -RSpec.describe "Arbitrary WorkPackage query table widget dashboard", :js do +RSpec.describe "Arbitrary WorkPackage query table widget dashboard", :js, :selenium do let!(:type) { create(:type) } let!(:other_type) { create(:type) } let!(:priority) { create(:default_priority) } diff --git a/modules/documents/spec/features/attachment_upload_spec.rb b/modules/documents/spec/features/attachment_upload_spec.rb index e8c424138221..6d82d2277199 100644 --- a/modules/documents/spec/features/attachment_upload_spec.rb +++ b/modules/documents/spec/features/attachment_upload_spec.rb @@ -29,7 +29,9 @@ require "spec_helper" require "features/page_objects/notification" -RSpec.describe "Upload attachment to documents", :js, +RSpec.describe "Upload attachment to documents", + :js, + :selenium, with_settings: { journal_aggregation_time_minutes: 0 } do diff --git a/modules/github_integration/config/locales/crowdin/js-tr.yml b/modules/github_integration/config/locales/crowdin/js-tr.yml index 79ebcc19a2e2..b2acfc7c5a09 100644 --- a/modules/github_integration/config/locales/crowdin/js-tr.yml +++ b/modules/github_integration/config/locales/crowdin/js-tr.yml @@ -25,15 +25,15 @@ tr: work_packages: tab_name: "GitHub" tab_header: - title: "İstekleri getir" + title: "Çekme istekleri" copy_menu: label: Git snippetları description: Git snippet'lerini panoya kopyala git_actions: branch_name: Dal adı - commit_message: Mesaj işle + commit_message: İşlem mesajı cmd: Boş işlemle dal oluştur - title: Git için hızlı snippet'ler + title: Git için hızlı kod parçaları copy_success: '✅ Kopyalandı!' copy_error: '❌ Kopyalanamadı!' tab_prs: diff --git a/modules/github_integration/config/locales/crowdin/tr.yml b/modules/github_integration/config/locales/crowdin/tr.yml index bcb7f6805305..b625d2c58a27 100644 --- a/modules/github_integration/config/locales/crowdin/tr.yml +++ b/modules/github_integration/config/locales/crowdin/tr.yml @@ -24,7 +24,7 @@ tr: label_deploy_target: Deploy target label_deploy_target_new: New deploy target label_deploy_target_plural: Deploy targets - label_github_integration: GitHub Integration + label_github_integration: GitHub Entegrasyonu notice_deploy_target_created: Deploy target created notice_deploy_target_destroyed: Deploy target deleted plugin_openproject_github_integration: diff --git a/modules/github_integration/frontend/module/git-actions/git-actions.service.ts b/modules/github_integration/frontend/module/git-actions/git-actions.service.ts index 21fdb96322c8..eeece1315e5d 100644 --- a/modules/github_integration/frontend/module/git-actions/git-actions.service.ts +++ b/modules/github_integration/frontend/module/git-actions/git-actions.service.ts @@ -38,8 +38,8 @@ export class GitActionsService { return str .replace(/&/g, 'and ') // & becomes and .replace(/ +/g, '-') // Spaces become dashes - .replace(/[\000-\039]/g, '') // ASCII control characters are out - .replace(/\177/g, '') // DEL is out + .replace(/[\x00-\x1F]/g, '') // ASCII control characters are out + .replace(/\x7F/g, '') // DEL is out .replace(/[#\\\/\?\*\~\^\:\{\}@\.\[\]'"]/g, '') // Some other characters with special rules are out .replace(/^[-]+/g, '') // Dashes at the start are removed .replace(/[-]+$/g, '') // Dashes at the end are removed diff --git a/modules/github_integration/frontend/module/github-tab/github-tab.component.spec.ts b/modules/github_integration/frontend/module/github-tab/github-tab.component.spec.ts index 2ca3890a6400..0e0fce00cfde 100644 --- a/modules/github_integration/frontend/module/github-tab/github-tab.component.spec.ts +++ b/modules/github_integration/frontend/module/github-tab/github-tab.component.spec.ts @@ -49,7 +49,7 @@ describe('GitHubTabComponent.', () => { it('should render header and pull requests components', () => { const tabHeader = fixture.debugElement.query(By.css('tab-header')); - const tabPrs = fixture.debugElement.query(By.css('tab-prs')); + const tabPrs = fixture.debugElement.query(By.css('op-tab-prs')); expect(tabHeader).toBeTruthy(); expect(tabPrs).toBeTruthy(); diff --git a/modules/github_integration/frontend/module/pull-request/pull-request.component.spec.ts b/modules/github_integration/frontend/module/pull-request/pull-request.component.spec.ts index 939eb256fd82..8cadf85ee088 100644 --- a/modules/github_integration/frontend/module/pull-request/pull-request.component.spec.ts +++ b/modules/github_integration/frontend/module/pull-request/pull-request.component.spec.ts @@ -2,6 +2,9 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; import { Component, DebugElement, Input } from '@angular/core'; import { By } from "@angular/platform-browser"; import { PullRequestComponent } from "./pull-request.component"; +import { OpIconComponent } from 'core-app/shared/components/icon/icon.component'; +import { IGithubCheckRunResource, IGithubPullRequest, IGithubUserResource } from '../state/github-pull-request.model'; +import { PullRequestStateComponent } from './pull-request-state.component'; @Component({ selector: 'op-date-time', @@ -15,12 +18,12 @@ describe('PullRequestComponent', () => { let component:PullRequestComponent; let fixture:ComponentFixture; let element:DebugElement; - const githubUser = { + const githubUser:IGithubUserResource = { avatarUrl: 'testavatarurl', htmlUrl: 'test htmlUrl', login: 'test login', }; - const checkRun = { + const checkRun:IGithubCheckRunResource = { appOwnerAvatarUrl: 'test appOwnerAvatarUrl', completedAt: 'test completedAt', conclusion: 'test conclusion', @@ -32,7 +35,8 @@ describe('PullRequestComponent', () => { startedAt: 'test startedAt', status: 'test status', }; - const pullRequestStub = { + const pullRequestStub:IGithubPullRequest = { + id: 3, additionsCount: 3, body:{ format: '', @@ -46,19 +50,31 @@ describe('PullRequestComponent', () => { draft: false, githubUpdatedAt: 'test githubUpdatedAt', htmlUrl: 'test htmlUrl', - id: 3, labels: ['test'], merged: false, - mergedAt: false, - mergedBy: githubUser, + mergedAt: '', number: 3, repository: 'test repository', + repositoryHtmlUrl: 'test repositoryHtmlUrl', reviewCommentsCount: 3, state: 'open', title: 'test title', updatedAt: 'test updatedAt', - githubUser, - checkRuns:[checkRun], + _links: { + githubUser: { + href: 'test api url', + title: 'test github user' + }, + self: { + href: 'this url', + title: 'this title' + } + }, + _embedded: { + githubUser, + mergedBy: githubUser, + checkRuns:[checkRun], + } } beforeEach(async () => { @@ -67,6 +83,8 @@ describe('PullRequestComponent', () => { declarations: [ PullRequestComponent, OpDateTimeComponent, + OpIconComponent, + PullRequestStateComponent, ], }) .compileComponents(); @@ -89,18 +107,18 @@ describe('PullRequestComponent', () => { it('should render pull request data', () => { const titleElement = fixture.debugElement.query(By.css('.op-pull-request--title')).nativeElement; const avatarElement = fixture.debugElement.query(By.css('.op-avatar')).nativeElement; - const userElement = fixture.debugElement.query(By.css('.op-pull-request--user')).nativeElement; + const userElement = fixture.debugElement.query(By.css('.op-principal')).nativeElement; const detailsElement = fixture.debugElement.query(By.css('.op-pull-request--link')).nativeElement; const checkRuns = fixture.debugElement.queryAll(By.css('.op-pr-check')); const checkRunElement = checkRuns[0].nativeElement; const checkRunLinkElement = checkRuns[0].query(By.css('a')).nativeElement; expect(titleElement.textContent).toContain(pullRequestStub.title); - expect(avatarElement.src).toContain(pullRequestStub.githubUser.avatarUrl); - expect(userElement.textContent).toContain(pullRequestStub.githubUser.login); + expect(avatarElement.src).toContain(pullRequestStub._embedded.githubUser.avatarUrl); + expect(userElement.textContent).toContain(pullRequestStub._embedded.githubUser.login); expect(detailsElement.textContent).toContain(`${pullRequestStub.repository}#${pullRequestStub.number}`); expect(checkRuns.length).toBe(1); - expect(checkRunElement.textContent).toContain(pullRequestStub.checkRuns[0].name); - expect(checkRunLinkElement.href).toContain(pullRequestStub.checkRuns[0].detailsUrl); + expect(checkRunElement.textContent).toContain(pullRequestStub._embedded.checkRuns[0].name); + expect(checkRunLinkElement.href).toContain(pullRequestStub._embedded.checkRuns[0].detailsUrl); }); }); diff --git a/modules/github_integration/frontend/module/tab-prs/tab-prs.component.spec.ts b/modules/github_integration/frontend/module/tab-prs/tab-prs.component.spec.ts index 2627254b677e..b3eb629fc266 100644 --- a/modules/github_integration/frontend/module/tab-prs/tab-prs.component.spec.ts +++ b/modules/github_integration/frontend/module/tab-prs/tab-prs.component.spec.ts @@ -3,12 +3,14 @@ import { ChangeDetectorRef, Component, DebugElement, Input } from '@angular/core import { OpIconComponent } from "core-app/shared/components/icon/icon.component"; import { GitActionsMenuDirective } from "core-app/features/plugins/linked/openproject-github_integration/git-actions-menu/git-actions-menu.directive"; import { TabPrsComponent } from "core-app/features/plugins/linked/openproject-github_integration/tab-prs/tab-prs.component"; -import { HalResourceService } from "core-app/features/hal/services/hal-resource.service"; +import { GithubPullRequestResourceService } from '../state/github-pull-request.service'; import { ApiV3Service } from "core-app/core/apiv3/api-v3.service"; import { of } from "rxjs"; import { PullRequestComponent } from "core-app/features/plugins/linked/openproject-github_integration/pull-request/pull-request.component"; import { By } from "@angular/platform-browser"; import { I18nService } from "core-app/core/i18n/i18n.service"; +import { IGithubPullRequest } from '../state/github-pull-request.model'; +import { PullRequestStateComponent } from '../pull-request/pull-request-state.component'; @Component({ selector: 'op-date-time', @@ -23,7 +25,7 @@ describe('TabPrsComponent', () => { let component:TabPrsComponent; let fixture:ComponentFixture; let element:DebugElement; - let halResourceService: jasmine.SpyObj; + let githubPullRequestResourceServiceSpy:jasmine.SpyObj; let changeDetectorRef: jasmine.SpyObj; const I18nServiceStub = { t: function(key:string) { @@ -35,56 +37,95 @@ describe('TabPrsComponent', () => { id: () => ({github_pull_requests: 'prpath'}) } } - const pullRequests = { - elements: [ - { - title: 'title 1', + + const pullRequests:IGithubPullRequest[] = [ + { + id: 1, + title: 'title 1', + githubUpdatedAt: 'githubUser 1 githubUpdatedAt', + htmlUrl: 'githubUser 1 htmlUrl', + repository: 'githubUser 1 repository', + repositoryHtmlUrl: 'githubUser 2 repositoryHtmlUrl', + number: 1, + _links: { + githubUser: { + href: 'githubUser 1 api url', + title: 'gitHubUser 1 title' + }, + self: { + href: 'this href', + title: 'this title' + } + }, + _embedded: { githubUser: { avatarUrl: 'githubUser 1 avatarUrl', htmlUrl: 'githubUser 1 htmlUrl', login: 'githubUser 1 login', }, - githubUpdatedAt: 'githubUser 1 githubUpdatedAt', - repository: 'githubUser 1 repository', - number: 'githubUser 1 number', checkRuns: [ { - name: 'githubUser 1 checkRun', - outputTitle: 'githubUser 1 outputTitle', - conclusion: 'githubUser 1 conclusion', - status: 'githubUser 1 status', - detailsUrl: 'githubUser 1 detailsUrl', + appOwnerAvatarUrl: 'githubUser 1 checkRuns appOwnerAvatarUrl', + completedAt: 'githubUser 1 checkRuns completedAt', + conclusion: 'githubUser 1 checkRuns conclusion', + detailsUrl: 'githubUser 1 checkRuns detailsurl', + htmlUrl: 'githubUser 1 checkRuns htmlUrl', + name: 'githubUser 1 checkRuns name', + outputSummary: 'githubUser 1 checkRuns outputSummary', + outputTitle: 'githubUser 1 checkRuns outputTitle', + startedAt: 'githubUser 1 checkRuns startedAt', + status: 'githubUser 1 checkRuns status', } ], + } + }, + { + id: 2, + title: 'title 2', + githubUpdatedAt: 'githubUser 2 githubUpdatedAt', + htmlUrl: 'githubUser 2 htmlUrl', + repository: 'githubUser 2 repository', + repositoryHtmlUrl: 'githubUser 2 repositoryHtmlUrl', + number: 2, + _links: { + githubUser: { + href: 'githubUser 2 api url', + title: 'gitHubUser 2 title' + }, + self: { + href: 'this href', + title: 'this title' + } }, - { - title: 'title 2', + _embedded: { githubUser: { avatarUrl: 'githubUser 2 avatarUrl', htmlUrl: 'githubUser 2 htmlUrl', login: 'githubUser 2 login', }, - githubUpdatedAt: 'githubUser 2 githubUpdatedAt', - repository: 'githubUser 2 repository', - number: 'githubUser 2 number', checkRuns: [ { - name: 'githubUser 2 checkRun', - outputTitle: 'githubUser 2 outputTitle', - conclusion: 'githubUser 2 conclusion', - status: 'githubUser 2 status', - detailsUrl: 'githubUser 2 detailsUrl', + appOwnerAvatarUrl: 'githubUser 2 checkRuns appOwnerAvatarUrl', + completedAt: 'githubUser 2 checkRuns completedAt', + conclusion: 'githubUser 2 checkRuns conclusion', + detailsUrl: 'githubUser 2 checkRuns detailsurl', + htmlUrl: 'githubUser 2 checkRuns htmlUrl', + name: 'githubUser 2 checkRuns name', + outputSummary: 'githubUser 2 checkRuns outputSummary', + outputTitle: 'githubUser 2 checkRuns outputTitle', + startedAt: 'githubUser 2 checkRuns startedAt', + status: 'githubUser 2 checkRuns status', } ], } - ] - } + } + ]; beforeEach(async () => { - const halResourceServiceSpy = jasmine.createSpyObj('HalResourceService', ['get']); const changeDetectorSpy = jasmine.createSpyObj('ChangeDetectorRef', ['detectChanges']); + githubPullRequestResourceServiceSpy = jasmine.createSpyObj('GithubPullRequestResourceService', ['ofWorkPackage']); // @ts-ignore - halResourceServiceSpy.get.and.returnValue(of(pullRequests)); + githubPullRequestResourceServiceSpy.ofWorkPackage.and.returnValue(of(pullRequests)); await TestBed .configureTestingModule({ @@ -93,13 +134,14 @@ describe('TabPrsComponent', () => { OpIconComponent, GitActionsMenuDirective, PullRequestComponent, + PullRequestStateComponent, OpDateTimeComponent, ], providers: [ { provide: I18nService, useValue: I18nServiceStub }, - { provide: HalResourceService, useValue: halResourceServiceSpy }, { provide: ApiV3Service, useValue: ApiV3Stub }, { provide: ChangeDetectorRef, useValue: changeDetectorSpy }, + { provide: GithubPullRequestResourceService, useValue: githubPullRequestResourceServiceSpy }, ], }) .compileComponents(); @@ -109,11 +151,11 @@ describe('TabPrsComponent', () => { fixture = TestBed.createComponent(TabPrsComponent); component = fixture.componentInstance; element = fixture.debugElement; - halResourceService = fixture.debugElement.injector.get(HalResourceService) as jasmine.SpyObj; changeDetectorRef = fixture.debugElement.injector.get(ChangeDetectorRef) as jasmine.SpyObj; // @ts-ignore component.workPackage = { id: 'testId' }; + changeDetectorRef.markForCheck(); fixture.detectChanges(); }); @@ -122,15 +164,17 @@ describe('TabPrsComponent', () => { }); it('should display a PullRequestComponent per pull request', () => { - const pullRequests = fixture.debugElement.queryAll(By.css('github-pull-request')); + const pullRequests = fixture.debugElement.queryAll(By.css('op-github-pull-request')); expect(pullRequests.length).toBe(2); }); it('should display a message when there are no pull requests', () => { component.pullRequests$ = of([]); + changeDetectorRef.markForCheck(); fixture.detectChanges(); - const pullRequests = fixture.debugElement.queryAll(By.css('github-pull-request')); + + const pullRequests = fixture.debugElement.queryAll(By.css('op-github-pull-request')); const textMessage = fixture.debugElement.queryAll(By.css('p')); expect(pullRequests.length).toBe(0); diff --git a/modules/github_integration/lib/open_project/github_integration/engine.rb b/modules/github_integration/lib/open_project/github_integration/engine.rb index 10b54640fa88..9758ea904f99 100644 --- a/modules/github_integration/lib/open_project/github_integration/engine.rb +++ b/modules/github_integration/lib/open_project/github_integration/engine.rb @@ -56,7 +56,7 @@ def self.settings ::Redmine::MenuManager.map(:admin_menu) do |menu| menu.push :admin_github_integration, { controller: "/deploy_targets", action: "index" }, - if: Proc.new { OpenProject::FeatureDecisions.deploy_targets_active? && User.current.admin? }, + if: ->(_) { OpenProject::FeatureDecisions.deploy_targets_active? && User.current.admin? }, caption: :label_github_integration, icon: "mark-github" end diff --git a/modules/github_integration/spec/features/work_package_activity_spec.rb b/modules/github_integration/spec/features/work_package_activity_spec.rb index 4110d1a79282..5bbf2abc6949 100644 --- a/modules/github_integration/spec/features/work_package_activity_spec.rb +++ b/modules/github_integration/spec/features/work_package_activity_spec.rb @@ -4,8 +4,7 @@ RSpec.describe "Work Package Activity Tab", "Comments by Github", - :js, - :with_cuprite do + :js do shared_let(:github_system_user) { create(:admin, firstname: "Github", lastname: "System User") } shared_let(:admin) { create(:admin) } @@ -76,7 +75,8 @@ def trigger_pull_request_action } end - let(:work_package_page) { Pages::SplitWorkPackage.new(work_package, project) } + let(:wp_page) { Pages::FullWorkPackage.new(work_package, project) } + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } context "when the pull request is merged" do let(:action) { "closed" } @@ -100,8 +100,8 @@ def trigger_pull_request_action let(:state) { "closed" } before do - work_package_page.visit_tab! "activity" - work_package_page.ensure_page_loaded + wp_page.visit! + wp_page.wait_for_activity_tab end it "renders a comment stating the Pull Request was merged by the merge actor" do @@ -114,7 +114,7 @@ def trigger_pull_request_action github_user_link: pull_request_merging_user.github_login)} GITHUB_MERGE_COMMENT - expect(page).to have_css(".user-comment > .message", text: expected_merge_comment) + activity_tab.expect_journal_notes(text: expected_merge_comment) end end end @@ -134,8 +134,8 @@ def trigger_pull_request_action context "and I visit the work package's activity tab" do before do - work_package_page.visit_tab! "activity" - work_package_page.ensure_page_loaded + wp_page.visit! + wp_page.wait_for_activity_tab end it "renders a comment stating the Work Package was referenced in the Pull Request" do @@ -148,7 +148,7 @@ def trigger_pull_request_action github_user_link: pull_request_author.github_login)} GITHUB_REFERENCED_COMMENT - expect(page).to have_css(".user-comment > .message", text: expected_referenced_comment) + activity_tab.expect_journal_notes(text: expected_referenced_comment) end end end @@ -168,8 +168,8 @@ def trigger_pull_request_action context "and I visit the work package's activity tab" do before do - work_package_page.visit_tab! "activity" - work_package_page.ensure_page_loaded + wp_page.visit! + wp_page.wait_for_activity_tab end it "renders a comment stating that said action was performed on the Pull Request" do @@ -182,7 +182,7 @@ def trigger_pull_request_action github_user_link: pull_request_author.github_login)} GITHUB_READY_FOR_REVIEW_COMMENT - expect(page).to have_css(".user-comment > .message", text: expected_action_comment) + activity_tab.expect_journal_notes(text: expected_action_comment) end end end diff --git a/modules/github_integration/spec/features/work_package_github_tab_spec.rb b/modules/github_integration/spec/features/work_package_github_tab_spec.rb index b2d74548441f..563577365aeb 100644 --- a/modules/github_integration/spec/features/work_package_github_tab_spec.rb +++ b/modules/github_integration/spec/features/work_package_github_tab_spec.rb @@ -59,16 +59,18 @@ # comparing the pasted content against the provided text def expect_clipboard_content(text) work_package_page.switch_to_tab(tab: "activity") + work_package_page.wait_for_activity_tab - work_package_page.trigger_edit_comment - work_package_page.update_comment(" ") # ensure the comment editor is fully loaded + activity_tab.type_comment(" ") # This will both open the editor and type a space + activity_tab.clear_comment # Clear the comment to ensure clean state github_tab.paste_clipboard_content - expect(work_package_page.add_comment_container).to have_content(text) + activity_tab.expect_unsaved_content(text) work_package_page.switch_to_tab(tab: "github") end it "shows the github tab when the user is allowed to see it" do + pending "In headless mode, the clipboard content is not copied to the clipboard, how to fix?" work_package_page.visit! work_package_page.switch_to_tab(tab: "github") @@ -123,18 +125,21 @@ def expect_clipboard_content(text) describe "work package full view" do let(:work_package_page) { Pages::FullWorkPackage.new(work_package) } + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } it_behaves_like "a github tab" end describe "work package split view" do let(:work_package_page) { Pages::SplitWorkPackage.new(work_package) } + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } it_behaves_like "a github tab" end describe "primerized work package split view" do let(:work_package_page) { Pages::PrimerizedSplitWorkPackage.new(work_package) } + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } let(:tabs) { Components::WorkPackages::PrimerizedTabs.new } let(:github_tab_element) { "github" } diff --git a/modules/gitlab_integration/config/locales/crowdin/js-tr.yml b/modules/gitlab_integration/config/locales/crowdin/js-tr.yml index f09eed64594f..6e4969d4ed25 100644 --- a/modules/gitlab_integration/config/locales/crowdin/js-tr.yml +++ b/modules/gitlab_integration/config/locales/crowdin/js-tr.yml @@ -37,16 +37,16 @@ tr: description: Git kod parçacığını panoya kopyala git_actions: branch_name: Dal adı - commit_message: İşlem metni + commit_message: İşlem mesajı cmd: Boş işlemle dal oluştur - title: Git için hızlı snippet'ler + title: Git için hızlı kod parçaları copy_success: '✅ Kopyalandı!' copy_error: '❌ Kopyalanamadı!' tab_issue: empty: 'Henüz bağlantılı sorun yok. Sorun başlığında/açıklamasında OP#%{wp_id} (veya özel bağlantılar için PP#%{wp_id}) kodunu kullanarak mevcut bir sorunu bağlayın veya yeni bir sorun oluşturun.' tab_mrs: empty: 'Henüz bağlanmış bir birleştirme isteği yok. MR başlığında/açıklamasında OP#%{wp_id} (veya özel bağlantılar için PP#%{wp_id}) kodunu kullanarak mevcut bir MR''ı bağlayın veya yeni bir MR oluşturun.' - gitlab_pipelines: İş Akışı + gitlab_pipelines: İş Akışları updated_on: Güncelleme tarihi work_packages: tabs: diff --git a/modules/gitlab_integration/config/locales/crowdin/tr.yml b/modules/gitlab_integration/config/locales/crowdin/tr.yml index f62c9683af64..31317e97c915 100644 --- a/modules/gitlab_integration/config/locales/crowdin/tr.yml +++ b/modules/gitlab_integration/config/locales/crowdin/tr.yml @@ -27,11 +27,11 @@ tr: gitlab_issue: attributes: labels: - invalid_schema: "must be an array of hashes with keys: color, title" + invalid_schema: "anahtarları olan bir özet dizisi olmalıdır: renk, başlık" gitlab_merge_request: attributes: labels: - invalid_schema: "must be an array of hashes with keys: color, title" + invalid_schema: "anahtarları olan bir özet dizisi olmalıdır: renk, başlık" project_module_gitlab: "GitLab" permission_show_gitlab_content: "GitLab içeriğini göster" gitlab_integration: @@ -58,9 +58,9 @@ tr: issue_opened_referenced_comment: > **Issue Opened:** Issue %{issue_number} [%{issue_title}](%{issue_url}) for [%{repository}](%{repository_url}) has been opened by [%{gitlab_user}](%{gitlab_user_url}). issue_closed_referenced_comment: > - **Issue Closed:** Issue %{issue_number} [%{issue_title}](%{issue_url}) for [%{repository}](%{repository_url}) has been closed by [%{gitlab_user}](%{gitlab_user_url}). + **Sorun Kapatıldı:** [%{repository}](%{repository_url}) için %{issue_number} [%{issue_title}](%{issue_url}) sorunu [%{gitlab_user}](%{gitlab_user_url}) tarafından kapatılmıştır. issue_reopened_referenced_comment: > - **Issue Reopened:** Issue %{issue_number} [%{issue_title}](%{issue_url}) for [%{repository}](%{repository_url}) has been reopened by [%{gitlab_user}](%{gitlab_user_url}). + **Sorun Yeniden Açıldı:** [%{repository}](%{repository_url}) için %{issue_number} [%{issue_title}](%{issue_url}) sorunu [%{gitlab_user}](%{gitlab_user_url}) tarafından yeniden açılmıştır. push_single_commit_comment: > **Pushed in MR:** [%{gitlab_user}](%{gitlab_user_url}) pushed [%{commit_number}](%{commit_url}) to [%{repository}](%{repository_url}) at %{commit_timestamp}: %{commit_note} push_single_commit_comment_with_ref: > diff --git a/modules/gitlab_integration/frontend/module/git-actions/git-actions.service.ts b/modules/gitlab_integration/frontend/module/git-actions/git-actions.service.ts index d79af424e529..e08d336b4e73 100644 --- a/modules/gitlab_integration/frontend/module/git-actions/git-actions.service.ts +++ b/modules/gitlab_integration/frontend/module/git-actions/git-actions.service.ts @@ -41,8 +41,8 @@ export class GitActionsService { return str .replace(/&/g, 'and ') // & becomes and .replace(/ +/g, '-') // Spaces become dashes - .replace(/[\000-\039]/g, '') // ASCII control characters are out - .replace(/\177/g, '') // DEL is out + .replace(/[\x00-\x1F]/g, '') // ASCII control characters are out + .replace(/\x7F/g, '') // DEL is out .replace(/[#\\\/\?\*\~\^\:\{\}@\.\[\]'"]/g, '') // Some other characters with special rules are out .replace(/^[-]+/g, '') // Dashes at the start are removed .replace(/[-]+$/g, '') // Dashes at the end are removed diff --git a/modules/gitlab_integration/spec/features/work_package_gitlab_issue_activity_spec.rb b/modules/gitlab_integration/spec/features/work_package_gitlab_issue_activity_spec.rb index 858596c24570..b4c09a57ffbb 100644 --- a/modules/gitlab_integration/spec/features/work_package_gitlab_issue_activity_spec.rb +++ b/modules/gitlab_integration/spec/features/work_package_gitlab_issue_activity_spec.rb @@ -4,8 +4,7 @@ RSpec.describe "Work Package Activity Tab", "Comments by Gitlab", - :js, - :with_cuprite do + :js do shared_let(:gitlab_system_user) { create(:admin, firstname: "Gitlab", lastname: "System User") } shared_let(:admin) { create(:admin) } @@ -71,6 +70,7 @@ def trigger_issue_action end let(:work_package_page) { Pages::SplitWorkPackage.new(work_package, project) } + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } context "when there is an issue event" do before do @@ -90,7 +90,7 @@ def trigger_issue_action end it "renders a comment referencing the issue" do - expect(page).to have_css(".user-comment > .message", text: expected_comment) + activity_tab.expect_journal_notes(text: expected_comment) end end end diff --git a/modules/gitlab_integration/spec/features/work_package_gitlab_merge_request_activity_spec.rb b/modules/gitlab_integration/spec/features/work_package_gitlab_merge_request_activity_spec.rb index 76ec3815e85a..252202231140 100644 --- a/modules/gitlab_integration/spec/features/work_package_gitlab_merge_request_activity_spec.rb +++ b/modules/gitlab_integration/spec/features/work_package_gitlab_merge_request_activity_spec.rb @@ -4,8 +4,7 @@ RSpec.describe "Work Package Activity Tab", "Comments by Gitlab", - :js, - :with_cuprite do + :js do shared_let(:gitlab_system_user) { create(:admin, firstname: "Gitlab", lastname: "System User") } shared_let(:admin) { create(:admin) } @@ -70,6 +69,7 @@ def trigger_merge_request_action end let(:work_package_page) { Pages::SplitWorkPackage.new(work_package, project) } + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } context "when there is a merge request event" do before do @@ -81,6 +81,7 @@ def trigger_merge_request_action before do work_package_page.visit_tab! "activity" work_package_page.ensure_page_loaded + work_package_page.wait_for_activity_tab end let(:expected_comment) do @@ -90,7 +91,7 @@ def trigger_merge_request_action end it "renders a comment referencing the Merge Request" do - expect(page).to have_css(".user-comment > .message", text: expected_comment) + activity_tab.expect_journal_notes(text: expected_comment) end end end diff --git a/modules/gitlab_integration/spec/features/work_package_gitlab_tab_spec.rb b/modules/gitlab_integration/spec/features/work_package_gitlab_tab_spec.rb index d8857beb396a..e4d076c92014 100644 --- a/modules/gitlab_integration/spec/features/work_package_gitlab_tab_spec.rb +++ b/modules/gitlab_integration/spec/features/work_package_gitlab_tab_spec.rb @@ -58,6 +58,8 @@ create(:gitlab_pipeline, gitlab_merge_request: merge_request, name: "a pipeline name") end + let(:activity_tab) { Components::WorkPackages::Activities.new(work_package) } + shared_examples_for "a gitlab tab" do before do issue @@ -69,11 +71,12 @@ # comparing the pasted content against the provided text def expect_clipboard_content(text) work_package_page.switch_to_tab(tab: "activity") + work_package_page.wait_for_activity_tab - work_package_page.trigger_edit_comment - work_package_page.update_comment(" ") # ensure the comment editor is fully loaded + activity_tab.type_comment(" ") # This will both open the editor and type a space + activity_tab.clear_comment # Clear the comment to ensure clean state gitlab_tab.paste_clipboard_content - expect(work_package_page.add_comment_container).to have_content(text) + activity_tab.expect_unsaved_content(text) work_package_page.switch_to_tab(tab: "gitlab") end @@ -95,6 +98,8 @@ def expect_clipboard_content(text) end it "allows the user to copy the branch name to the clipboard" do + pending "In headless mode, the clipboard content is not copied to the clipboard, how to fix?" + gitlab_tab.git_actions_menu_button.click gitlab_tab.git_actions_copy_branch_name_button.click @@ -110,6 +115,7 @@ def expect_clipboard_content(text) end it "allows the user to copy a commit message with newlines between title and link to the clipboard" do + pending "In headless mode, the clipboard content is not copied to the clipboard, how to fix?" gitlab_tab.git_actions_menu_button.click gitlab_tab.git_actions_copy_commit_message_button.click diff --git a/modules/grids/config/locales/crowdin/js-ru.yml b/modules/grids/config/locales/crowdin/js-ru.yml index 5677648a11b7..91587b08418d 100644 --- a/modules/grids/config/locales/crowdin/js-ru.yml +++ b/modules/grids/config/locales/crowdin/js-ru.yml @@ -55,7 +55,7 @@ ru: work_packages_created: title: 'Пакеты работ, созданные мной' work_packages_watched: - title: 'Пакеты работ, просмотренные мной' + title: 'Пакеты работ, за которыми я наблюдаю' work_packages_table: title: 'Таблица пакетов работ' work_packages_graph: diff --git a/modules/grids/config/locales/crowdin/js-tr.yml b/modules/grids/config/locales/crowdin/js-tr.yml index 7dcb7a04fe0d..5f0f9875d81e 100644 --- a/modules/grids/config/locales/crowdin/js-tr.yml +++ b/modules/grids/config/locales/crowdin/js-tr.yml @@ -8,7 +8,7 @@ tr: text: "İş paketi grafiği pencere öğesi gibi bazı pencere öğeleri yalnızca Enterprise sürümünde mevcuttur." link: 'Enterprise sürümü.' widgets: - missing_permission: "You don't have the necessary permissions to view this widget." + missing_permission: "Bu bileşeni görüntülemek için gerekli izinlere sahip değilsiniz." custom_text: title: 'Özel metin' documents: @@ -41,7 +41,7 @@ tr: no_results: 'Alt proje yok.' project_favorites: title: 'Favori projeler' - no_results: 'Şu anda favori projeniz yok. Favorilerinize bir proje eklemek için proje kontrol panelindeki yıldız simgesine tıklayın.' + no_results: 'Şu anda favori projeniz yok. Favorilerinize bir proje eklemek için proje gösterge panelindeki yıldız simgesine tıklayın.' time_entries_current_user: title: 'Geçirdiğim zaman' displayed_days: 'Widget''te görüntülenen günler:' @@ -55,7 +55,7 @@ tr: work_packages_created: title: 'Oluşturduğum iş paketleri' work_packages_watched: - title: 'İzlediğim iş paketleri' + title: 'Takip ettiğim iş paketleri' work_packages_table: title: 'İş paketleri tablosu' work_packages_graph: diff --git a/modules/job_status/config/locales/crowdin/tr.yml b/modules/job_status/config/locales/crowdin/tr.yml index 3b461a7d86b1..0d1847f5abb2 100644 --- a/modules/job_status/config/locales/crowdin/tr.yml +++ b/modules/job_status/config/locales/crowdin/tr.yml @@ -1,8 +1,8 @@ tr: label_job_status_plural: "İş durumu" plugin_openproject_job_status: - name: "OpenProject Job status" - description: "Listing and status of background jobs." + name: "OpenProject İş durumu" + description: "Arka plan işlerinin durumu ve listelenmesi." job_status_dialog: download_starts: 'İndirme işlemi otomatik olarak başlayacaktır.' link_to_download: 'Veya indirmek için %{link}.' diff --git a/modules/ldap_groups/config/locales/crowdin/af.yml b/modules/ldap_groups/config/locales/crowdin/af.yml index bc15125f0478..504d2efdacc2 100644 --- a/modules/ldap_groups/config/locales/crowdin/af.yml +++ b/modules/ldap_groups/config/locales/crowdin/af.yml @@ -6,10 +6,12 @@ af: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/ar.yml b/modules/ldap_groups/config/locales/crowdin/ar.yml index 3827c7be4424..c25b898d7d32 100644 --- a/modules/ldap_groups/config/locales/crowdin/ar.yml +++ b/modules/ldap_groups/config/locales/crowdin/ar.yml @@ -6,10 +6,12 @@ ar: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'اتصال LDAP' sync_users: 'مزامنة المستخدمين' ldap_groups/synchronized_filter: filter_string: 'مرشّح LDAP' + auth_source: 'Auth source' ldap_auth_source: 'اتصال LDAP' group_name_attribute: "Group name attribute" sync_users: 'مزامنة المستخدمين' diff --git a/modules/ldap_groups/config/locales/crowdin/az.yml b/modules/ldap_groups/config/locales/crowdin/az.yml index 1b2480f12892..4b850331ed34 100644 --- a/modules/ldap_groups/config/locales/crowdin/az.yml +++ b/modules/ldap_groups/config/locales/crowdin/az.yml @@ -6,10 +6,12 @@ az: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/be.yml b/modules/ldap_groups/config/locales/crowdin/be.yml index 77227531f767..bace7808112d 100644 --- a/modules/ldap_groups/config/locales/crowdin/be.yml +++ b/modules/ldap_groups/config/locales/crowdin/be.yml @@ -6,10 +6,12 @@ be: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/bg.yml b/modules/ldap_groups/config/locales/crowdin/bg.yml index 83f642a150fa..19438645be7c 100644 --- a/modules/ldap_groups/config/locales/crowdin/bg.yml +++ b/modules/ldap_groups/config/locales/crowdin/bg.yml @@ -6,10 +6,12 @@ bg: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP връзка' sync_users: 'Синхронизиране на потребителите' ldap_groups/synchronized_filter: filter_string: 'LDAP филтър' + auth_source: 'Auth source' ldap_auth_source: 'LDAP връзка' group_name_attribute: "Атрибут за гуповото име" sync_users: 'Синхронизиране на потребителите' diff --git a/modules/ldap_groups/config/locales/crowdin/ca.yml b/modules/ldap_groups/config/locales/crowdin/ca.yml index 6c5d7b000b78..b5bc6afcb986 100644 --- a/modules/ldap_groups/config/locales/crowdin/ca.yml +++ b/modules/ldap_groups/config/locales/crowdin/ca.yml @@ -6,10 +6,12 @@ ca: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'Connexió LDAP' sync_users: 'Usuaris sincronitzats' ldap_groups/synchronized_filter: filter_string: 'Filtre LDAP' + auth_source: 'Auth source' ldap_auth_source: 'Connexió LDAP' group_name_attribute: "Atribut de nom de grup" sync_users: 'Usuaris sincronitzats' diff --git a/modules/ldap_groups/config/locales/crowdin/ckb-IR.yml b/modules/ldap_groups/config/locales/crowdin/ckb-IR.yml index ab28c0af0ea2..5481e0c0dc8a 100644 --- a/modules/ldap_groups/config/locales/crowdin/ckb-IR.yml +++ b/modules/ldap_groups/config/locales/crowdin/ckb-IR.yml @@ -6,10 +6,12 @@ ckb-IR: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/cs.yml b/modules/ldap_groups/config/locales/crowdin/cs.yml index 7164a5e67d70..e8664cb92a6c 100644 --- a/modules/ldap_groups/config/locales/crowdin/cs.yml +++ b/modules/ldap_groups/config/locales/crowdin/cs.yml @@ -6,10 +6,12 @@ cs: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Zdroj ověření' ldap_auth_source: 'Připojení LDAP' sync_users: 'Synchronizovat uživatele' ldap_groups/synchronized_filter: filter_string: 'LDAP filtr' + auth_source: 'Zdroj ověření' ldap_auth_source: 'Připojení LDAP' group_name_attribute: "Atribut názvu skupiny" sync_users: 'Synchronizovat uživatele' diff --git a/modules/ldap_groups/config/locales/crowdin/da.yml b/modules/ldap_groups/config/locales/crowdin/da.yml index 49a49cce39f6..3a8081a9bcff 100644 --- a/modules/ldap_groups/config/locales/crowdin/da.yml +++ b/modules/ldap_groups/config/locales/crowdin/da.yml @@ -6,10 +6,12 @@ da: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Synkroniser brugere' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Synkroniser brugere' diff --git a/modules/ldap_groups/config/locales/crowdin/de.yml b/modules/ldap_groups/config/locales/crowdin/de.yml index 3c4ac638506a..48dc23bb6a92 100644 --- a/modules/ldap_groups/config/locales/crowdin/de.yml +++ b/modules/ldap_groups/config/locales/crowdin/de.yml @@ -6,10 +6,12 @@ de: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP-Verbindung' sync_users: 'Benutzer synchronisieren' ldap_groups/synchronized_filter: filter_string: 'LDAP-Filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP-Verbindung' group_name_attribute: "Attribut für Gruppenname" sync_users: 'Benutzer synchronisieren' diff --git a/modules/ldap_groups/config/locales/crowdin/el.yml b/modules/ldap_groups/config/locales/crowdin/el.yml index f0c89c0e2925..c67e347b38fe 100644 --- a/modules/ldap_groups/config/locales/crowdin/el.yml +++ b/modules/ldap_groups/config/locales/crowdin/el.yml @@ -6,10 +6,12 @@ el: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'Σύνδεση LDAP' sync_users: 'Συγχρονισμός χρηστών' ldap_groups/synchronized_filter: filter_string: 'LDAP Φίλτρο' + auth_source: 'Auth source' ldap_auth_source: 'Σύνδεση LDAP' group_name_attribute: "Χαρακτηριστικό ονόματος ομάδας" sync_users: 'Συγχρονισμός χρηστών' diff --git a/modules/ldap_groups/config/locales/crowdin/eo.yml b/modules/ldap_groups/config/locales/crowdin/eo.yml index 3f1653cb6f55..192f91fdee09 100644 --- a/modules/ldap_groups/config/locales/crowdin/eo.yml +++ b/modules/ldap_groups/config/locales/crowdin/eo.yml @@ -6,10 +6,12 @@ eo: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/es.yml b/modules/ldap_groups/config/locales/crowdin/es.yml index bcc39cd66148..c9782d2bcb17 100644 --- a/modules/ldap_groups/config/locales/crowdin/es.yml +++ b/modules/ldap_groups/config/locales/crowdin/es.yml @@ -6,10 +6,12 @@ es: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Fuente de autenticación' ldap_auth_source: 'Conexión LDAP' sync_users: 'Sincronizar usuarios' ldap_groups/synchronized_filter: filter_string: 'Filtro LDAP' + auth_source: 'Fuente de autenticación' ldap_auth_source: 'Conexión LDAP' group_name_attribute: "Atributo de nombre de grupo" sync_users: 'Sincronizar usuarios' diff --git a/modules/ldap_groups/config/locales/crowdin/et.yml b/modules/ldap_groups/config/locales/crowdin/et.yml index 6a4ebf36863d..81db0748dbff 100644 --- a/modules/ldap_groups/config/locales/crowdin/et.yml +++ b/modules/ldap_groups/config/locales/crowdin/et.yml @@ -6,10 +6,12 @@ et: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/eu.yml b/modules/ldap_groups/config/locales/crowdin/eu.yml index 347036111292..d03f6d669d55 100644 --- a/modules/ldap_groups/config/locales/crowdin/eu.yml +++ b/modules/ldap_groups/config/locales/crowdin/eu.yml @@ -6,10 +6,12 @@ eu: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/fa.yml b/modules/ldap_groups/config/locales/crowdin/fa.yml index 1da6a7d7447f..b27d02dac249 100644 --- a/modules/ldap_groups/config/locales/crowdin/fa.yml +++ b/modules/ldap_groups/config/locales/crowdin/fa.yml @@ -6,10 +6,12 @@ fa: attributes: ldap_groups/synchronized_group: dn: 'شناسه منحصربفرد' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'همسان سازی کاربران' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'همسان سازی کاربران' diff --git a/modules/ldap_groups/config/locales/crowdin/fi.yml b/modules/ldap_groups/config/locales/crowdin/fi.yml index 57cca54d877f..9ae681747222 100644 --- a/modules/ldap_groups/config/locales/crowdin/fi.yml +++ b/modules/ldap_groups/config/locales/crowdin/fi.yml @@ -6,10 +6,12 @@ fi: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/fil.yml b/modules/ldap_groups/config/locales/crowdin/fil.yml index 3a018b8660aa..daf9925f353f 100644 --- a/modules/ldap_groups/config/locales/crowdin/fil.yml +++ b/modules/ldap_groups/config/locales/crowdin/fil.yml @@ -6,10 +6,12 @@ fil: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/fr.yml b/modules/ldap_groups/config/locales/crowdin/fr.yml index 29d221b42d2a..34cf3aeb67b1 100644 --- a/modules/ldap_groups/config/locales/crowdin/fr.yml +++ b/modules/ldap_groups/config/locales/crowdin/fr.yml @@ -6,10 +6,12 @@ fr: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Source d''authentification' ldap_auth_source: 'Connexion LDAP' sync_users: 'Synchroniser les utilisateurs' ldap_groups/synchronized_filter: filter_string: 'Filtre LDAP' + auth_source: 'Source d''authentification' ldap_auth_source: 'Connexion LDAP' group_name_attribute: "Attribut nom de groupe" sync_users: 'Synchroniser les utilisateurs' diff --git a/modules/ldap_groups/config/locales/crowdin/he.yml b/modules/ldap_groups/config/locales/crowdin/he.yml index ff36a4cde831..a5988df09728 100644 --- a/modules/ldap_groups/config/locales/crowdin/he.yml +++ b/modules/ldap_groups/config/locales/crowdin/he.yml @@ -6,10 +6,12 @@ he: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/hi.yml b/modules/ldap_groups/config/locales/crowdin/hi.yml index a9c7adda8281..f65de53bff26 100644 --- a/modules/ldap_groups/config/locales/crowdin/hi.yml +++ b/modules/ldap_groups/config/locales/crowdin/hi.yml @@ -6,10 +6,12 @@ hi: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/hr.yml b/modules/ldap_groups/config/locales/crowdin/hr.yml index eaafee7ae512..0a7b10db10e6 100644 --- a/modules/ldap_groups/config/locales/crowdin/hr.yml +++ b/modules/ldap_groups/config/locales/crowdin/hr.yml @@ -6,10 +6,12 @@ hr: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/hu.yml b/modules/ldap_groups/config/locales/crowdin/hu.yml index f592615a8f9a..62cdbcb56b6c 100644 --- a/modules/ldap_groups/config/locales/crowdin/hu.yml +++ b/modules/ldap_groups/config/locales/crowdin/hu.yml @@ -6,10 +6,12 @@ hu: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP csatlakozás' sync_users: 'Felhasználók szinkronizálása' ldap_groups/synchronized_filter: filter_string: 'LDAP szűrő' + auth_source: 'Auth source' ldap_auth_source: 'LDAP csatlakozás' group_name_attribute: "Csoport név attribútum" sync_users: 'Felhasználók szinkronizálása' diff --git a/modules/ldap_groups/config/locales/crowdin/id.yml b/modules/ldap_groups/config/locales/crowdin/id.yml index a3453fc88365..af023243d3f5 100644 --- a/modules/ldap_groups/config/locales/crowdin/id.yml +++ b/modules/ldap_groups/config/locales/crowdin/id.yml @@ -6,10 +6,12 @@ id: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'koneksi LDAP' sync_users: 'Sinkronkan pengguna' ldap_groups/synchronized_filter: filter_string: 'penyaring LDAP' + auth_source: 'Auth source' ldap_auth_source: 'koneksi LDAP' group_name_attribute: "Atribut nama grup" sync_users: 'Sinkronkan pengguna' diff --git a/modules/ldap_groups/config/locales/crowdin/it.yml b/modules/ldap_groups/config/locales/crowdin/it.yml index 79dd29cead39..cab70579e729 100644 --- a/modules/ldap_groups/config/locales/crowdin/it.yml +++ b/modules/ldap_groups/config/locales/crowdin/it.yml @@ -6,10 +6,12 @@ it: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Fonte di autorizzazione' ldap_auth_source: 'Connessione LDAP' sync_users: 'Sincronizza utenti' ldap_groups/synchronized_filter: filter_string: 'Filtro LDAP' + auth_source: 'Fonte di autorizzazione' ldap_auth_source: 'Connessione LDAP' group_name_attribute: "Attributo nome gruppo" sync_users: 'Sincronizza utenti' diff --git a/modules/ldap_groups/config/locales/crowdin/ja.yml b/modules/ldap_groups/config/locales/crowdin/ja.yml index d90b24e940f7..f7863567f893 100644 --- a/modules/ldap_groups/config/locales/crowdin/ja.yml +++ b/modules/ldap_groups/config/locales/crowdin/ja.yml @@ -6,10 +6,12 @@ ja: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP 接続' sync_users: 'ユーザーを同期' ldap_groups/synchronized_filter: filter_string: 'LDAPフィルタ' + auth_source: 'Auth source' ldap_auth_source: 'LDAP 接続' group_name_attribute: "グループ名属性" sync_users: 'ユーザーを同期' diff --git a/modules/ldap_groups/config/locales/crowdin/ka.yml b/modules/ldap_groups/config/locales/crowdin/ka.yml index 14586d6b23d2..80555834e140 100644 --- a/modules/ldap_groups/config/locales/crowdin/ka.yml +++ b/modules/ldap_groups/config/locales/crowdin/ka.yml @@ -6,10 +6,12 @@ ka: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP მიერთება' sync_users: 'მომხმარებლების სინქრონიზაცია' ldap_groups/synchronized_filter: filter_string: 'LDAP ფილტრი' + auth_source: 'Auth source' ldap_auth_source: 'LDAP მიერთება' group_name_attribute: "Group name attribute" sync_users: 'მომხმარებლების სინქრონიზაცია' diff --git a/modules/ldap_groups/config/locales/crowdin/kk.yml b/modules/ldap_groups/config/locales/crowdin/kk.yml index 4ea64e3b3a41..27b9317e67d7 100644 --- a/modules/ldap_groups/config/locales/crowdin/kk.yml +++ b/modules/ldap_groups/config/locales/crowdin/kk.yml @@ -6,10 +6,12 @@ kk: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/ko.yml b/modules/ldap_groups/config/locales/crowdin/ko.yml index dc985034b767..b09135e58eee 100644 --- a/modules/ldap_groups/config/locales/crowdin/ko.yml +++ b/modules/ldap_groups/config/locales/crowdin/ko.yml @@ -6,10 +6,12 @@ ko: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: '인증 소스' ldap_auth_source: 'LDAP 연결' sync_users: '사용자 동기화' ldap_groups/synchronized_filter: filter_string: 'LDAP 필터' + auth_source: '인증 소스' ldap_auth_source: 'LDAP 연결' group_name_attribute: "그룹 이름 특성" sync_users: '사용자 동기화' diff --git a/modules/ldap_groups/config/locales/crowdin/lt.yml b/modules/ldap_groups/config/locales/crowdin/lt.yml index 983e966eeb05..a8902b6da442 100644 --- a/modules/ldap_groups/config/locales/crowdin/lt.yml +++ b/modules/ldap_groups/config/locales/crowdin/lt.yml @@ -6,10 +6,12 @@ lt: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP jungtis' sync_users: 'Sinchronizuoti naudotojus' ldap_groups/synchronized_filter: filter_string: 'LDAP filtras' + auth_source: 'Auth source' ldap_auth_source: 'LDAP jungtis' group_name_attribute: "Grupės pavadinimo atributas" sync_users: 'Sinchronizuoti naudotojus' diff --git a/modules/ldap_groups/config/locales/crowdin/lv.yml b/modules/ldap_groups/config/locales/crowdin/lv.yml index 192f6fbaaa08..8f528ec21a18 100644 --- a/modules/ldap_groups/config/locales/crowdin/lv.yml +++ b/modules/ldap_groups/config/locales/crowdin/lv.yml @@ -6,10 +6,12 @@ lv: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/mn.yml b/modules/ldap_groups/config/locales/crowdin/mn.yml index ddbc08e83a36..3e0ab60c656a 100644 --- a/modules/ldap_groups/config/locales/crowdin/mn.yml +++ b/modules/ldap_groups/config/locales/crowdin/mn.yml @@ -6,10 +6,12 @@ mn: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/ms.yml b/modules/ldap_groups/config/locales/crowdin/ms.yml index 52ae887095f7..1b0a8bde7c57 100644 --- a/modules/ldap_groups/config/locales/crowdin/ms.yml +++ b/modules/ldap_groups/config/locales/crowdin/ms.yml @@ -6,10 +6,12 @@ ms: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Sumber Auth' ldap_auth_source: 'Sambungan LDAP' sync_users: 'Selaraskan pengguna-pengguna' ldap_groups/synchronized_filter: filter_string: 'Penyaring LDAP' + auth_source: 'Sumber Auth' ldap_auth_source: 'Sambungan LDAP' group_name_attribute: "Atribut nama kumpulan" sync_users: 'Selaraskan pengguna-pengguna' diff --git a/modules/ldap_groups/config/locales/crowdin/ne.yml b/modules/ldap_groups/config/locales/crowdin/ne.yml index ba18a337f916..7c293e7fe5d2 100644 --- a/modules/ldap_groups/config/locales/crowdin/ne.yml +++ b/modules/ldap_groups/config/locales/crowdin/ne.yml @@ -6,10 +6,12 @@ ne: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/nl.yml b/modules/ldap_groups/config/locales/crowdin/nl.yml index 40d206899ae0..7393431a1d9a 100644 --- a/modules/ldap_groups/config/locales/crowdin/nl.yml +++ b/modules/ldap_groups/config/locales/crowdin/nl.yml @@ -6,10 +6,12 @@ nl: attributes: ldap_groups/synchronized_group: dn: 'AFW' + auth_source: 'Auth bron' ldap_auth_source: 'LDAP verbinding' sync_users: 'Gebruikers synchroniseren' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth bron' ldap_auth_source: 'LDAP verbinding' group_name_attribute: "Attribuut groepsnaam" sync_users: 'Gebruikers synchroniseren' diff --git a/modules/ldap_groups/config/locales/crowdin/no.yml b/modules/ldap_groups/config/locales/crowdin/no.yml index 41fbca9d63d9..238c941769bb 100644 --- a/modules/ldap_groups/config/locales/crowdin/no.yml +++ b/modules/ldap_groups/config/locales/crowdin/no.yml @@ -6,10 +6,12 @@ attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP-tilkobling' sync_users: 'Synkroniser brukere' ldap_groups/synchronized_filter: filter_string: 'LDAP-filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP-tilkobling' group_name_attribute: "Gruppenavn-egenskap" sync_users: 'Synkroniser brukere' diff --git a/modules/ldap_groups/config/locales/crowdin/pl.yml b/modules/ldap_groups/config/locales/crowdin/pl.yml index a8a47fe7a99f..5445738c6f8b 100644 --- a/modules/ldap_groups/config/locales/crowdin/pl.yml +++ b/modules/ldap_groups/config/locales/crowdin/pl.yml @@ -6,10 +6,12 @@ pl: attributes: ldap_groups/synchronized_group: dn: 'Nazwa wyróżniająca' + auth_source: 'Źródło uwierzytelniania' ldap_auth_source: 'Połączenie LDAP' sync_users: 'Synchronizuj użytkowników' ldap_groups/synchronized_filter: filter_string: 'Filtr LDAP' + auth_source: 'Źródło uwierzytelniania' ldap_auth_source: 'Połączenie LDAP' group_name_attribute: "Atrybut nazwy grupy" sync_users: 'Synchronizuj użytkowników' diff --git a/modules/ldap_groups/config/locales/crowdin/pt-BR.yml b/modules/ldap_groups/config/locales/crowdin/pt-BR.yml index 5674ce36a1e4..45214dd41e98 100644 --- a/modules/ldap_groups/config/locales/crowdin/pt-BR.yml +++ b/modules/ldap_groups/config/locales/crowdin/pt-BR.yml @@ -6,10 +6,12 @@ pt-BR: attributes: ldap_groups/synchronized_group: dn: 'ND' + auth_source: 'Fonte de autenticação' ldap_auth_source: 'Conexão LDAP' sync_users: 'Sincronizar usuários' ldap_groups/synchronized_filter: filter_string: 'Filtro LDAP' + auth_source: 'Fonte de autenticação' ldap_auth_source: 'Conexão LDAP' group_name_attribute: "Atributo de nome de grupo" sync_users: 'Sincronizar usuários' diff --git a/modules/ldap_groups/config/locales/crowdin/pt-PT.yml b/modules/ldap_groups/config/locales/crowdin/pt-PT.yml index 3bf9b12f09ed..5933ff1ba542 100644 --- a/modules/ldap_groups/config/locales/crowdin/pt-PT.yml +++ b/modules/ldap_groups/config/locales/crowdin/pt-PT.yml @@ -6,10 +6,12 @@ pt-PT: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Fonte de autenticação' ldap_auth_source: 'Ligação LDAP' sync_users: 'Sincronizar utilizadores' ldap_groups/synchronized_filter: filter_string: 'Filtro LDAP' + auth_source: 'Fonte de autenticação' ldap_auth_source: 'Ligação LDAP' group_name_attribute: "Atributo nome do grupo" sync_users: 'Sincronizar utilizadores' diff --git a/modules/ldap_groups/config/locales/crowdin/ro.yml b/modules/ldap_groups/config/locales/crowdin/ro.yml index 232da2ff2938..26f441f208f2 100644 --- a/modules/ldap_groups/config/locales/crowdin/ro.yml +++ b/modules/ldap_groups/config/locales/crowdin/ro.yml @@ -6,10 +6,12 @@ ro: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'Conexiune LDAP' sync_users: 'Sincronizați utilizatorii' ldap_groups/synchronized_filter: filter_string: 'Filtru LDAP' + auth_source: 'Auth source' ldap_auth_source: 'Conexiune LDAP' group_name_attribute: "Atributul nume de grup" sync_users: 'Sincronizează utilizatorii' diff --git a/modules/ldap_groups/config/locales/crowdin/ru.yml b/modules/ldap_groups/config/locales/crowdin/ru.yml index 358b9cc24a85..22b5893f2b26 100644 --- a/modules/ldap_groups/config/locales/crowdin/ru.yml +++ b/modules/ldap_groups/config/locales/crowdin/ru.yml @@ -6,10 +6,12 @@ ru: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Источник аутентификации' ldap_auth_source: 'Подключение к LDAP' sync_users: 'Синхронизация пользователей' ldap_groups/synchronized_filter: filter_string: 'Фильтр LDAP' + auth_source: 'Источник аутентификации' ldap_auth_source: 'Подключение к LDAP' group_name_attribute: "Атрибут имени группы" sync_users: 'Синхронизация пользователей' diff --git a/modules/ldap_groups/config/locales/crowdin/rw.yml b/modules/ldap_groups/config/locales/crowdin/rw.yml index 4796f91784ab..e45db3a8ba38 100644 --- a/modules/ldap_groups/config/locales/crowdin/rw.yml +++ b/modules/ldap_groups/config/locales/crowdin/rw.yml @@ -6,10 +6,12 @@ rw: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/si.yml b/modules/ldap_groups/config/locales/crowdin/si.yml index cfbc112e6e6f..d610f98fdfe1 100644 --- a/modules/ldap_groups/config/locales/crowdin/si.yml +++ b/modules/ldap_groups/config/locales/crowdin/si.yml @@ -6,10 +6,12 @@ si: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/sk.yml b/modules/ldap_groups/config/locales/crowdin/sk.yml index c2f452a1594e..99527874f2b2 100644 --- a/modules/ldap_groups/config/locales/crowdin/sk.yml +++ b/modules/ldap_groups/config/locales/crowdin/sk.yml @@ -6,10 +6,12 @@ sk: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'Filter LDAP' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/sl.yml b/modules/ldap_groups/config/locales/crowdin/sl.yml index 0cce50183bf7..7ab1488803ab 100644 --- a/modules/ldap_groups/config/locales/crowdin/sl.yml +++ b/modules/ldap_groups/config/locales/crowdin/sl.yml @@ -6,10 +6,12 @@ sl: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP povezava' sync_users: 'Sinhroniziraj uporabnike' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP povezava' group_name_attribute: "Atribut imena skupine\n" sync_users: 'Sinhroniziraj uporabnike' diff --git a/modules/ldap_groups/config/locales/crowdin/sr.yml b/modules/ldap_groups/config/locales/crowdin/sr.yml index 996fbff48e4e..f11ce8a9fa34 100644 --- a/modules/ldap_groups/config/locales/crowdin/sr.yml +++ b/modules/ldap_groups/config/locales/crowdin/sr.yml @@ -6,10 +6,12 @@ sr: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/sv.yml b/modules/ldap_groups/config/locales/crowdin/sv.yml index 4eee4d896ffa..564a8857d4ac 100644 --- a/modules/ldap_groups/config/locales/crowdin/sv.yml +++ b/modules/ldap_groups/config/locales/crowdin/sv.yml @@ -6,10 +6,12 @@ sv: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP-anslutning' sync_users: 'Synkronisera användare' ldap_groups/synchronized_filter: filter_string: 'LDAP-filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP-anslutning' group_name_attribute: "Attribut för gruppnamn" sync_users: 'Synkronisera användare' diff --git a/modules/ldap_groups/config/locales/crowdin/th.yml b/modules/ldap_groups/config/locales/crowdin/th.yml index cb10f398b0d8..f1800844a687 100644 --- a/modules/ldap_groups/config/locales/crowdin/th.yml +++ b/modules/ldap_groups/config/locales/crowdin/th.yml @@ -6,10 +6,12 @@ th: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/tr.yml b/modules/ldap_groups/config/locales/crowdin/tr.yml index 060a2753fd46..c02d9b29a77f 100644 --- a/modules/ldap_groups/config/locales/crowdin/tr.yml +++ b/modules/ldap_groups/config/locales/crowdin/tr.yml @@ -1,15 +1,17 @@ tr: plugin_openproject_ldap_groups: - name: "OpenProject LDAP groups" - description: "Synchronization of LDAP group memberships." + name: "OpenProject LDAP grupları" + description: "LDAP grup üyeliklerinin senkronizasyonu." activerecord: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP bağlantısı' sync_users: 'Kullanıcıları senkronize et' ldap_groups/synchronized_filter: filter_string: 'LDAP süzgeçi' + auth_source: 'Auth source' ldap_auth_source: 'LDAP bağlantısı' group_name_attribute: "Grup adı özelliği" sync_users: 'Kullanıcıları senkronize et' diff --git a/modules/ldap_groups/config/locales/crowdin/uk.yml b/modules/ldap_groups/config/locales/crowdin/uk.yml index 140d8f4e99d7..f409070d179f 100644 --- a/modules/ldap_groups/config/locales/crowdin/uk.yml +++ b/modules/ldap_groups/config/locales/crowdin/uk.yml @@ -6,10 +6,12 @@ uk: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Джерело автентифікації' ldap_auth_source: 'LDAP-підключення' sync_users: 'Синхронізація користувачів' ldap_groups/synchronized_filter: filter_string: 'Фільтр LDAP' + auth_source: 'Джерело автентифікації' ldap_auth_source: 'LDAP-підключення' group_name_attribute: "Атрибут назви групи" sync_users: 'Синхронізація користувачів' diff --git a/modules/ldap_groups/config/locales/crowdin/uz.yml b/modules/ldap_groups/config/locales/crowdin/uz.yml index 0742fb6b18e2..46e62a80f21c 100644 --- a/modules/ldap_groups/config/locales/crowdin/uz.yml +++ b/modules/ldap_groups/config/locales/crowdin/uz.yml @@ -6,10 +6,12 @@ uz: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/ldap_groups/config/locales/crowdin/vi.yml b/modules/ldap_groups/config/locales/crowdin/vi.yml index 8ea95fea6d39..9efd8a3ffc98 100644 --- a/modules/ldap_groups/config/locales/crowdin/vi.yml +++ b/modules/ldap_groups/config/locales/crowdin/vi.yml @@ -6,10 +6,12 @@ vi: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Nguồn xác thực' ldap_auth_source: 'Kết nối LDAP' sync_users: 'Đồng bộ hóa người dùng' ldap_groups/synchronized_filter: filter_string: 'Bộ lọc LDAP' + auth_source: 'Nguồn xác thực' ldap_auth_source: 'Kết nối LDAP' group_name_attribute: "Thuộc tính tên nhóm" sync_users: 'Đồng bộ hóa người dùng' diff --git a/modules/ldap_groups/config/locales/crowdin/zh-CN.yml b/modules/ldap_groups/config/locales/crowdin/zh-CN.yml index d551c0a9e91e..865f61468959 100644 --- a/modules/ldap_groups/config/locales/crowdin/zh-CN.yml +++ b/modules/ldap_groups/config/locales/crowdin/zh-CN.yml @@ -6,10 +6,12 @@ zh-CN: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: '认证源' ldap_auth_source: 'LDAP 连接' sync_users: '同步用户' ldap_groups/synchronized_filter: filter_string: 'LDAP 筛选器' + auth_source: '认证源' ldap_auth_source: 'LDAP 连接' group_name_attribute: "组名称属性" sync_users: '同步用户' diff --git a/modules/ldap_groups/config/locales/crowdin/zh-TW.yml b/modules/ldap_groups/config/locales/crowdin/zh-TW.yml index d7227e6063ba..2b0eaacb1a52 100644 --- a/modules/ldap_groups/config/locales/crowdin/zh-TW.yml +++ b/modules/ldap_groups/config/locales/crowdin/zh-TW.yml @@ -6,10 +6,12 @@ zh-TW: attributes: ldap_groups/synchronized_group: dn: '識別名稱（DN）' + auth_source: '驗證來源' ldap_auth_source: 'LDAP 連線' sync_users: '同步使用者' ldap_groups/synchronized_filter: filter_string: 'LDAP篩選條件' + auth_source: '驗證來源' ldap_auth_source: 'LDAP 連線' group_name_attribute: "群組名字屬性" sync_users: '同步使用者' diff --git a/modules/ldap_groups/config/locales/en.yml b/modules/ldap_groups/config/locales/en.yml index 11a79a61ee9b..106816d6f80c 100644 --- a/modules/ldap_groups/config/locales/en.yml +++ b/modules/ldap_groups/config/locales/en.yml @@ -6,10 +6,12 @@ en: attributes: ldap_groups/synchronized_group: dn: 'DN' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' sync_users: 'Sync users' ldap_groups/synchronized_filter: filter_string: 'LDAP filter' + auth_source: 'Auth source' ldap_auth_source: 'LDAP connection' group_name_attribute: "Group name attribute" sync_users: 'Sync users' diff --git a/modules/meeting/app/components/_index.sass b/modules/meeting/app/components/_index.sass index cba7d0c0d186..554400e71d26 100644 --- a/modules/meeting/app/components/_index.sass +++ b/modules/meeting/app/components/_index.sass @@ -3,3 +3,4 @@ @import "./meeting_sections/header_component.sass" @import "./meetings/side_panel/state_component.sass" @import "./meetings/side_panel/participants_component.sass" +@import "./recurring_meetings/table_header_component.sass" diff --git a/modules/meeting/app/components/base_errors_component.rb b/modules/meeting/app/components/base_errors_component.rb index 504da64a2e1d..7b8cc305c843 100644 --- a/modules/meeting/app/components/base_errors_component.rb +++ b/modules/meeting/app/components/base_errors_component.rb @@ -31,11 +31,12 @@ class BaseErrorsComponent < ApplicationComponent include OpTurbo::Streamable include OpPrimer::ComponentHelpers - def initialize(object, keys: %w[base]) + def initialize(object, keys: %w[base], **system_arguments) super @errors = object.errors @keys = keys + @system_arguments = system_arguments end def render? @@ -43,7 +44,7 @@ def render? end def call - render(Primer::Alpha::Banner.new(scheme: :danger, icon: :stop, spacious: true)) do + render(Primer::Alpha::Banner.new(scheme: :danger, icon: :stop, spacious: true, **@system_arguments)) do joined_messages end end diff --git a/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb b/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb index 174a85ae63be..9f78903439a5 100644 --- a/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb +++ b/modules/meeting/app/components/meeting_agenda_items/list_component.html.erb @@ -1,18 +1,18 @@ <%= component_wrapper(data: wrapper_data_attributes) do flex_layout(mb: 3) do |flex| - if @meeting.template? && !empty? + if @meeting.template? flex.with_row(mb: 3) do render Primer::Alpha::Banner.new(scheme: :default, icon: :info, dismiss_scheme: :none) do t("recurring_meeting.template.banner_html", - link: link_to(@meeting.recurring_meeting.title, - recurring_meeting_path(@meeting.recurring_meeting))) + link: link_to(@meeting.recurring_meeting.title, + project_recurring_meeting_path(@meeting.project, @meeting.recurring_meeting))) end end end - flex.with_row(classes: 'dragula-container', id: insert_target_modifier_id, data: { 'allowed-drop-type': 'section' }.merge(drop_target_config) ) do + flex.with_row(classes: "dragula-container", id: insert_target_modifier_id, data: { "allowed-drop-type": "section" }.merge(drop_target_config)) do first_and_last = [@meeting.sections.first, @meeting.sections.last] render( MeetingSections::ShowComponent.with_collection( diff --git a/modules/meeting/app/components/meetings/delete_dialog_component.html.erb b/modules/meeting/app/components/meetings/delete_dialog_component.html.erb new file mode 100644 index 000000000000..f4c5f93e97b0 --- /dev/null +++ b/modules/meeting/app/components/meetings/delete_dialog_component.html.erb @@ -0,0 +1,47 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::DangerDialog.new( + id:, + title:, + confirm_button_text:, + cancel_button_text:, + form_arguments: { + action: project_meeting_path(@project, @meeting, back_url: @back_url), + method: :delete, + data: { turbo: true } + } + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { heading } + message.with_description_content(confirmation_message) + end + end +%> diff --git a/modules/meeting/app/components/meetings/delete_dialog_component.rb b/modules/meeting/app/components/meetings/delete_dialog_component.rb new file mode 100644 index 000000000000..bda1fb0d05cc --- /dev/null +++ b/modules/meeting/app/components/meetings/delete_dialog_component.rb @@ -0,0 +1,90 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Meetings + class DeleteDialogComponent < ApplicationComponent + include ApplicationHelper + include OpTurbo::Streamable + + def initialize(meeting:, back_url: nil) + super + + @meeting = meeting + @project = meeting.project + @back_url = back_url + end + + delegate :recurring_meeting, to: :@meeting + + private + + def id = "delete-meeting-dialog" + + def title + if recurring_meeting.present? + I18n.t("meeting.delete_dialog.occurrence.title") + else + I18n.t("meeting.delete_dialog.one_time.title") + end + end + + def heading + if recurring_meeting.present? + I18n.t("meeting.delete_dialog.occurrence.heading") + else + I18n.t("meeting.delete_dialog.one_time.heading") + end + end + + def confirmation_message + if recurring_meeting.present? + t("meeting.delete_dialog.occurrence.confirmation_message_html") + else + t("meeting.delete_dialog.one_time.confirmation_message_html") + end + end + + def confirm_button_text + if recurring_meeting.present? + I18n.t("meeting.delete_dialog.occurrence.confirm_button") + else + I18n.t("button_delete") + end + end + + def cancel_button_text + if recurring_meeting.present? + I18n.t("button_close") + else + I18n.t("button_cancel") + end + end + end +end diff --git a/modules/meeting/app/components/meetings/header_component.html.erb b/modules/meeting/app/components/meetings/header_component.html.erb index ee89a02dd97d..82cc17ba5975 100644 --- a/modules/meeting/app/components/meetings/header_component.html.erb +++ b/modules/meeting/app/components/meetings/header_component.html.erb @@ -1,24 +1,24 @@ <%= - helpers.content_controller "poll-for-changes", - poll_for_changes_url_value: check_for_updates_meeting_path(@meeting), - poll_for_changes_interval_value: check_for_updates_interval, - poll_for_changes_autoscroll_enabled_value: true + helpers.content_controller "poll-for-changes keep-scroll-position", + poll_for_changes_url_value: check_for_updates_project_meeting_path(@meeting.project, @meeting), + poll_for_changes_interval_value: check_for_updates_interval, + keep_scroll_position_url_value: meeting_path(@meeting) component_wrapper do render(Primer::OpenProject::PageHeader.new( - test_selector: "meeting-page-header", - state: @state, - data: { - poll_for_changes_target: "reference", - reference_value: @meeting.changed_hash - } - )) do |header| + test_selector: "meeting-page-header", + state: @state, + data: { + poll_for_changes_target: "reference", + reference_value: @meeting.changed_hash + } + )) do |header| header.with_title do |title| title.with_editable_form(model: @meeting, - update_path: update_title_meeting_path(@meeting), - cancel_path: cancel_edit_meeting_path(@meeting), + update_path: update_title_project_meeting_path(@project, @meeting), + cancel_path: cancel_edit_project_meeting_path(@project, @meeting), label: Meeting.human_attribute_name(:title), - placeholder: Meeting.human_attribute_name(:title),) + placeholder: Meeting.human_attribute_name(:title)) if @meeting.template? "#{@meeting.title} (#{I18n.t(:label_template)})" elsif @series.present? @@ -38,7 +38,7 @@ mobile_icon: :check, size: :medium, data: { "turbo-method": :post }, - href: template_completed_recurring_meeting_path(@meeting.recurring_meeting), + href: template_completed_project_recurring_meeting_path(@project, @meeting.recurring_meeting) ) do |button| button.with_leading_visual_icon(icon: :check) I18n.t("recurring_meeting.template.button_finalize") @@ -49,58 +49,61 @@ button_arguments: { icon: "kebab-horizontal", "aria-label": t("label_meeting_actions"), classes: "hide-when-print", - test_selector: 'op-meetings-header-action-trigger'}) do |menu| - menu.with_item(label: t("label_meeting_edit_title"), - href: edit_meeting_path(@meeting), - content_arguments: { - data: { 'turbo-stream': true } - }) do |item| - item.with_leading_visual_icon(icon: :pencil) - end if @meeting.editable? && !@series + test_selector: "op-meetings-header-action-trigger" }) do |menu| + if @meeting.editable? && !@series + menu.with_item(label: t("label_meeting_edit_title"), + href: edit_project_meeting_path(@project, @meeting), + content_arguments: { + data: { "turbo-stream": true } + }) do |item| + item.with_leading_visual_icon(icon: :pencil) + end + end unless @meeting.template? - menu.with_item(label: copy_label, - href: copy_meeting_path(@meeting), - content_arguments: { - data: { turbo_stream: true } - }) do |item| - item.with_leading_visual_icon(icon: :copy) - end + menu.with_item(label: copy_label, + href: copy_project_meeting_path(@project, @meeting), + content_arguments: { + data: { turbo_stream: true } + }) do |item| + item.with_leading_visual_icon(icon: :copy) + end - menu.with_item(label: t(:label_icalendar_download), - href: download_ics_meeting_path(@meeting)) do |item| - item.with_leading_visual_icon(icon: :download) - end + menu.with_item(label: t(:label_icalendar_download), + href: ics_download_path) do |item| + item.with_leading_visual_icon(icon: :download) + end - if @meeting.open? &&User.current.allowed_in_project?(:send_meeting_agendas_notification, @meeting.project - ) - menu.with_item(label: t('meeting.label_mail_all_participants'), - href: notify_meeting_path(@meeting), - form_arguments: { method: :post, data: { turbo: 'false' } }) do |item| - item.with_leading_visual_icon(icon: :mail) - end + if @meeting.open? && User.current.allowed_in_project?(:send_meeting_agendas_notification, @meeting.project) + menu.with_item(label: t("meeting.label_mail_all_participants"), + href: notify_project_meeting_path(@project, @meeting), + form_arguments: { method: :post, data: { turbo: "false" } }) do |item| + item.with_leading_visual_icon(icon: :mail) end end + end menu.with_item(label: t(:label_history), tag: :a, - href: history_meeting_path(@meeting), + href: history_project_meeting_path(@project, @meeting), content_arguments: { - "data-controller": "async-dialog", + "data-controller": "async-dialog" }, - value: "" - ) do |item| + value: "") do |item| item.with_leading_visual_icon(icon: :clock) # or :check TBD end - menu.with_item(label: delete_label, - scheme: :danger, - href: meeting_path(@meeting), - form_arguments: { - method: :delete, data: { confirm: t("text_are_you_sure"), turbo: 'false' } - }) do |item| - item.with_leading_visual_icon(icon: :trash) - end if delete_enabled? + if delete_enabled? + menu.with_item(label: delete_label, + scheme: :danger, + href: delete_dialog_project_meeting_path(@project, @meeting), + tag: :a, + content_arguments: { + data: { controller: "async-dialog" } + }) do |item| + item.with_leading_visual_icon(icon: :trash) + end + end end end end diff --git a/modules/meeting/app/components/meetings/header_component.rb b/modules/meeting/app/components/meetings/header_component.rb index 38c7cf45bc2c..99fd64f4f6ab 100644 --- a/modules/meeting/app/components/meetings/header_component.rb +++ b/modules/meeting/app/components/meetings/header_component.rb @@ -38,12 +38,12 @@ class HeaderComponent < ApplicationComponent STATE_EDIT = :edit STATE_OPTIONS = [STATE_DEFAULT, STATE_EDIT].freeze - def initialize(meeting:, project: nil, state: STATE_DEFAULT) + def initialize(meeting:, state: STATE_DEFAULT) super @meeting = meeting @series = meeting.recurring_meeting - @project = project + @project = meeting.project @state = fetch_or_fallback(STATE_OPTIONS, state) end @@ -52,6 +52,14 @@ def check_for_updates_interval 10_000 end + def ics_download_path + if @series + download_ics_project_recurring_meeting_path(@series.project, @series, occurrence_id: @meeting.id) + else + download_ics_project_meeting_path(@meeting.project, @meeting) + end + end + private def delete_enabled? @@ -86,7 +94,7 @@ def meeting_element def meeting_series_element if @series.present? - { href: recurring_meeting_path(@series), text: @series.title } + { href: project_recurring_meeting_path(@series.project, @series), text: @series.title } end end diff --git a/modules/meeting/app/components/meetings/header_infoline_component.html.erb b/modules/meeting/app/components/meetings/header_infoline_component.html.erb index 4c64c92d8123..8c2da294cbf4 100644 --- a/modules/meeting/app/components/meetings/header_infoline_component.html.erb +++ b/modules/meeting/app/components/meetings/header_infoline_component.html.erb @@ -3,9 +3,7 @@ <%= t("recurring_meeting.occurrence.infoline", title: @series.title) %> <% else %> <%= t(:label_meeting_created_by) %> - <%= render(Primer::Beta::Link.new(href: user_path(@meeting.author), - underline: false, - target: "_blank")) { @meeting.author.name } %>. + <%= helpers.primer_link_to_user(@meeting.author) %>. <% end %> <%= t("label_meeting_last_updated") %> <%= render(OpPrimer::RelativeTimeComponent.new(datetime: last_updated_at, prefix: I18n.t(:label_on))) %>. diff --git a/modules/meeting/app/components/meetings/index/dialog_component.html.erb b/modules/meeting/app/components/meetings/index/dialog_component.html.erb index 7eafcf9ffac2..cad7e1d5cf9d 100644 --- a/modules/meeting/app/components/meetings/index/dialog_component.html.erb +++ b/modules/meeting/app/components/meetings/index/dialog_component.html.erb @@ -29,6 +29,8 @@ )) do if @meeting.persisted? I18n.t(:button_save) + elsif @meeting.is_a?(RecurringMeeting) + I18n.t(:label_recurring_meeting_series_create) else I18n.t(:label_meeting_create) end diff --git a/modules/meeting/app/components/meetings/index/form_component.html.erb b/modules/meeting/app/components/meetings/index/form_component.html.erb index e44a22fac400..35d903565c03 100644 --- a/modules/meeting/app/components/meetings/index/form_component.html.erb +++ b/modules/meeting/app/components/meetings/index/form_component.html.erb @@ -29,12 +29,12 @@ end if @project.nil? - modal_body.with_row(mt: 3) do + modal_body.with_row(mb: 3) do render(Meeting::ProjectAutocompleter.new(f)) end end - modal_body.with_row(mt: 3) do + modal_body.with_row do render(Meeting::Title.new(f)) end @@ -86,7 +86,7 @@ hidden: @meeting.frequency_working_days?, ) do flex_layout do |end_after| - end_after.with_row(hidden: @meeting.end_after_iterations?, + end_after.with_row(hidden: !@meeting.end_after_specific_date?, data: { value: "specific_date", target_name: "end_after", @@ -95,7 +95,7 @@ render(RecurringMeeting::SpecificDate.new(f, meeting: @meeting)) end - end_after.with_row(hidden: @meeting.end_after_specific_date?, + end_after.with_row(hidden: !@meeting.end_after_iterations?, data: { value: "iterations", target_name: "end_after", diff --git a/modules/meeting/app/components/meetings/index_page_header_component.html.erb b/modules/meeting/app/components/meetings/index_page_header_component.html.erb index 7b455f819b97..12cc2daea1b8 100644 --- a/modules/meeting/app/components/meetings/index_page_header_component.html.erb +++ b/modules/meeting/app/components/meetings/index_page_header_component.html.erb @@ -1,3 +1,6 @@ +<% helpers.content_controller "keep-scroll-position", + keep_scroll_position_url_value: polymorphic_path([@project, :meetings]) %> + <%= render(Primer::OpenProject::PageHeader.new) do |header| header.with_title { page_title } header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: section_present? ? :normal : :bold) diff --git a/modules/meeting/app/components/meetings/index_page_header_component.rb b/modules/meeting/app/components/meetings/index_page_header_component.rb index a2aff11ecf45..186f0dd4cd05 100644 --- a/modules/meeting/app/components/meetings/index_page_header_component.rb +++ b/modules/meeting/app/components/meetings/index_page_header_component.rb @@ -41,7 +41,7 @@ def page_title if current_item.present? current_item.title else - I18n.t(:label_meeting_plural) + I18n.t(:label_my_meetings) end end @@ -84,7 +84,7 @@ def current_item return @current_item if defined?(@current_item) @current_item = Meetings::Menu - .new(project: @project, params:) + .new(project: @project, params: params.merge(current_href: request.path)) .selected_menu_item end end diff --git a/modules/meeting/app/components/meetings/index_sub_header_component.html.erb b/modules/meeting/app/components/meetings/index_sub_header_component.html.erb index d4c665de8501..922fcb28ebf6 100644 --- a/modules/meeting/app/components/meetings/index_sub_header_component.html.erb +++ b/modules/meeting/app/components/meetings/index_sub_header_component.html.erb @@ -23,30 +23,20 @@ I18n.t(:label_meeting) end - if OpenProject::FeatureDecisions.recurring_meetings_active? - menu.with_item(label: I18n.t("meeting.types.one_time"), - tag: :a, - href: new_dialog_meetings_path(project_id: @project&.id, type: :structured), - content_arguments: { data: { controller: "async-dialog" }} - ) do |item| - item.with_description.with_content(t("meeting.types.structured_text")) - end + menu.with_item(label: I18n.t("meeting.types.one_time"), + tag: :a, + href: polymorphic_path([:new_dialog, @project, :meetings], type: :structured), + content_arguments: { data: { controller: "async-dialog" } } + ) do |item| + item.with_description.with_content(t("meeting.types.structured_text")) + end - menu.with_item(label: I18n.t("meeting.types.recurring"), - tag: :a, - href: new_dialog_meetings_path(project_id: @project&.id, type: :recurring), - content_arguments: { data: { controller: "async-dialog" }} - ) do |item| - item.with_description.with_content(t("meeting.types.recurring_text")) - end - else - menu.with_item(label: I18n.t("meeting.types.structured"), - tag: :a, - href: new_dialog_meetings_path(project_id: @project&.id, type: :structured), - content_arguments: { data: { controller: "async-dialog" }} - ) do |item| - item.with_description.with_content(t("meeting.types.structured_text")) - end + menu.with_item(label: I18n.t("meeting.types.recurring"), + tag: :a, + href: polymorphic_path([:new_dialog, @project, :meetings], type: :recurring), + content_arguments: { data: { controller: "async-dialog" } } + ) do |item| + item.with_description.with_content(t("meeting.types.recurring_text")) end menu.with_item(label: I18n.t("meeting.types.classic"), diff --git a/modules/meeting/app/components/meetings/row_component.rb b/modules/meeting/app/components/meetings/row_component.rb index 88377b0f65ec..14a0866355a8 100644 --- a/modules/meeting/app/components/meetings/row_component.rb +++ b/modules/meeting/app/components/meetings/row_component.rb @@ -30,24 +30,27 @@ module Meetings class RowComponent < ::OpPrimer::BorderBoxRowComponent + delegate :current_project, to: :table + delegate :project, to: :model + def project_name - helpers.link_to_project model.project, {}, {}, false + helpers.link_to_project project, {}, {}, false end def title if recurring? - link_to model.title, recurring_meeting_path(model) + link_to model.title, project_recurring_meeting_path(project, model) elsif recurring_meeting.present? occurrence_title else - link_to model.title, project_meeting_path(model.project, model) + link_to model.title, project_meeting_path(project, model) end end def occurrence_title safe_join( - [(link_to model.title, project_meeting_path(model.project, model)), - (link_to recurring_label, recurring_meeting_path(recurring_meeting))], " " + [(link_to model.title, project_meeting_path(project, model)), + (link_to recurring_label, project_recurring_meeting_path(project, recurring_meeting))], " " ) end @@ -60,7 +63,9 @@ def start_time end def duration - "#{number_with_delimiter model.duration} h" + return if model.duration.blank? + + render OpenProject::Common::DurationComponent.new(model.duration, :hours, abbreviated: false) end def location @@ -105,7 +110,7 @@ def action_menu def view_meeting_series(menu) menu.with_item(label: I18n.t(:label_recurring_meeting_view), - href: recurring_meeting_path(recurring_meeting)) do |item| + href: project_recurring_meeting_path(project, recurring_meeting)) do |item| item.with_leading_visual_icon(icon: :iterations) end end @@ -114,7 +119,7 @@ def copy_action(menu) return unless copy_allowed? menu.with_item(label: I18n.t(:label_meeting_copy), - href: copy_meeting_path(model), + href: copy_project_meeting_path(project, model), content_arguments: { data: { turbo: model.is_a?(StructuredMeeting), @@ -127,7 +132,7 @@ def copy_action(menu) def ical_action(menu) menu.with_item(label: I18n.t(:label_icalendar_download), - href: download_ics_meeting_path(model), + href: download_ics_project_meeting_path(project, model), content_arguments: { data: { turbo: false } }) do |item| @@ -138,24 +143,18 @@ def ical_action(menu) def delete_action(menu) return unless delete_allowed? + back_url = current_project ? nil : meetings_path menu.with_item(label: recurring_meeting.present? ? I18n.t(:label_recurring_meeting_delete) : I18n.t(:label_meeting_delete), scheme: :danger, - href: meeting_path(model), - form_arguments: { - method: :delete, data: { confirm: delete_confirm_message, turbo: false } + href: delete_dialog_project_meeting_path(project, model, back_url:), + tag: :a, + content_arguments: { + data: { controller: "async-dialog" } }) do |item| item.with_leading_visual_icon(icon: :trash) end end - def delete_confirm_message - if recurring_meeting.present? - I18n.t(:label_recurring_meeting_delete_confirmation, name: recurring_meeting.title) - else - I18n.t("text_are_you_sure") - end - end - def recurring_label render(Primer::BaseComponent.new(tag: :span, color: :muted)) do concat render(Primer::Beta::Octicon.new(icon: :iterations, mr: 1, ml: 1)) @@ -164,11 +163,11 @@ def recurring_label end def delete_allowed? - User.current.allowed_in_project?(:delete_meetings, model.project) + User.current.allowed_in_project?(:delete_meetings, project) end def copy_allowed? - User.current.allowed_in_project?(:create_meetings, model.project) + User.current.allowed_in_project?(:create_meetings, project) end def recurring? diff --git a/modules/meeting/app/components/meetings/show_component.html.erb b/modules/meeting/app/components/meetings/show_component.html.erb index 523b9142b587..c37d8f31a4a9 100644 --- a/modules/meeting/app/components/meetings/show_component.html.erb +++ b/modules/meeting/app/components/meetings/show_component.html.erb @@ -1,7 +1,7 @@ <%= flex_layout(data: { turbo: true }) do |show_page| show_page.with_row do - render(Meetings::HeaderComponent.new(meeting: @meeting, project: @project)) + render(Meetings::HeaderComponent.new(meeting: @meeting)) end show_page.with_row do diff --git a/modules/meeting/app/components/meetings/show_component.rb b/modules/meeting/app/components/meetings/show_component.rb index e5d972d6de9c..8b8aefe47abb 100644 --- a/modules/meeting/app/components/meetings/show_component.rb +++ b/modules/meeting/app/components/meetings/show_component.rb @@ -31,11 +31,11 @@ class ShowComponent < ApplicationComponent include ApplicationHelper include OpPrimer::ComponentHelpers - def initialize(meeting:, project:) + def initialize(meeting:) super @meeting = meeting - @project = project + @project = meeting.project end end end diff --git a/modules/meeting/app/components/meetings/side_panel/details_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_component.html.erb index c9d94216d661..7bb46b14bec0 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/details_component.html.erb @@ -10,9 +10,9 @@ if @meeting.editable? href = if @meeting.template? - details_dialog_recurring_meeting_path(@meeting.recurring_meeting) + details_dialog_project_recurring_meeting_path(@project, @meeting.recurring_meeting) else - details_dialog_meeting_path(@meeting) + details_dialog_project_meeting_path(@project, @meeting) end section.with_action_icon( @@ -40,7 +40,7 @@ if @series.present? details.with_row(mb: 2) do render_meeting_attribute_row(:iterations) do - render(Primer::Beta::Link.new(href: recurring_meeting_path(@series))) do + render(Primer::Beta::Link.new(href: project_recurring_meeting_path(@project, @series))) do @series.title end end @@ -128,7 +128,7 @@ scheme: :link, underline: false, tag: :a, - href: participants_dialog_meeting_path(@meeting), + href: participants_dialog_project_meeting_path(@project, @meeting), classes: "hide-when-print", data: { controller: 'async-dialog' } )) do diff --git a/modules/meeting/app/components/meetings/side_panel/details_component.rb b/modules/meeting/app/components/meetings/side_panel/details_component.rb index 26527bbca4b8..47f5a8af270e 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_component.rb +++ b/modules/meeting/app/components/meetings/side_panel/details_component.rb @@ -36,6 +36,7 @@ def initialize(meeting:) super @meeting = meeting + @project = @meeting.project @series = meeting.recurring_meeting end diff --git a/modules/meeting/app/components/meetings/side_panel/details_dialog_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_dialog_component.html.erb index cc9da700ac55..03a57737cbbb 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_dialog_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/details_dialog_component.html.erb @@ -4,7 +4,6 @@ size: :medium_portrait )) do |dialog| dialog.with_header(variant: :large) - dialog.with_show_button(icon: :pencil, 'aria-label': t("label_meeting_details_edit"), scheme: :invisible) render(Meetings::SidePanel::DetailsFormComponent.new(meeting: @meeting)) end %> diff --git a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb index cc719ac1358a..fe010ed2065e 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/details_form_component.html.erb @@ -4,20 +4,20 @@ model: @meeting, method: :put, data: { turbo: true, turbo_stream: true }, - url: update_details_meeting_path(@meeting) + url: update_details_project_meeting_path(@project, @meeting) ) do |f| component_collection do |collection| collection.with_component(Primer::Alpha::Dialog::Body.new) do flex_layout(mb: 3) do |modal_body| modal_body.with_row do - render(BaseErrorsComponent.new(@meeting)) + render(BaseErrorsComponent.new(@meeting, mb: 3)) end - modal_body.with_row(mt: 3) do + modal_body.with_row(mb: 3) do render(Meeting::TimeGroup.new(f, meeting: @meeting)) end - modal_body.with_row(mt: 3) do + modal_body.with_row do render(Meeting::Location.new(f, meeting: @meeting)) end diff --git a/modules/meeting/app/components/meetings/side_panel/details_form_component.rb b/modules/meeting/app/components/meetings/side_panel/details_form_component.rb index fb0bdde00cdb..2d71a81ab812 100644 --- a/modules/meeting/app/components/meetings/side_panel/details_form_component.rb +++ b/modules/meeting/app/components/meetings/side_panel/details_form_component.rb @@ -36,10 +36,11 @@ def initialize(meeting:) super @meeting = meeting + @project = meeting.project end def render? - User.current.allowed_in_project?(:edit_meetings, @meeting.project) + User.current.allowed_in_project?(:edit_meetings, @project) end private diff --git a/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb b/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb index 89ea9685416b..181af8854ae4 100644 --- a/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/participants_component.html.erb @@ -13,7 +13,7 @@ icon: :gear, scheme: :invisible, tag: :a, - href: participants_dialog_meeting_path(@meeting), + href: participants_dialog_project_meeting_path(@project, @meeting), classes: "hide-when-print", data: { controller: 'async-dialog' }, 'aria-label': t("label_meeting_manage_participants"), @@ -39,7 +39,7 @@ underline: false, font_weight: :bold, tag: :a, - href: participants_dialog_meeting_path(@meeting), + href: participants_dialog_project_meeting_path(@project, @meeting), classes: "hide-when-print", data: { controller: 'async-dialog' } )) do |button| diff --git a/modules/meeting/app/components/meetings/side_panel/participants_component.rb b/modules/meeting/app/components/meetings/side_panel/participants_component.rb index 38070b049586..3d43c11407b5 100644 --- a/modules/meeting/app/components/meetings/side_panel/participants_component.rb +++ b/modules/meeting/app/components/meetings/side_panel/participants_component.rb @@ -45,6 +45,7 @@ def initialize(meeting:) super @meeting = meeting + @project = meeting.project end def elements diff --git a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb index 5fd081e9c14f..14ef85663957 100644 --- a/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/participants_dialog.html.erb @@ -12,11 +12,11 @@ id: "edit_participants_form", model: @meeting, method: :put, - url: update_participants_meeting_path(@meeting), + url: update_participants_project_meeting_path(@project, @meeting), data: { turbo: true, turbo_stream: true }, class: 'Overlay-form' ) do |f| - flex_layout(mt: 3) do |form_container| + flex_layout do |form_container| form_container.with_row do flex_layout(justify_content: :flex_end) do |header| diff --git a/modules/meeting/app/components/meetings/side_panel/participants_dialog.rb b/modules/meeting/app/components/meetings/side_panel/participants_dialog.rb index 2c11ba13c869..5d286733d735 100644 --- a/modules/meeting/app/components/meetings/side_panel/participants_dialog.rb +++ b/modules/meeting/app/components/meetings/side_panel/participants_dialog.rb @@ -37,10 +37,11 @@ def initialize(meeting:) super @meeting = meeting + @project = meeting.project end def render? - User.current.allowed_in_project?(:view_meetings, @meeting.project) + User.current.allowed_in_project?(:view_meetings, @project) end end end diff --git a/modules/meeting/app/components/meetings/side_panel/state_component.html.erb b/modules/meeting/app/components/meetings/side_panel/state_component.html.erb index 275739d25699..83646b56bcc4 100644 --- a/modules/meeting/app/components/meetings/side_panel/state_component.html.erb +++ b/modules/meeting/app/components/meetings/side_panel/state_component.html.erb @@ -6,7 +6,7 @@ case @meeting.state when "open" section.with_description(display: [:none, nil, :block]) { t("text_meeting_open_description") } - flex_layout(classes: 'op-meeting-sidebar-state') do |open_state| + flex_layout(classes: "op-meeting-sidebar-state") do |open_state| open_state.with_row do render(Primer::Beta::State.new(title: "state", scheme: :open)) do flex_layout do |open_state_label| @@ -24,9 +24,9 @@ if edit_enabled? section.with_footer_button( tag: :a, - href: change_state_meeting_path(@meeting, state: 'closed'), + href: change_state_project_meeting_path(@project, @meeting, state: "closed"), classes: "hide-when-print", - data: { 'turbo-stream': true, 'turbo-method': 'put' }, + data: { "turbo-stream": true, "turbo-method": "put" }, test_selector: "close-meeting-button" ) do |button| button.with_leading_visual_icon(icon: :unlock) @@ -37,7 +37,7 @@ when "closed" section.with_description(display: [:none, nil, :block]) { t("text_meeting_closed_description") } - flex_layout(classes: 'op-meeting-sidebar-state') do |closed_state| + flex_layout(classes: "op-meeting-sidebar-state") do |closed_state| closed_state.with_row do render(Primer::Beta::State.new(title: "state", scheme: :default)) do flex_layout do |closed_state_label| @@ -55,9 +55,9 @@ if edit_enabled? section.with_footer_button( tag: :a, - href: change_state_meeting_path(@meeting, state: 'open'), + href: change_state_project_meeting_path(@project, @meeting, state: "open"), classes: "hide-when-print", - data: { 'turbo-stream': true, 'turbo-method': 'put' } + data: { "turbo-stream": true, "turbo-method": "put" } ) do |button| button.with_leading_visual_icon(icon: :unlock) t("label_meeting_reopen_action") diff --git a/modules/meeting/app/components/meetings/side_panel/state_component.rb b/modules/meeting/app/components/meetings/side_panel/state_component.rb index d79cdf04ce40..b9776b8a9c72 100644 --- a/modules/meeting/app/components/meetings/side_panel/state_component.rb +++ b/modules/meeting/app/components/meetings/side_panel/state_component.rb @@ -36,12 +36,13 @@ def initialize(meeting:) super @meeting = meeting + @project = meeting.project end private def edit_enabled? - User.current.allowed_in_project?(:close_meeting_agendas, @meeting.project) + User.current.allowed_in_project?(:close_meeting_agendas, @project) end end end diff --git a/modules/meeting/app/components/meetings/table_component.rb b/modules/meeting/app/components/meetings/table_component.rb index 56a1433c6c7d..9b1bd2dccb3a 100644 --- a/modules/meeting/app/components/meetings/table_component.rb +++ b/modules/meeting/app/components/meetings/table_component.rb @@ -44,6 +44,23 @@ def sortable? false end + def paginated? + false + end + + def has_footer? + model.is_a?(ActiveRecord::Relation) && + (model.total_entries > model.size) + end + + def footer + render Meetings::TableFooterComponent.new( + upcoming: options[:upcoming], + total: model.total_entries, + count: model.size + ) + end + def has_actions? true end @@ -71,5 +88,13 @@ def columns def recurring? model.first.is_a?(RecurringMeeting) end + + def blank_title + I18n.t("meeting.blankslate.title") + end + + def blank_description + I18n.t("meeting.blankslate.desc") + end end end diff --git a/modules/meeting/app/components/meetings/table_footer_component.html.erb b/modules/meeting/app/components/meetings/table_footer_component.html.erb new file mode 100644 index 000000000000..21ebefae8c66 --- /dev/null +++ b/modules/meeting/app/components/meetings/table_footer_component.html.erb @@ -0,0 +1,56 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + component_wrapper do + flex_layout(justify_content: :space_between) do |flex| + flex.with_column(classes: "ellipsis") do + render(Primer::BaseComponent.new(tag: :span, color: :muted)) do + concat render(Primer::Beta::Octicon.new(icon: :iterations, mr: 1, ml: 1)) + concat render(Primer::Beta::Text.new(font_weight: :bold)) { label } + end + end + flex.with_column do + render( + Primer::Beta::Button.new( + scheme: :link, + size: :medium, + tag: :a, + href: url_for(limit: next_count, upcoming:), + data: { + keep_scroll_position_target: "triggerButton" + } + ) + ) do + I18n.t(:label_recurring_meeting_show_more) + end + end + end + end +%> diff --git a/modules/meeting/app/components/meetings/table_footer_component.rb b/modules/meeting/app/components/meetings/table_footer_component.rb new file mode 100644 index 000000000000..42c9e408526d --- /dev/null +++ b/modules/meeting/app/components/meetings/table_footer_component.rb @@ -0,0 +1,56 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Meetings + class TableFooterComponent < ApplicationComponent + include ApplicationHelper + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + attr_reader :total, :count, :upcoming + + def initialize(count:, total:, upcoming:) + super + + @count = count + @total = total + @upcoming = upcoming + end + + def label + I18n.t(:label_meeting_more, count: total - count) + end + + def next_count + [ + total, + count + PaginationHelper::SHOW_MORE_DEFAULT_INCREMENT + ].min + end + end +end diff --git a/modules/meeting/app/components/meetings/update_flash_component.rb b/modules/meeting/app/components/meetings/update_flash_component.rb index 0b25370a52e3..486ac124d3fa 100644 --- a/modules/meeting/app/components/meetings/update_flash_component.rb +++ b/modules/meeting/app/components/meetings/update_flash_component.rb @@ -31,6 +31,7 @@ class UpdateFlashComponent < ApplicationComponent include OpTurbo::Streamable alias_method :meeting, :model + delegate :project, to: :meeting def call render( @@ -42,9 +43,11 @@ def call ) do |banner| banner.with_action_button( tag: :a, - href: helpers.meeting_path(meeting), - data: { turbo: false, poll_for_changes_target: "reloadButton" }, - size: :medium + href: helpers.project_meeting_path(project, meeting), + size: :medium, + data: { + keep_scroll_position_target: "triggerButton" + } ) { I18n.t("label_meeting_reload") } I18n.t("notice_meeting_updated") diff --git a/modules/meeting/app/components/recurring_meetings/delete_dialog_component.html.erb b/modules/meeting/app/components/recurring_meetings/delete_dialog_component.html.erb new file mode 100644 index 000000000000..e06d09e2df2a --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/delete_dialog_component.html.erb @@ -0,0 +1,46 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::DangerDialog.new( + id:, + title:, + form_arguments: { + action: project_recurring_meeting_path(@project, @recurring_meeting), + method: :delete, + data: { turbo: true } + } + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { I18n.t("recurring_meeting.delete_dialog.heading") } + message.with_description_content(confirmation_message) + end + dialog.with_confirmation_check_box_content(I18n.t("text_permanent_delete_confirmation_checkbox_label")) + end +%> diff --git a/modules/meeting/app/components/recurring_meetings/delete_dialog_component.rb b/modules/meeting/app/components/recurring_meetings/delete_dialog_component.rb new file mode 100644 index 000000000000..3575dd7b3c46 --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/delete_dialog_component.rb @@ -0,0 +1,55 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module RecurringMeetings + class DeleteDialogComponent < ApplicationComponent + include ApplicationHelper + include OpTurbo::Streamable + + def initialize(recurring_meeting:) + super + + @recurring_meeting = recurring_meeting + @project = recurring_meeting.project + end + + private + + def id = "delete-recurring-meeting-dialog" + + def title = I18n.t("recurring_meeting.delete_dialog.title") + + def confirmation_message + t("recurring_meeting.delete_dialog.confirmation_message_html", + title: @recurring_meeting.title, + count: @recurring_meeting.instantiated_meetings.count) + end + end +end diff --git a/modules/meeting/app/components/recurring_meetings/delete_scheduled_dialog_component.html.erb b/modules/meeting/app/components/recurring_meetings/delete_scheduled_dialog_component.html.erb new file mode 100644 index 000000000000..e0aabf2fb701 --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/delete_scheduled_dialog_component.html.erb @@ -0,0 +1,51 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::DangerDialog.new( + id:, + title:, + confirm_button_text:, + cancel_button_text:, + form_arguments: { + action: destroy_scheduled_project_recurring_meeting_path( + @project, + @series, + start_time: @scheduled_meeting.start_time.iso8601 + ), + method: :delete, + data: { turbo: true } + } + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { I18n.t("recurring_meeting.scheduled_delete_dialog.heading") } + message.with_description_content(confirmation_message) + end + end +%> diff --git a/modules/meeting/app/components/recurring_meetings/delete_scheduled_dialog_component.rb b/modules/meeting/app/components/recurring_meetings/delete_scheduled_dialog_component.rb new file mode 100644 index 000000000000..e7594932273e --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/delete_scheduled_dialog_component.rb @@ -0,0 +1,56 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module RecurringMeetings + class DeleteScheduledDialogComponent < ApplicationComponent + include ApplicationHelper + include OpTurbo::Streamable + + def initialize(scheduled_meeting:) + super + + @scheduled_meeting = scheduled_meeting + @series = scheduled_meeting.recurring_meeting + @project = @series.project + end + + private + + def id = "delete-scheduled-recurring-meeting-dialog" + + def title = I18n.t("recurring_meeting.scheduled_delete_dialog.title") + + def confirmation_message = t("recurring_meeting.scheduled_delete_dialog.confirmation_message_html") + + def confirm_button_text = I18n.t("recurring_meeting.scheduled_delete_dialog.confirm_button") + + def cancel_button_text = I18n.t(:button_close) + end +end diff --git a/modules/meeting/app/components/recurring_meetings/end_series_dialog_component.html.erb b/modules/meeting/app/components/recurring_meetings/end_series_dialog_component.html.erb new file mode 100644 index 000000000000..f914390c6b1e --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/end_series_dialog_component.html.erb @@ -0,0 +1,48 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::DangerDialog.new( + id: "recurring-meetings-end-series-dialog", + confirm_button_text: I18n.t(:label_recurring_meeting_series_end_now), + title: I18n.t("recurring_meeting.end_series_dialog.title"), + form_arguments: { + action: end_series_project_recurring_meeting_path(@project, @series), + method: :post + } + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { I18n.t(:text_meeting_series_end_early_heading) } + message.with_description_content(I18n.t(:text_meeting_series_end_early)) + + end + + dialog.with_confirmation_check_box_content(I18n.t("text_permanent_delete_confirmation_checkbox_label")) + end +%> diff --git a/modules/meeting/app/components/recurring_meetings/show_component.rb b/modules/meeting/app/components/recurring_meetings/end_series_dialog_component.rb similarity index 86% rename from modules/meeting/app/components/recurring_meetings/show_component.rb rename to modules/meeting/app/components/recurring_meetings/end_series_dialog_component.rb index c2ad5dc03188..7ce1a381e377 100644 --- a/modules/meeting/app/components/recurring_meetings/show_component.rb +++ b/modules/meeting/app/components/recurring_meetings/end_series_dialog_component.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -27,15 +29,15 @@ #++ module RecurringMeetings - class ShowComponent < ApplicationComponent + class EndSeriesDialogComponent < ApplicationComponent include ApplicationHelper - include OpPrimer::ComponentHelpers + include OpTurbo::Streamable - def initialize(meeting:, project:) + def initialize(series) super - @meeting = meeting - @project = project + @series = series + @project = series.project end end end diff --git a/modules/meeting/app/components/recurring_meetings/footer_component.html.erb b/modules/meeting/app/components/recurring_meetings/footer_component.html.erb index 9defd037db85..f2ad27c9f2e6 100644 --- a/modules/meeting/app/components/recurring_meetings/footer_component.html.erb +++ b/modules/meeting/app/components/recurring_meetings/footer_component.html.erb @@ -43,7 +43,10 @@ See COPYRIGHT and LICENSE files for more details. scheme: :link, size: :medium, tag: :a, - href: polymorphic_path([@project, @meeting], count: @current_count, direction: @direction) + href: polymorphic_path([@project, @meeting], limit: next_count, direction: @direction), + data: { + keep_scroll_position_target: "triggerButton" + } ) ) do |_c| I18n.t(:label_recurring_meeting_show_more) @@ -52,5 +55,3 @@ See COPYRIGHT and LICENSE files for more details. end end %> - - diff --git a/modules/meeting/app/components/recurring_meetings/footer_component.rb b/modules/meeting/app/components/recurring_meetings/footer_component.rb index 5a68df141e95..8ebe2d976b9a 100644 --- a/modules/meeting/app/components/recurring_meetings/footer_component.rb +++ b/modules/meeting/app/components/recurring_meetings/footer_component.rb @@ -42,7 +42,14 @@ def initialize(meeting:, project:, count:, direction:, max_count:) @max_count = max_count end + def next_count + @current_count + PaginationHelper::SHOW_MORE_DEFAULT_INCREMENT + end + def label + # If it never ends, don't try to count it + return endless_label if @meeting.end_after_never? + count = @max_count - @current_count label_suffix = count == 1 ? "_singular" : "" @@ -52,5 +59,9 @@ def label I18n.t("label_recurring_meeting_more#{label_suffix}", count:, schedule: @meeting.full_schedule_in_words) end end + + def endless_label + I18n.t("label_recurring_meeting_no_end_date", schedule: @meeting.full_schedule_in_words) + end end end diff --git a/modules/meeting/app/components/recurring_meetings/row_component.rb b/modules/meeting/app/components/recurring_meetings/row_component.rb index 8a958c871717..5db63e2e4421 100644 --- a/modules/meeting/app/components/recurring_meetings/row_component.rb +++ b/modules/meeting/app/components/recurring_meetings/row_component.rb @@ -35,7 +35,6 @@ class RowComponent < ::OpPrimer::BorderBoxRowComponent delegate :recurring_meeting, to: :model delegate :project, to: :recurring_meeting delegate :schedule, to: :meeting - delegate :current_project, to: :table def instantiated? meeting.present? @@ -51,20 +50,12 @@ def column_args(column) def start_time if instantiated? - link_to start_time_title, current_project_meeting_path(meeting) + link_to start_time_title, project_meeting_path(project, meeting) else start_time_title end end - def current_project_meeting_path(meeting) - if current_project - project_meeting_path(current_project, meeting) - else - meeting_path(meeting) - end - end - def user_time_zone(time) helpers.in_user_zone(time) end @@ -97,7 +88,7 @@ def state elsif instantiated? meeting.state else - "scheduled" + "planned" end end @@ -130,7 +121,7 @@ def create size: :medium, tag: :a, data: { "turbo-method": "post" }, - href: init_recurring_meeting_path(model.recurring_meeting.id, start_time: model.start_time.iso8601) + href: init_project_recurring_meeting_path(project, model.recurring_meeting.id, start_time: model.start_time.iso8601) ) ) do |_c| I18n.t(:label_recurring_meeting_create) @@ -163,7 +154,9 @@ def ical_action(menu) return unless instantiated? && !cancelled? menu.with_item(label: I18n.t(:label_icalendar_download), - href: download_ics_meeting_path(meeting), + href: download_ics_project_recurring_meeting_path(project, + model.recurring_meeting, + occurrence_id: meeting.id), content_arguments: { data: { turbo: false } }) do |item| @@ -177,9 +170,10 @@ def delete_action(menu) menu.with_item( label: past? ? I18n.t(:label_recurring_meeting_delete) : I18n.t(:label_recurring_meeting_cancel), scheme: :danger, - href: current_project_meeting_path(meeting), - form_arguments: { - method: :delete, data: { confirm: I18n.t(:label_recurring_occurrence_delete_confirmation), turbo: false } + href: delete_dialog_project_meeting_path(project, meeting), + tag: :a, + content_arguments: { + data: { controller: "async-dialog" } } ) do |item| item.with_leading_visual_icon(icon: :trash) @@ -192,9 +186,12 @@ def delete_scheduled_action(menu) menu.with_item( label: I18n.t(:label_recurring_meeting_cancel), scheme: :danger, - href: delete_scheduled_recurring_meeting_path(model.recurring_meeting.id, start_time: model.start_time.iso8601), - form_arguments: { - method: :post, data: { confirm: I18n.t("text_are_you_sure"), turbo: false } + href: delete_scheduled_dialog_project_recurring_meeting_path(project, + model.recurring_meeting, + start_time: model.start_time.iso8601), + tag: :a, + content_arguments: { + data: { controller: "async-dialog" } } ) do |item| item.with_leading_visual_icon(icon: :trash) @@ -206,7 +203,7 @@ def restore_action(menu) menu.with_item( label: I18n.t(:label_recurring_meeting_restore), - href: init_recurring_meeting_path(recurring_meeting, start_time: model.start_time.iso8601), + href: init_project_recurring_meeting_path(project, recurring_meeting, start_time: model.start_time.iso8601), form_arguments: { method: :post } diff --git a/modules/meeting/app/components/recurring_meetings/show_component.html.erb b/modules/meeting/app/components/recurring_meetings/show_component.html.erb deleted file mode 100644 index e69de29bb2d1..000000000000 diff --git a/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb b/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb index 998c20bc9bc9..d604ae9d7956 100644 --- a/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb +++ b/modules/meeting/app/components/recurring_meetings/show_page_header_component.html.erb @@ -1,50 +1,77 @@ -<%= render(Primer::OpenProject::PageHeader.new) do |header| - header.with_title { page_title } - header.with_description { page_description } - header.with_breadcrumbs(breadcrumb_items) +<%= + helpers.content_controller "keep-scroll-position", + keep_scroll_position_url_value: polymorphic_path([@project, @meeting]) - header.with_action_button( - tag: :a, - mobile_label: I18n.t("recurring_meeting.template.label_view_template"), - mobile_icon: :eye, - size: :medium, - href: meeting_path(@meeting.template) - ) { I18n.t("recurring_meeting.template.label_view_template") } + component_wrapper do + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { page_title } + header.with_description { page_description } + header.with_breadcrumbs(breadcrumb_items) - if render_create_button? - header.with_action_menu(menu_arguments: { anchor_align: :end }, - button_arguments: { icon: "op-kebab-vertical", - classes: "hide-when-print", - "aria-label": "Menu", - data: { - "test-selector": "recurring-meeting-action-menu" - } }) do |menu, _button| + if render_create_button? + header.with_action_menu(menu_arguments: { anchor_align: :end }, + button_arguments: { icon: "op-kebab-vertical", + classes: "hide-when-print", + "aria-label": "Menu", + data: { + "test-selector": "recurring-meeting-action-menu" + } }) do |menu, _button| - menu.with_item( - label: I18n.t(:label_recurring_meeting_series_edit), - icon: :gear, - href: details_dialog_recurring_meeting_path(@meeting), - tag: :a, - content_arguments: { - data: { controller: 'async-dialog' }, - }, - 'aria-label': t(:label_recurring_meeting_series_edit), - test_selector: "edit-meeting-details-button", - ) + menu.with_item( + label: I18n.t(:label_recurring_meeting_series_edit), + icon: :gear, + href: details_dialog_project_recurring_meeting_path(@project, @meeting), + tag: :a, + content_arguments: { + data: { controller: 'async-dialog' }, + }, + 'aria-label': t(:label_recurring_meeting_series_edit), + test_selector: "edit-meeting-details-button", + ) do |item| + item.with_leading_visual_icon(icon: :pencil) + end - menu.with_item( - label: t(:label_icalendar_download), - href: download_ics_recurring_meeting_path(@meeting) - ) + menu.with_item( + label: t(:label_icalendar_download), + href: download_ics_project_recurring_meeting_path(@project, @meeting) + ) do |item| + item.with_leading_visual_icon(icon: :calendar) + end - menu.with_item( - label: I18n.t(:label_recurring_meeting_series_delete), - href: polymorphic_path([@project, @meeting]), - scheme: :danger, - form_arguments: { - method: :delete, data: { confirm: t("text_are_you_sure"), turbo: 'false' } - } - ) + menu.with_item( + label: t('meeting.label_mail_all_participants'), + href: notify_project_recurring_meeting_path(@project, @meeting), + form_arguments: { method: :post } + ) do |item| + item.with_leading_visual_icon(icon: :mail) + end + + if !@meeting.has_ended? && @meeting.start_time.to_date < Time.zone.today + menu.with_item( + label: t(:label_recurring_meeting_series_end), + href: end_series_dialog_project_recurring_meeting_path(@project, @meeting), + tag: :a, + content_arguments: { + data: { controller: 'async-dialog' }, + } + ) do |item| + item.with_leading_visual_icon(icon: :"x-circle") + end + end + + menu.with_item( + label: I18n.t(:label_recurring_meeting_series_delete), + href: delete_dialog_project_recurring_meeting_path(@project, @meeting), + scheme: :danger, + tag: :a, + content_arguments: { + data: { controller: 'async-dialog' } + } + ) do |item| + item.with_leading_visual_icon(icon: :trash) + end + end + end end end -end %> +%> diff --git a/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb b/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb index 757fe2c6fe99..dc7fea60b79e 100644 --- a/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb +++ b/modules/meeting/app/components/recurring_meetings/show_page_header_component.rb @@ -30,14 +30,15 @@ module RecurringMeetings class ShowPageHeaderComponent < ApplicationComponent + include OpTurbo::Streamable include OpPrimer::ComponentHelpers include ApplicationHelper - def initialize(project: nil, meeting: nil) + def initialize(meeting: nil) super - @project = project @meeting = meeting + @project = meeting.project end def render_create_button? @@ -64,8 +65,17 @@ def label_text I18n.t(:label_recurring_meeting) end - def page_title - @meeting.present? ? "#{@meeting.title} (Meeting series)" : I18n.t(:label_recurring_meeting_plural) + def page_title(breadcrumb = nil) + @meeting.present? ? meeting_series_title(breadcrumb).to_s : I18n.t(:label_recurring_meeting_plural) + end + + def meeting_series_title(breadcrumb) + concat @meeting.title + if breadcrumb + concat render(Primer::Beta::Text.new) { " (#{I18n.t(:label_meeting_series)})" } + else + concat render(Primer::Beta::Text.new(color: :muted)) { " (#{I18n.t(:label_meeting_series)})" } + end end def page_description @@ -76,7 +86,7 @@ def breadcrumb_items [parent_element, { href: @project.present? ? project_meetings_path(@project.id) : meetings_path, text: I18n.t(:label_meeting_plural) }, - page_title] + page_title(true)] end def parent_element diff --git a/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb index 49d2e2e15419..68ab3beef828 100644 --- a/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb +++ b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.html.erb @@ -7,13 +7,13 @@ render(Primer::Alpha::SegmentedControl.new("aria-label": I18n.t(:label_filter_plural))) do |control| control.with_item(tag: :a, icon: :"arrow-right", - href: recurring_meeting_path(@meeting), + href: project_recurring_meeting_path(@meeting.project, @meeting), label: t(:label_upcoming_meetings_short), title: t(:label_upcoming_meetings), selected: @params[:direction] != "past") control.with_item(tag: :a, icon: :history, - href: recurring_meeting_path(@meeting, direction: :past), + href: project_recurring_meeting_path(@meeting.project, @meeting, direction: :past), label: t(:label_past_meetings_short), title: t(:label_past_meetings), selected: @params[:direction] == "past") diff --git a/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb index 8d7f8c856985..68d918ebee2f 100644 --- a/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb +++ b/modules/meeting/app/components/recurring_meetings/show_page_sub_header_component.rb @@ -34,11 +34,11 @@ class ShowPageSubHeaderComponent < ApplicationComponent # rubocop:enable OpenProject/AddPreviewForViewComponent include ApplicationHelper - def initialize(meeting:, params:, project: nil) + def initialize(meeting:, params:) super @meeting = meeting - @project = project + @project = meeting.project @params = params end diff --git a/modules/meeting/app/components/recurring_meetings/table_component.rb b/modules/meeting/app/components/recurring_meetings/table_component.rb index 5b92be0e4aec..219b6f5c6821 100644 --- a/modules/meeting/app/components/recurring_meetings/table_component.rb +++ b/modules/meeting/app/components/recurring_meetings/table_component.rb @@ -30,7 +30,7 @@ module RecurringMeetings class TableComponent < ::OpPrimer::BorderBoxTableComponent - options :current_project, :count, :direction, :max_count + options :current_project, :count, :direction, :max_count, :blankslate_title, :blankslate_desc columns :start_time, :relative_time, :status, :create @@ -39,7 +39,8 @@ def has_actions? end def has_footer? - return false unless recurring_meeting + return false unless recurring_meeting && rows.any? { |r| r.id.nil? } + return true if options[:max_count].nil? options[:max_count] - count > 0 end @@ -88,5 +89,25 @@ def recurring_meeting def count @count ||= [options[:count], rows.count].max end + + def blankslate? + options[:blankslate_title].present? + end + + def render_blank_slate + render(Primer::Beta::Blankslate.new(border: false)) do |component| + component.with_visual_icon(icon: blank_icon, size: :medium) if blank_icon + component.with_heading(tag: :h2) { blank_title } + component.with_description { blank_description } + end + end + + def blank_title + blankslate? ? options[:blankslate_title] : I18n.t(:label_nothing_display) + end + + def blank_description + blankslate? ? options[:blankslate_desc] : I18n.t(:no_results_title_text) + end end end diff --git a/modules/meeting/app/components/recurring_meetings/table_header_component.html.erb b/modules/meeting/app/components/recurring_meetings/table_header_component.html.erb new file mode 100644 index 000000000000..418abfba49fe --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/table_header_component.html.erb @@ -0,0 +1,62 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + component_wrapper do + flex_layout do |flex| + flex.with_row(mb: 2, mt: @planned ? 5 : 0) do + flex_layout(justify_content: :space_between) do |container| + container.with_column do + render(Primer::OpenProject::Heading.new(tag: :h3)) { @title } + end + + if @planned + container.with_column do + render(Primer::Beta::Button.new( + tag: :a, + mobile_label: I18n.t("recurring_meeting.template.label_view_template"), + side: :medium, + href: meeting_path(@meeting.template) + )) do |button| + button.with_leading_visual_icon(icon: :pencil) + I18n.t("recurring_meeting.template.label_edit_template") + end + end + end + end + end + + flex.with_row(classes: "op-table-heading-no-mobile", mb: 2) do + render(Primer::Beta::Text.new(tag: :p)) do + @subtitle + end + end + end + end +%> diff --git a/modules/meeting/app/components/recurring_meetings/table_header_component.rb b/modules/meeting/app/components/recurring_meetings/table_header_component.rb new file mode 100644 index 000000000000..84054b8179da --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/table_header_component.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module RecurringMeetings + class TableHeaderComponent < ApplicationComponent + include ApplicationHelper + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + def initialize(meeting:, title:, subtitle:, planned: false) + super + + @meeting = meeting + @title = title + @subtitle = subtitle + @planned = planned + end + end +end diff --git a/modules/meeting/app/components/recurring_meetings/table_header_component.sass b/modules/meeting/app/components/recurring_meetings/table_header_component.sass new file mode 100644 index 000000000000..dd74be002602 --- /dev/null +++ b/modules/meeting/app/components/recurring_meetings/table_header_component.sass @@ -0,0 +1,5 @@ +@import "helpers" + +@media screen and (max-width: $breakpoint-md) + .op-table-heading-no-mobile + display: none diff --git a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb index 0b736b31f17f..b530a7ba08aa 100644 --- a/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb +++ b/modules/meeting/app/components/work_package_meetings_tab/add_work_package_to_meeting_form_component.html.erb @@ -6,7 +6,7 @@ method: :post, url: work_package_meeting_agenda_items_path(@work_package), ) do |f| - flex_layout(my: 3) do |flex| + flex_layout(mb: 3) do |flex| flex.with_row do if @base_errors&.any? render(Primer::Alpha::Banner.new(mb: 3, icon: :stop, scheme: :danger)) { @base_errors.join("\n") } diff --git a/modules/meeting/app/contracts/meetings/base_contract.rb b/modules/meeting/app/contracts/meetings/base_contract.rb index 229ca51a34a0..12df2b732c81 100644 --- a/modules/meeting/app/contracts/meetings/base_contract.rb +++ b/modules/meeting/app/contracts/meetings/base_contract.rb @@ -41,5 +41,16 @@ def self.model attribute :start_date attribute :start_time attribute :start_time_hour + attribute :template + + validate :template_requires_series + + private + + def template_requires_series + if model.template && model.recurring_meeting_id.nil? + errors.add(:template, :invalid) + end + end end end diff --git a/modules/meeting/app/contracts/meetings/create_contract.rb b/modules/meeting/app/contracts/meetings/create_contract.rb index 23c0b57d12d0..253ac3efe30b 100644 --- a/modules/meeting/app/contracts/meetings/create_contract.rb +++ b/modules/meeting/app/contracts/meetings/create_contract.rb @@ -44,6 +44,8 @@ def type_in_allowed end def user_allowed_to_add + return if model.project.nil? + unless user.allowed_in_project?(:create_meetings, model.project) errors.add :base, :error_unauthorized end diff --git a/modules/meeting/app/contracts/meetings/update_contract.rb b/modules/meeting/app/contracts/meetings/update_contract.rb index 9bb44d583a08..eda675da11ee 100644 --- a/modules/meeting/app/contracts/meetings/update_contract.rb +++ b/modules/meeting/app/contracts/meetings/update_contract.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -31,7 +33,7 @@ class UpdateContract < BaseContract include Redmine::I18n validate :user_allowed_to_edit - validate :not_before_scheduled_time + validate :valid_rescheduling_date, if: -> { check_reschedule? } attribute :lock_version do if model.lock_version.nil? || model.lock_version_changed? @@ -45,14 +47,39 @@ def user_allowed_to_edit end end - def not_before_scheduled_time - return unless model.recurring_meeting_id && model.scheduled_meeting - return unless model.changed.intersect?(%w[start_time start_date]) + def valid_rescheduling_date # rubocop:disable Metrics/AbcSize + if model.start_time < Time.zone.now + errors.add :start_date, :after_today + return + end + + check_before(model.scheduled_meeting.next_occurrence) + check_after(model.scheduled_meeting.previous_occurrence) + check_after(model.recurring_meeting.first_occurrence) + end + + def check_before(time) + # Avoid adding more errors if we already checked closer candidates + return if errors.has_key?(:start_date) - scheduled_time = model.scheduled_meeting.start_time - if model.start_time < scheduled_time - errors.add :start_date, :after, date: format_date(scheduled_time) + if time && model.start_time >= time + errors.add :start_date, :before, date: format_time(time) end end + + def check_after(time) + # Avoid adding more errors if we already checked closer candidates + return if errors.has_key?(:start_date) + + if time && model.start_time <= time + errors.add :start_date, :after, date: format_time(time) + end + end + + def check_reschedule? + model.recurring_meeting_id && + model.scheduled_meeting && + model.changed.intersect?(%w[start_time start_date start_time_hour]) + end end end diff --git a/modules/meeting/app/contracts/recurring_meetings/create_contract.rb b/modules/meeting/app/contracts/recurring_meetings/create_contract.rb index 5b32613aa598..443ff456f1e9 100644 --- a/modules/meeting/app/contracts/recurring_meetings/create_contract.rb +++ b/modules/meeting/app/contracts/recurring_meetings/create_contract.rb @@ -29,13 +29,34 @@ module RecurringMeetings class CreateContract < BaseContract validate :user_allowed_to_add + validate :project_is_present + validate :start_time_constraints private + def project_is_present + if model.project.nil? + errors.add :project_id, :blank + end + end + def user_allowed_to_add + return if model.project.nil? + unless user.allowed_in_project?(:create_meetings, model.project) errors.add :base, :error_unauthorized end end + + def start_time_constraints + return if model.start_time.nil? + return if model.start_time >= Time.zone.now + + if model.start_time.today? + errors.add :start_time_hour, :after_today + else + errors.add :start_date, :after_today + end + end end end diff --git a/modules/meeting/app/contracts/recurring_meetings/update_contract.rb b/modules/meeting/app/contracts/recurring_meetings/update_contract.rb index 358a4d9b5de6..8b324bf8a59f 100644 --- a/modules/meeting/app/contracts/recurring_meetings/update_contract.rb +++ b/modules/meeting/app/contracts/recurring_meetings/update_contract.rb @@ -28,12 +28,27 @@ module RecurringMeetings class UpdateContract < BaseContract + include Redmine::I18n + validate :user_allowed_to_edit + validate :not_before_scheduled_time def user_allowed_to_edit unless user.allowed_in_project?(:edit_meetings, model.project) errors.add :base, :error_unauthorized end end + + def not_before_scheduled_time # rubocop:disable Metrics/AbcSize + return unless model.changed.intersect?(%w[start_time start_date]) + + if model.start_time < DateTime.now + if model.start_time.to_date < Time.zone.today + errors.add :start_date, :after, date: format_date(Date.yesterday) + else + errors.add :start_time_hour, :datetime_must_be_in_future + end + end + end end end diff --git a/modules/meeting/app/controllers/concerns/meetings/agenda_component_streams.rb b/modules/meeting/app/controllers/concerns/meetings/agenda_component_streams.rb index f18d76f5c9f5..88f30b411f85 100644 --- a/modules/meeting/app/controllers/concerns/meetings/agenda_component_streams.rb +++ b/modules/meeting/app/controllers/concerns/meetings/agenda_component_streams.rb @@ -31,11 +31,10 @@ module AgendaComponentStreams extend ActiveSupport::Concern included do - def update_header_component_via_turbo_stream(project: @project, meeting: @meeting, state: :show) + def update_header_component_via_turbo_stream(meeting: @meeting, state: :show) update_via_turbo_stream( component: Meetings::HeaderComponent.new( meeting:, - project:, state: ) ) diff --git a/modules/meeting/app/controllers/meeting_agendas_controller.rb b/modules/meeting/app/controllers/meeting_agendas_controller.rb index 064313cc876b..3701f3411374 100644 --- a/modules/meeting/app/controllers/meeting_agendas_controller.rb +++ b/modules/meeting/app/controllers/meeting_agendas_controller.rb @@ -32,12 +32,12 @@ class MeetingAgendasController < MeetingContentsController def close @meeting.close_agenda_and_copy_to_minutes! - redirect_back_or_default controller: "/meetings", action: "show", id: @meeting + redirect_back_or_default({ controller: "/meetings", action: "show", id: @meeting }) end def open @content.unlock! - redirect_back_or_default controller: "/meetings", action: "show", id: @meeting + redirect_back_or_default({ controller: "/meetings", action: "show", id: @meeting }) end private diff --git a/modules/meeting/app/controllers/meeting_contents_controller.rb b/modules/meeting/app/controllers/meeting_contents_controller.rb index ba3657c217b2..4a7a926248ff 100644 --- a/modules/meeting/app/controllers/meeting_contents_controller.rb +++ b/modules/meeting/app/controllers/meeting_contents_controller.rb @@ -39,16 +39,13 @@ class MeetingContentsController < ApplicationController helper :watchers helper :meetings + before_action :load_and_authorize_in_optional_project before_action :find_meeting, :find_content - before_action :authorize - def show + def show # rubocop:disable Metrics/AbcSize if params[:id].present? && @content.last_journal.version == params[:id].to_i # Redirect links to the last version - redirect_to controller: "/meetings", - action: :show, - id: @meeting, - tab: @content_type.sub(/^meeting_/, "") + redirect_to project_meeting_path(@project, @meeting, tab: @content_type.sub(/^meeting_/, "")) return end @@ -65,7 +62,7 @@ def update # rubocop:disable Metrics/AbcSize if call.success? flash[:notice] = I18n.t(:notice_successful_update) - redirect_back_or_default controller: "/meetings", action: "show", id: @meeting + redirect_back_or_default project_meeting_path(@project, @meeting) else flash.now[:error] = call.message params[:tab] ||= "minutes" if @meeting.agenda.present? && @meeting.agenda.locked? diff --git a/modules/meeting/app/controllers/meetings_controller.rb b/modules/meeting/app/controllers/meetings_controller.rb index af3e93508f02..6e7143e7ac7b 100644 --- a/modules/meeting/app/controllers/meetings_controller.rb +++ b/modules/meeting/app/controllers/meetings_controller.rb @@ -27,18 +27,16 @@ #++ class MeetingsController < ApplicationController - before_action :load_and_authorize_in_optional_project, only: %i[index new new_dialog show create history] - before_action :verify_activities_module_activated, only: %i[history] + before_action :load_and_authorize_in_optional_project + before_action :determine_date_range, only: %i[history] before_action :determine_author, only: %i[history] before_action :build_meeting, only: %i[new new_dialog] before_action :find_meeting, except: %i[index new create new_dialog] + before_action :redirect_to_project, only: %i[show] before_action :set_activity, only: %i[history] before_action :find_copy_from_meeting, only: %i[create] before_action :convert_params, only: %i[create update update_participants] - before_action :authorize, except: %i[index new create update_title update_details update_participants change_state new_dialog] - before_action :authorize_global, - only: %i[index new create update_title update_details update_participants change_state new_dialog] before_action :prevent_template_destruction, only: :destroy helper :watchers @@ -58,8 +56,7 @@ class MeetingsController < ApplicationController menu_item :new_meeting, only: %i[new create] def index - @query = load_query - @meetings = load_meetings(@query) + load_meetings render "index", locals: { menu_name: project_or_global_menu } @@ -77,7 +74,7 @@ def show # rubocop:disable Metrics/AbcSize if @meeting.state == "cancelled" render_404 else - render(Meetings::ShowComponent.new(meeting: @meeting, project: @project), layout: true) + render(Meetings::ShowComponent.new(meeting: @meeting), layout: true) end elsif @meeting.agenda.present? && @meeting.agenda.locked? params[:tab] ||= "minutes" @@ -178,6 +175,13 @@ def copy end end + def delete_dialog + respond_with_dialog Meetings::DeleteDialogComponent.new( + meeting: @meeting, + back_url: params[:back_url] + ) + end + def destroy # rubocop:disable Metrics/AbcSize recurring = @meeting.recurring_meeting @@ -190,9 +194,9 @@ def destroy # rubocop:disable Metrics/AbcSize # rubocop:enable Rails/ActionControllerFlashBeforeRender if recurring - redirect_to polymorphic_path([@project, recurring]), status: :see_other + redirect_to project_recurring_meeting_path(@project, recurring), status: :see_other else - redirect_to polymorphic_path([@project, :meetings]), status: :see_other + redirect_back_or_default project_meetings_path(@project), status: :see_other end end @@ -353,16 +357,56 @@ def apply_default_filter_if_none_given(query) query.where("invited_user_id", "=", [User.current.id.to_s]) end - def load_meetings(query) - query - .results - .paginate(page: page_param, per_page: per_page_param) + def load_meetings + @query = load_query + + # We group meetings into individual groups, but only for upcoming meetings + if params[:upcoming] == "false" + @meetings = show_more_pagination(@query.results) + else + @grouped_meetings = group_meetings(@query.results) + end + end + + def group_meetings(all_meetings) # rubocop:disable Metrics/AbcSize + next_week = Time + .current + .next_occurring(Redmine::I18n.start_of_week) + .beginning_of_day + groups = Hash.new { |h, k| h[k] = [] } + groups[:later] = show_more_pagination(all_meetings + .where(start_time: next_week..) + .order(start_time: :asc)) + + all_meetings + .where(start_time: ...next_week) + .order(start_time: :asc) + .each do |meeting| + start_date = meeting.start_time.to_date + + group_key = + if start_date == Time.zone.today + :today + elsif start_date == Time.zone.tomorrow + :tomorrow + else + :this_week + end + + groups[group_key] << meeting + end + + groups end def build_meeting - @meeting = meeting_class.new - @meeting.project = @project - @meeting.author = User.current + meeting = meeting_class.new + + call = ::Meetings::SetAttributesService + .new(user: current_user, model: meeting, contract_class: EmptyContract) + .call(project: @project) + + @meeting = call.result end def meeting_class @@ -386,7 +430,6 @@ def find_meeting @meeting = Meeting .includes([:project, :author, { participants: :user }, :agenda, :minutes]) .find(params[:id]) - @project = @meeting.project rescue ActiveRecord::RecordNotFound render_404 end @@ -396,7 +439,7 @@ def convert_params # rubocop:disable Metrics/AbcSize # instance variable. @converted_params = meeting_params.to_h - @converted_params[:project] = @project + @converted_params[:project] = @project if @project.present? @converted_params[:duration] = @converted_params[:duration].to_hours if @converted_params[:duration].present? @converted_params[:send_notifications] = params[:send_notifications] == "1" @@ -408,15 +451,17 @@ def convert_params # rubocop:disable Metrics/AbcSize force_defaults end - # Recurring meeting occurrences can only be copied as one-off meetings + # Recurring meeting occurrences can only be copied as one-time meetings @converted_params[:recurring_meeting_id] = nil end def meeting_params if params[:meeting].present? - params.require(:meeting).permit(:title, :location, :start_time, - :duration, :start_date, :start_time_hour, :type, - participants_attributes: %i[email name invited attended user user_id meeting id]) + params + .require(:meeting) + .permit(:title, :location, :start_time, :project_id, + :duration, :start_date, :start_time_hour, :type, + participants_attributes: %i[email name invited attended user user_id meeting id]) end end @@ -428,10 +473,6 @@ def structured_meeting_params end end - def verify_activities_module_activated - render_403 if @project && !@project.module_enabled?("activity") - end - def set_activity @activity = Activities::Fetcher.new(User.current, project: @project, @@ -489,4 +530,10 @@ def copy_attributes def prevent_template_destruction render_400 if @meeting.templated? end + + def redirect_to_project + return if @project + + redirect_to project_meeting_path(@meeting.project, @meeting, tab: params[:tab]), status: :see_other + end end diff --git a/modules/meeting/app/controllers/recurring_meetings_controller.rb b/modules/meeting/app/controllers/recurring_meetings_controller.rb index 07cddebc7902..5d32f6546076 100644 --- a/modules/meeting/app/controllers/recurring_meetings_controller.rb +++ b/modules/meeting/app/controllers/recurring_meetings_controller.rb @@ -1,31 +1,34 @@ +# frozen_string_literal: true + class RecurringMeetingsController < ApplicationController - include RecurringMeetingsHelper include Layout include PaginationHelper include OpTurbo::ComponentStream include OpTurbo::FlashStreamHelper include OpTurbo::DialogStreamHelper - before_action :find_meeting, - only: %i[show update details_dialog destroy edit init delete_scheduled template_completed download_ics] - before_action :find_optional_project, only: %i[index show new create update details_dialog destroy edit delete_scheduled] - before_action :authorize_global, only: %i[index new create] - before_action :authorize, except: %i[index new create] - before_action :get_scheduled_meeting, only: %i[delete_scheduled] + before_action :load_and_authorize_in_optional_project + before_action :find_meeting, except: %i[index new create] + before_action :get_scheduled_meeting, only: %i[delete_scheduled_dialog destroy_scheduled] + before_action :redirect_to_project, only: %i[show] + before_action :set_direction, only: %i[show] before_action :convert_params, only: %i[create update] before_action :check_template_completable, only: %i[template_completed] + before_action :build_meeting_limits, only: %i[show] menu_item :meetings def index - @recurring_meetings = + results = if @project RecurringMeeting.visible.where(project_id: @project.id) else RecurringMeeting.visible end + @recurring_meetings = show_more_pagination(results) + respond_to do |format| format.html do render :index, locals: { menu_name: project_or_global_menu } @@ -38,15 +41,11 @@ def new end def show - @direction = params[:direction] - @max_count = max_count - @count = [(params[:count].to_i + 5), @max_count].min - - @meetings = if @direction == "past" - @recurring_meeting.scheduled_instances(upcoming: false).limit(@count) - else - upcoming_meetings(count: @count) - end + if @direction == "past" + @meetings = @recurring_meeting.scheduled_instances(upcoming: false).limit(@count) + else + @meetings, @planned_meetings = upcoming_meetings(count: @count) + end respond_to do |format| format.html do @@ -80,16 +79,18 @@ def create # rubocop:disable Metrics/AbcSize .new(user: current_user) .call(@converted_params) + @recurring_meeting = call.result + if call.success? flash[:notice] = I18n.t(:notice_successful_create).html_safe - redirect_to polymorphic_path([@project, :meeting], { id: call.result.template.id }), + redirect_to project_meeting_path(@recurring_meeting.project, @recurring_meeting.template), status: :see_other else respond_to do |format| format.turbo_stream do update_via_turbo_stream( component: Meetings::Index::FormComponent.new( - meeting: call.result, + meeting: @recurring_meeting, project: @project, copy_from: @copy_from ), @@ -112,7 +113,8 @@ def update .call(@converted_params) if call.success? - redirect_back(fallback_location: recurring_meeting_path(call.result), status: :see_other, turbo: false) + fallback_location = project_recurring_meeting_path(@project, call.result) + redirect_back(fallback_location:, status: :see_other, turbo: false) else respond_to do |format| format.turbo_stream do @@ -130,16 +132,41 @@ def update end end - def destroy - if @recurring_meeting.destroy - flash[:notice] = I18n.t(:notice_successful_delete) + def end_series_dialog + respond_with_dialog RecurringMeetings::EndSeriesDialogComponent.new(@recurring_meeting) + end + + def end_series + call = ::RecurringMeetings::UpdateService + .new(model: @recurring_meeting, user: current_user) + .call(end_after: "specific_date", end_date: Time.zone.today) + + if call.success? + @recurring_meeting.scheduled_meetings.upcoming.destroy_all else - flash[:error] = I18n.t(:error_failed_to_delete_entry) + flash[:error] = call.message end + redirect_to action: :show + end + + def delete_dialog + respond_with_dialog RecurringMeetings::DeleteDialogComponent.new( + recurring_meeting: @recurring_meeting + ) + end + + def destroy + # rubocop:disable Rails/ActionControllerFlashBeforeRender + RecurringMeetings::DeleteService + .new(model: @recurring_meeting, user: User.current) + .call + .on_success { flash[:notice] = I18n.t(:notice_successful_delete) } + .on_failure { flash[:error] = I18n.t(:error_failed_to_delete_entry) } + # rubocop:enable Rails/ActionControllerFlashBeforeRender respond_to do |format| format.html do - redirect_to polymorphic_path([@project, :meetings]) + redirect_to project_meetings_path(@project), status: :see_other end end end @@ -151,6 +178,8 @@ def template_completed if call.success? init_next_occurrence_job(@first_occurrence) + deliver_invitation_mails + flash[:success] = I18n.t("recurring_meeting.occurrence.first_created") else flash[:error] = call.message @@ -159,31 +188,57 @@ def template_completed redirect_to action: :show, id: @recurring_meeting, status: :see_other end - def delete_scheduled - if @scheduled.update(cancelled: true) + def delete_scheduled_dialog + respond_with_dialog RecurringMeetings::DeleteScheduledDialogComponent.new( + scheduled_meeting: @scheduled_meeting + ) + end + + def destroy_scheduled + if @scheduled_meeting.update(cancelled: true) flash[:notice] = I18n.t(:notice_successful_cancel) else flash[:error] = I18n.t(:error_failed_to_delete_entry) end - redirect_to polymorphic_path([@project, @recurring_meeting]), status: :see_other + redirect_to project_recurring_meeting_path(@project, @recurring_meeting), status: :see_other end - def download_ics - ::RecurringMeetings::ICalService - .new(user: current_user, series: @recurring_meeting) - .call + def download_ics # rubocop:disable Metrics/AbcSize + service = ::RecurringMeetings::ICalService.new(user: current_user, series: @recurring_meeting) + filename, result = + if params[:occurrence_id].present? + occurrence = @recurring_meeting.meetings.find_by(id: params[:occurrence_id]) + ["#{@recurring_meeting.title} - #{occurrence.start_time.to_date.iso8601}", + service.generate_occurrence(occurrence)] + else + [@recurring_meeting.title, service.generate_series] + end + + result .on_failure { |call| render_500(message: call.message) } .on_success do |call| - send_data call.result, filename: filename_for_content_disposition("#{@recurring_meeting.title}.ics") + send_data call.result, filename: filename_for_content_disposition("#{filename}.ics") end end + def notify + deliver_invitation_mails + flash[:notice] = I18n.t(:notice_successful_notification) + redirect_to action: :show + end + private + def redirect_to_project + return if @project + + redirect_to project_recurring_meeting_path(@recurring_meeting.project, @recurring_meeting), status: :see_other + end + def init_next_occurrence_job(from_time) # Now we can schedule the job to create the next occurrence - next_occurrence = @recurring_meeting.next_occurrence(from_time:)&.to_time + next_occurrence = @recurring_meeting.next_occurrence(from_time:) return if next_occurrence.nil? ::RecurringMeetings::InitNextOccurrenceJob @@ -191,19 +246,56 @@ def init_next_occurrence_job(from_time) .perform_later(@recurring_meeting, next_occurrence) end + def deliver_invitation_mails + @recurring_meeting + .template + .participants + .invited + .find_each do |participant| + MeetingSeriesMailer.template_completed( + @recurring_meeting, + participant.user, + User.current + ).deliver_later + end + end + def upcoming_meetings(count:) - meetings = @recurring_meeting - .scheduled_instances(upcoming: true) + opened = @recurring_meeting + .upcoming_instantiated_meetings .index_by(&:start_time) - merged = @recurring_meeting - .scheduled_occurrences(limit: count) - .map do |start_time| - meetings.delete(start_time) || scheduled_meeting(start_time) - end + cancelled = @recurring_meeting + .upcoming_cancelled_meetings + .index_by(&:start_time) + + # Planned meetings consist of scheduled occurrences and cancelled meetings + # Open meetings are removed from the scheduled occurrences as they are displayed separately + planned = @recurring_meeting + .scheduled_occurrences(limit: count + opened.count) + .reject { |start_time| opened.include?(start_time) } + .map { |start_time| cancelled[start_time] || scheduled_meeting(start_time) } + .first([count, 0].max) + + [opened.values.sort_by(&:start_time), planned] + end + + def set_direction + @direction = params[:direction] + end + + def build_meeting_limits + @max_count = + if @direction == "past" + @recurring_meeting.scheduled_instances(upcoming: false).count + elsif @recurring_meeting.will_end? + open = @recurring_meeting.upcoming_instantiated_meetings + ongoing = @recurring_meeting.ongoing_meetings + total = @recurring_meeting.remaining_occurrences.count - open.count + ongoing.count + [total, 0].max + end - # Ensure we keep any remaining future meetings that exceed the limit - merged + meetings.values.sort_by(&:start_time) + @count = [show_more_limit_param, @max_count].compact.min end def scheduled_meeting(start_time) @@ -211,9 +303,9 @@ def scheduled_meeting(start_time) end def get_scheduled_meeting - @scheduled = @recurring_meeting.scheduled_meetings.find_or_initialize_by(start_time: params[:start_time]) + @scheduled_meeting = @recurring_meeting.scheduled_meetings.find_or_initialize_by(start_time: params[:start_time]) - render_400 unless @scheduled.meeting_id.nil? + render_400 unless @scheduled_meeting.meeting_id.nil? end def find_optional_project @@ -233,14 +325,14 @@ def convert_params # instance variable. @converted_params = recurring_meeting_params.to_h - @converted_params[:project] = @project + @converted_params[:project] = @project if @project.present? @converted_params[:duration] = @converted_params[:duration].to_hours if @converted_params[:duration].present? end def recurring_meeting_params params .require(:meeting) - .permit(:title, :location, :start_time_hour, :duration, :start_date, + .permit(:project_id, :title, :location, :start_time_hour, :duration, :start_date, :interval, :frequency, :end_after, :end_date, :iterations) end @@ -261,7 +353,7 @@ def structured_meeting_params end def check_template_completable - @first_occurrence = @recurring_meeting.next_occurrence&.to_time + @first_occurrence = @recurring_meeting.next_occurrence if @first_occurrence.nil? render_400(message: I18n.t("recurring_meeting.occurrence.error_no_next")) return diff --git a/modules/meeting/app/forms/meeting/project_autocompleter.rb b/modules/meeting/app/forms/meeting/project_autocompleter.rb index 93257c1bfcc2..9e4f360b874d 100644 --- a/modules/meeting/app/forms/meeting/project_autocompleter.rb +++ b/modules/meeting/app/forms/meeting/project_autocompleter.rb @@ -33,17 +33,16 @@ class Meeting::ProjectAutocompleter < ApplicationForm id: "project_id", label: Project.model_name.human, required: true, - data: { - "test-selector": "project_id" - }, autocomplete_options: { with_search_icon: true, openDirectly: false, focusDirectly: false, dropdownPosition: "bottom", - inputName: "project_id", - inputValue: @project&.id, - filters: [{ name: "user_action", operator: "=", values: ["meetings/create"] }] + appendTo: "#new-meeting-dialog", + filters: [{ name: "user_action", operator: "=", values: ["meetings/create"] }], + data: { + "test-selector": "project_id" + } } ) end diff --git a/modules/meeting/app/forms/recurring_meeting/end_after.rb b/modules/meeting/app/forms/recurring_meeting/end_after.rb index 7b4725341663..95054379637f 100644 --- a/modules/meeting/app/forms/recurring_meeting/end_after.rb +++ b/modules/meeting/app/forms/recurring_meeting/end_after.rb @@ -30,12 +30,14 @@ class RecurringMeeting::EndAfter < ApplicationForm form do |meeting_form| meeting_form.select_list( name: "end_after", + required: true, label: I18n.t("activerecord.attributes.recurring_meeting.end_after"), data: { target_name: "end_after", "show-when-value-selected-target": "cause" } ) do |list| + list.option(value: "never", label: I18n.t("recurring_meeting.end_after.never")) list.option(value: "specific_date", label: I18n.t("recurring_meeting.end_after.specific_date")) list.option(value: "iterations", label: I18n.t("recurring_meeting.end_after.iterations")) end diff --git a/modules/meeting/app/forms/recurring_meeting/frequency.rb b/modules/meeting/app/forms/recurring_meeting/frequency.rb index 8ed3963ec16a..2080ed6d5540 100644 --- a/modules/meeting/app/forms/recurring_meeting/frequency.rb +++ b/modules/meeting/app/forms/recurring_meeting/frequency.rb @@ -30,6 +30,7 @@ class RecurringMeeting::Frequency < ApplicationForm form do |meeting_form| meeting_form.select_list( name: "frequency", + required: true, label: I18n.t("activerecord.attributes.recurring_meeting.frequency"), data: { target_name: "frequency", diff --git a/modules/meeting/app/forms/recurring_meeting/interval.rb b/modules/meeting/app/forms/recurring_meeting/interval.rb index e94f080bf69a..1828d1d9cc0f 100644 --- a/modules/meeting/app/forms/recurring_meeting/interval.rb +++ b/modules/meeting/app/forms/recurring_meeting/interval.rb @@ -30,6 +30,7 @@ class RecurringMeeting::Interval < ApplicationForm form do |meeting_form| meeting_form.text_field( name: :interval, + required: true, type: :number, step: 1, max: RecurringMeeting::MAX_INTERVAL, diff --git a/modules/meeting/app/mailers/meeting_mailer.rb b/modules/meeting/app/mailers/meeting_mailer.rb index fa026b3eb582..ded258c9c69c 100644 --- a/modules/meeting/app/mailers/meeting_mailer.rb +++ b/modules/meeting/app/mailers/meeting_mailer.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -57,6 +59,36 @@ def rescheduled(meeting, user, actor, changes:) end end + def cancelled(meeting, user, actor) + @actor = actor + @user = user + @meeting = meeting + + open_project_headers "Project" => @meeting.project.identifier, + "Meeting-Id" => @meeting.id + + with_attached_ics(meeting, user, cancelled: true) do + subject = I18n.t("meeting.email.cancelled.header", title: @meeting.title) + + mail(to: user, subject: "[#{@meeting.project.name}] #{subject}") + end + end + + def cancelled_series(series, user, actor) + @actor = actor + @user = user + @series = series + + open_project_headers "Project" => @series.project.identifier, + "Meeting-Id" => @series.id + + with_attached_ics(@series, user, cancelled: true) do + subject = I18n.t("meeting.email.cancelled.header", title: @series.title) + + mail(to: user, subject: "[#{@series.project.name}] #{subject}") + end + end + def icalendar_notification(meeting, user, _actor, **) @meeting = meeting @@ -70,14 +102,15 @@ def icalendar_notification(meeting, user, _actor, **) private - def with_attached_ics(meeting, user) + def with_attached_ics(meeting, user, **args) User.execute_as(user) do - call = ::Meetings::ICalService - .new(user:, meeting: @meeting) - .call + call = ics_service_call(meeting, user, **args) call.on_success do - attachments["meeting.ics"] = call.result + attachments["meeting.ics"] = { + mime_type: "text/calendar; method=REQUEST; charset=UTF-8", + content: call.result + } yield end @@ -88,6 +121,22 @@ def with_attached_ics(meeting, user) end end + def ics_service_call(meeting, user, **args) + if meeting.is_a?(RecurringMeeting) + ::RecurringMeetings::ICalService + .new(user:, series: meeting) + .generate_series(**args) + elsif meeting.recurring? + ::RecurringMeetings::ICalService + .new(user:, series: meeting.recurring_meeting) + .generate_occurrence(meeting, **args) + else + ::Meetings::ICalService + .new(user:, meeting:) + .call(**args) + end + end + def set_headers(meeting) open_project_headers "Project" => meeting.project.identifier, "Meeting-Id" => meeting.id headers["Content-Type"] = 'text/calendar; charset=utf-8; method="PUBLISH"; name="meeting.ics"' diff --git a/modules/meeting/app/mailers/meeting_series_mailer.rb b/modules/meeting/app/mailers/meeting_series_mailer.rb new file mode 100644 index 000000000000..f4e6210df55f --- /dev/null +++ b/modules/meeting/app/mailers/meeting_series_mailer.rb @@ -0,0 +1,84 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class MeetingSeriesMailer < UserMailer + def template_completed(series, user, actor) + @actor = actor + @series = series + @template = series.template + @next_occurrence = series.next_occurrence + @user = user + + set_headers(series) + + with_attached_ics(series, user) do + subject = I18n.t("meeting.email.series.title", title: series.title, project_name: series.project.name) + mail(to: user, subject:) + end + end + + def rescheduled(series, user, actor, changes:) + @actor = actor + @series = series + @user = user + @changes = changes + + set_headers(series) + + with_attached_ics(series, user) do + subject = I18n.t("meeting.email.series_rescheduled.title", title: series.title, project_name: series.project.name) + mail(to: user, subject:) + end + end + + private + + def with_attached_ics(series, user) + User.execute_as(user) do + call = ::RecurringMeetings::ICalService + .new(user:, series: series) + .generate_series + + call.on_success do + attachments["meeting.ics"] = call.result + + yield + end + + call.on_failure do + Rails.logger.error { "Failed to create ICS attachment for meeting #{series.id}: #{call.message}" } + end + end + end + + def set_headers(series) + open_project_headers "Project" => series.project.identifier, "Meeting-Id" => series.id + headers["Content-Type"] = 'text/calendar; charset=utf-8; method="PUBLISH"; name="meeting.ics"' + headers["Content-Transfer-Encoding"] = "8bit" + end +end diff --git a/modules/meeting/app/menus/meetings/menu.rb b/modules/meeting/app/menus/meetings/menu.rb index f4990f3d626e..cd0ecc1257c3 100644 --- a/modules/meeting/app/menus/meetings/menu.rb +++ b/modules/meeting/app/menus/meetings/menu.rb @@ -34,57 +34,76 @@ def initialize(params:, project: nil) def menu_items [ OpenProject::Menu::MenuGroup.new(header: nil, children: top_level_menu_items), - meeting_series_menu_group, - OpenProject::Menu::MenuGroup.new(header: I18n.t(:label_involvement), children: involvement_sidebar_menu_items) + OpenProject::Menu::MenuGroup.new(header: I18n.t(:label_meeting_series), children: meeting_series_menu_items), + involvement_group ].compact end def top_level_menu_items - all_filter = [{ invited_user_id: { operator: "*", values: [] } }].to_json - my_meetings_href = polymorphic_path([project, :meetings]) - [ - menu_item(title: I18n.t(:label_my_meetings), - selected: params[:current_href] == my_meetings_href && params[:filters].blank?), + my_meetings_item, recurring_menu_item, - menu_item(title: I18n.t(:label_all_meetings), - query_params: { filters: all_filter }) + all_meetings_item ].compact end - def meeting_series_menu_group - return unless OpenProject::FeatureDecisions.recurring_meetings_active? + def my_meetings_item + return unless User.current.logged? + + my_meetings_href = polymorphic_path([project, :meetings]) + menu_item(title: I18n.t(:label_my_meetings), + selected: params[:current_href] == my_meetings_href && params[:filters].blank?) + end - OpenProject::Menu::MenuGroup.new(header: I18n.t(:label_meeting_series), children: meeting_series_menu_items) + def all_meetings_item + all_filter = [{ invited_user_id: { operator: "*", values: [] } }].to_json + my_meetings_href = polymorphic_path([project, :meetings]) + query_params = { filters: all_filter } + + if User.current.anonymous? + menu_item(title: I18n.t(:label_all_meetings), + selected: params[:current_href] == my_meetings_href && (params[:filters].blank? || selected?(query_params)), + query_params:) + else + menu_item(title: I18n.t(:label_all_meetings), + query_params:) + end end - def meeting_series_menu_items + def meeting_series_menu_items # rubocop:disable Metrics/AbcSize series = RecurringMeeting .visible + .includes(:project) .reorder("LOWER(title)") if project series = series.where(project_id: project.id) end - series.pluck(:id, :title) - .map do |id, title| - href = polymorphic_path([project, :recurring_meeting], { id: }) - OpenProject::Menu::MenuItem.new(title:, - selected: params[:current_href] == href, + current_href = params[:current_href] + current_recurring_meeting_id = extracted_id(current_href) + + series.all.map do |series| + href = project_recurring_meeting_path(series.project, series) + OpenProject::Menu::MenuItem.new(title: series.title, + selected: select_status(href, current_href, current_recurring_meeting_id), href:) end end def recurring_menu_item - return unless OpenProject::FeatureDecisions.recurring_meetings_active? - recurring_filter = [{ type: { operator: "=", values: ["t"] } }].to_json menu_item(title: I18n.t("label_recurring_meeting_plural"), query_params: { filters: recurring_filter, sort: "start_time" }) end + def involvement_group + return unless User.current.logged? + + OpenProject::Menu::MenuGroup.new(header: I18n.t(:label_involvement), children: involvement_sidebar_menu_items) + end + def involvement_sidebar_menu_items invitation_filter = [{ invited_user_id: { operator: "=", values: [User.current.id.to_s] } }].to_json @@ -92,7 +111,7 @@ def involvement_sidebar_menu_items menu_item(title: I18n.t(:label_invitations), query_params: { filters: invitation_filter, sort: "start_time" }), menu_item(title: I18n.t(:label_attended), - query_params: { filters: attendee_filter }), + query_params: { filters: attendee_filter, upcoming: false }), menu_item(title: I18n.t(:label_created_by_me), query_params: { filters: author_filter }) ] @@ -124,5 +143,19 @@ def author_filter def recurring_meeting_type_filter [{ type: { operator: "=", values: [RecurringMeeting.to_s] } }].to_json end + + def extracted_id(current_href) + current_meeting_id = current_href.split("/").last.to_i if current_href&.match(/\/meetings\/\d+$/) + + Meeting.find(current_meeting_id).recurring_meeting_id if current_meeting_id + end + + def select_status(href, current_href, current_recurring_meeting_id = nil) + return current_href == href unless current_recurring_meeting_id && !href.is_a?(Hash) + + href_meeting_id = href.split("/").last.to_i + + current_recurring_meeting_id == href_meeting_id + end end end diff --git a/modules/meeting/app/models/meeting.rb b/modules/meeting/app/models/meeting.rb index 8f38e8a6aeaf..3052b993d9e7 100644 --- a/modules/meeting/app/models/meeting.rb +++ b/modules/meeting/app/models/meeting.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -54,14 +56,13 @@ class Meeting < ApplicationRecord scope :templated, -> { where(template: true) } scope :not_templated, -> { where(template: false) } - scope :cancelled, -> { where(state: :cancelled) } - scope :not_cancelled, -> { where.not(id: cancelled) } + scope :not_cancelled, -> { where.not.cancelled } scope :not_recurring, -> { where(recurring_meeting_id: nil) } - scope :recurring, -> { where.not(id: not_recurring) } + scope :recurring, -> { where.not(recurring_meeting_id: nil) } - scope :from_tomorrow, -> { where(["start_time >= ?", Date.tomorrow.beginning_of_day]) } - scope :from_today, -> { where(["start_time >= ?", Time.zone.today.beginning_of_day]) } + scope :from_tomorrow, -> { where(start_time: Date.tomorrow.beginning_of_day..) } + scope :from_today, -> { where(start_time: Time.zone.today.beginning_of_day..) } scope :upcoming, -> { where("start_time + (interval '1 hour' * duration) >= ?", Time.current) } scope :past, -> { where("start_time + (interval '1 hour' * duration) < ?", Time.current) } @@ -112,11 +113,15 @@ class Meeting < ApplicationRecord enum state: { open: 0, # 0 -> default, leave values for future states between open and closed - scheduled: 1, + planned: 1, cancelled: 4, closed: 5 } + def recurring? + recurring_meeting_id.present? + end + ## # Cache key for detecting changes to be shown to the user def changed_hash diff --git a/modules/meeting/app/models/meeting/virtual_start_time.rb b/modules/meeting/app/models/meeting/virtual_start_time.rb index 68bbdf198e8b..b64f388277bb 100644 --- a/modules/meeting/app/models/meeting/virtual_start_time.rb +++ b/modules/meeting/app/models/meeting/virtual_start_time.rb @@ -92,7 +92,6 @@ def set_initial_values # set defaults # Start date is set to tomorrow at 10 AM (Current users local time) write_attribute(:start_time, User.current.time_zone.now.at_midnight + 34.hours) if start_time.nil? - self.duration ||= 1 update_derived_fields end diff --git a/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb b/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb index 01279912b04d..47f4e224d2eb 100644 --- a/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb +++ b/modules/meeting/app/models/queries/meetings/filters/recurring_filter.rb @@ -37,10 +37,6 @@ def human_name I18n.t("label_recurring_meeting_part_of") end - def available? - OpenProject::FeatureDecisions.recurring_meetings_active? - end - def apply_to(query_scope) if allowed_values.first.intersect?(values) query_scope.recurring diff --git a/modules/meeting/app/models/queries/meetings/filters/time_filter.rb b/modules/meeting/app/models/queries/meetings/filters/time_filter.rb index f482aed8c1c6..f71f0f1e83f5 100644 --- a/modules/meeting/app/models/queries/meetings/filters/time_filter.rb +++ b/modules/meeting/app/models/queries/meetings/filters/time_filter.rb @@ -45,9 +45,9 @@ def past? def where if past? - '"meetings"."start_time" < NOW()' + ['"meetings"."start_time" < ?', Time.current] else - '"meetings"."start_time" + "meetings"."duration" * interval \'1 hour\' > NOW()' + ['"meetings"."start_time" + "meetings"."duration" * interval \'1 hour\' >= ?', Time.current] end end diff --git a/modules/meeting/app/models/recurring_meeting.rb b/modules/meeting/app/models/recurring_meeting.rb index 092ebdc56a6a..a73a8255c5c3 100644 --- a/modules/meeting/app/models/recurring_meeting.rb +++ b/modules/meeting/app/models/recurring_meeting.rb @@ -1,3 +1,33 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + class RecurringMeeting < ApplicationRecord # Magical maximum of iterations MAX_ITERATIONS = 1000 @@ -37,8 +67,9 @@ class RecurringMeeting < ApplicationRecord enum end_after: { specific_date: 0, - iterations: 1 - }.freeze, _prefix: true, _default: "specific_date" + iterations: 1, + never: 3 + }.freeze, _prefix: true, _default: "never" has_many :meetings, inverse_of: :recurring_meeting, @@ -66,6 +97,14 @@ class RecurringMeeting < ApplicationRecord nil end + def will_end? + last_occurrence.present? + end + + def has_ended? + will_end? && last_occurrence < Time.zone.now + end + def human_frequency I18n.t("recurring_meeting.frequency.#{frequency}") end @@ -83,7 +122,7 @@ def date end def schedule - @schedule ||= IceCube::Schedule.new(start_time, end_time: end_date).tap do |s| + @schedule ||= IceCube::Schedule.new(start_time, duration: template&.duration).tap do |s| s.add_recurrence_rule count_rule(frequency_rule) exclude_non_working_days(s) if frequency_working_days? end @@ -108,11 +147,22 @@ def base_schedule end end - def full_schedule_in_words - I18n.t("recurring_meeting.in_words.full", - base: base_schedule, - time: format_time(start_time, include_date: false), - end_date: format_date(last_occurrence)) + def full_schedule_in_words # rubocop:disable Metrics/AbcSize + if has_ended? + I18n.t("recurring_meeting.in_words.full_past", + base: base_schedule, + time: format_time(start_time, include_date: false), + end_date: format_date(last_occurrence)) + elsif will_end? + I18n.t("recurring_meeting.in_words.full", + base: base_schedule, + time: format_time(start_time, include_date: false), + end_date: format_date(last_occurrence)) + else + I18n.t("recurring_meeting.in_words.never_ending", + base: base_schedule, + time: format_time(start_time, include_date: false)) + end end def human_frequency_schedule @@ -126,21 +176,28 @@ def scheduled_occurrences(limit:) end def first_occurrence - schedule.first + @first_occurrence ||= schedule.first end def last_occurrence - schedule.last + return if end_after_never? + + @last_occurrence ||= schedule.last end def next_occurrence(from_time: Time.current) - schedule.next_occurrence(from_time) + schedule.next_occurrence(from_time)&.to_time + end + + def previous_occurrence(from_time: Time.current) + schedule.previous_occurrence(from_time)&.to_time end def remaining_occurrences - if end_date.present? - schedule.occurrences_between(Time.current, end_date) - else + case end_after + when "specific_date" + schedule.occurrences_between(Time.current, end_date.to_time(:utc).end_of_day) + when "iterations" schedule.remaining_occurrences(Time.current) end end @@ -156,10 +213,39 @@ def scheduled_instances(upcoming: true) .order(start_time: direction) end + def upcoming_instantiated_meetings + @upcoming_instantiated_meetings ||= scheduled_meetings + .includes(:meeting) + .not_cancelled + .joins(:meeting) + .where("meetings.start_time + (interval '1 hour' * meetings.duration) >= ?", Time.current) + .order(start_time: :asc) + end + + def ongoing_meetings + upcoming_instantiated_meetings + .includes(:meeting) + .where(meetings: { start_time: ..Time.current }) + .order(start_time: :asc) + end + + def upcoming_cancelled_meetings + scheduled_meetings + .upcoming + .cancelled + .order(start_time: :asc) + end + + def instantiated_meetings + meetings.not_templated + end + private def unset_schedule @schedule = nil + @first_occurence = nil + @last_occurrence = nil end def end_date_constraints @@ -199,15 +285,18 @@ def frequency_rule end def count_rule(rule) - if end_after_iterations? + case end_after + when "specific_date" + rule.until((end_date + 1.day).to_time(:utc)) + when "iterations" rule.count(iterations) else - rule.until(end_date.to_time(:utc)) + rule end end def set_defaults - self.end_date ||= 1.year.from_now + self.end_date ||= 1.year.from_now if end_after_specific_date? end def remove_jobs diff --git a/modules/meeting/app/models/scheduled_meeting.rb b/modules/meeting/app/models/scheduled_meeting.rb index 39cd83603be5..57f8ca6446e6 100644 --- a/modules/meeting/app/models/scheduled_meeting.rb +++ b/modules/meeting/app/models/scheduled_meeting.rb @@ -41,4 +41,12 @@ class ScheduledMeeting < ApplicationRecord validates_uniqueness_of :meeting, allow_nil: true validates_presence_of :start_time + + def previous_occurrence + recurring_meeting.previous_occurrence(from_time: start_time) + end + + def next_occurrence + recurring_meeting.next_occurrence(from_time: start_time) + end end diff --git a/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb b/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb new file mode 100644 index 000000000000..3d213338e9ab --- /dev/null +++ b/modules/meeting/app/seeders/meetings/demo_data/meeting_series_seeder.rb @@ -0,0 +1,84 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Meetings + module DemoData + class MeetingSeriesSeeder < ::BasicData::ModelSeeder + self.model_class = RecurringMeeting + self.seed_data_model_key = "meeting_series" + + attr_reader :project + + def initialize(project, seed_data) + super(seed_data) + @project = project + end + + def prepare! + project.enabled_modules << EnabledModule.new(name: "meetings") + end + + def create_model!(model_data) + series = super + create_meeting_template!(series, model_data) + RecurringMeetings::InitNextOccurrenceJob.perform_later(series, series.first_occurrence) + end + + def create_meeting_template!(series, model_data) + template = StructuredMeeting.new(template_attributes(model_data)) + template.template = true + template.recurring_meeting = series + + template.save! + reference = :"#{model_data['reference']}_template" + seed_data.store_reference(reference, template) + end + + def model_attributes(meeting_data) + { + title: meeting_data["title"], + author: seed_data.find_reference(meeting_data["author"]), + duration: minutes_to_hours(meeting_data["duration"]), + start_time: Time.current.next_weekday + 10.hours, + frequency: meeting_data["frequency"], + interval: meeting_data["interval"], + project: + } + end + + def template_attributes(meeting_data) + model_attributes(meeting_data) + .slice(:title, :author, :duration, :start_time, :project) + end + + def minutes_to_hours(duration) + duration && (duration / 60.0) + end + end + end +end diff --git a/modules/meeting/app/seeders/standard.yml b/modules/meeting/app/seeders/standard.yml index 8fc7135c8e97..8f06936ef514 100644 --- a/modules/meeting/app/seeders/standard.yml +++ b/modules/meeting/app/seeders/standard.yml @@ -28,63 +28,65 @@ projects: demo-project: - meetings: + meeting_series: - reference: :weekly_meeting t_title: Weekly duration: 60 + interval: 1 + frequency: :weekly author: :openproject_admin meeting_agenda_items: - t_title: Good news notes: "What went well this week?" - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: Updates from development team notes: "News and focused topics for the upcoming week." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: Updates from product team notes: "News and focused topics for the upcoming week." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: Updates from marketing team notes: "News and focused topics for the upcoming week." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - work_package: :organize_open_source_conference notes: "**Today's topic**: Organizing the open-source conference." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: Updates from sales team notes: "News and focused topics for the upcoming week." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: Review of quarterly goals notes: "Assessing the status and progress of the defined quarterly goals." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: Core values feedback notes: "Highlight employees who have lived the core values this week." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 5 - t_title: General topics notes: "Solving or discussing topics together." - meeting: :weekly_meeting + meeting: :weekly_meeting_template author: :openproject_admin presenter: :openproject_admin duration: 20 diff --git a/modules/meeting/app/services/meetings/delete_service.rb b/modules/meeting/app/services/meetings/delete_service.rb index 55642242f49a..01cfcd8ab395 100644 --- a/modules/meeting/app/services/meetings/delete_service.rb +++ b/modules/meeting/app/services/meetings/delete_service.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -31,10 +33,25 @@ class DeleteService < ::BaseServices::Delete protected def after_validate(_, call) - schedule = model.scheduled_meeting - schedule.update_column(:cancelled, true) if schedule.present? + send_cancellation_mail(model) + cancel_scheduled_meeting(model) call end + + def send_cancellation_mail(meeting) + meeting.participants.where(invited: true).find_each do |participant| + MeetingMailer + .cancelled(meeting, participant.user, User.current) + .deliver_now + end + end + + def cancel_scheduled_meeting(meeting) + schedule = meeting.scheduled_meeting + return if schedule.nil? + + schedule.update_column(:cancelled, true) + end end end diff --git a/modules/meeting/app/services/meetings/ical_helpers.rb b/modules/meeting/app/services/meetings/ical_helpers.rb index 9812c612a18c..2e0ed584b208 100644 --- a/modules/meeting/app/services/meetings/ical_helpers.rb +++ b/modules/meeting/app/services/meetings/ical_helpers.rb @@ -30,13 +30,27 @@ module Meetings module ICalHelpers - def ical_event(start_time, &) + def ical_event(start_time, cancelled:, &) calendar = build_icalendar(start_time) calendar.event(&) - calendar.publish + + if cancelled + calendar.cancel + else + calendar.request + end calendar.to_ical end + def set_status(cancelled, event) + event.status = + if cancelled + "CANCELLED" + else + "CONFIRMED" + end + end + def build_icalendar(start_time) ::Icalendar::Calendar.new.tap do |calendar| calendar.prodid = "-//OpenProject GmbH//#{OpenProject::VERSION}//Meeting//EN" diff --git a/modules/meeting/app/services/meetings/ical_service.rb b/modules/meeting/app/services/meetings/ical_service.rb index dbdaa99958ec..9d0519b19a20 100644 --- a/modules/meeting/app/services/meetings/ical_service.rb +++ b/modules/meeting/app/services/meetings/ical_service.rb @@ -39,10 +39,10 @@ def initialize(meeting:, user:) @url_helpers = OpenProject::StaticRouting::StaticUrlHelpers.new end - def call + def call(cancelled: false) User.execute_as(user) do @timezone = Time.zone || Time.zone_default - ServiceResult.success(result: generate_ical) + ServiceResult.success(result: generate_ical(cancelled:)) end rescue StandardError => e Rails.logger.error("Failed to generate ICS for meeting #{@meeting.id}: #{e.message}") @@ -52,8 +52,8 @@ def call private # rubocop:disable Metrics/AbcSize - def generate_ical - ical_event(meeting.start_time) do |e| + def generate_ical(cancelled:) + ical_event(meeting.start_time, cancelled:) do |e| tzinfo = timezone.tzinfo tzid = tzinfo.canonical_identifier @@ -66,6 +66,7 @@ def generate_ical e.organizer = ical_organizer(meeting) e.location = meeting.location.presence + set_status(cancelled, e) add_attendees(e, meeting) end end diff --git a/modules/meeting/app/services/meetings/set_attributes_service.rb b/modules/meeting/app/services/meetings/set_attributes_service.rb index abe44c0d3a9a..bf32b7e8cd95 100644 --- a/modules/meeting/app/services/meetings/set_attributes_service.rb +++ b/modules/meeting/app/services/meetings/set_attributes_service.rb @@ -39,6 +39,7 @@ def set_attributes(params) def set_default_attributes(_params) model.change_by_system do model.author = user + model.duration ||= 1 end end diff --git a/modules/meeting/app/services/recurring_meetings/create_service.rb b/modules/meeting/app/services/recurring_meetings/create_service.rb index 2a37d196239a..d80734ff3ae6 100644 --- a/modules/meeting/app/services/recurring_meetings/create_service.rb +++ b/modules/meeting/app/services/recurring_meetings/create_service.rb @@ -42,13 +42,16 @@ def after_perform(call) end def create_meeting_template(recurring_meeting) - template = StructuredMeeting.new(@template_params) - template.project = recurring_meeting.project - template.template = true - template.recurring_meeting = recurring_meeting - template.author = user + params = @template_params.merge( + type: "StructuredMeeting", + template: true, + recurring_meeting:, + project: recurring_meeting.project + ) - ServiceResult.new(success: template.save, errors: template.errors) + Meetings::CreateService + .new(user: user) + .call(params) end end end diff --git a/app/models/types/pattern_collection.rb b/modules/meeting/app/services/recurring_meetings/delete_service.rb similarity index 71% rename from app/models/types/pattern_collection.rb rename to modules/meeting/app/services/recurring_meetings/delete_service.rb index 52a6dda2e459..4287dcffa653 100644 --- a/app/models/types/pattern_collection.rb +++ b/modules/meeting/app/services/recurring_meetings/delete_service.rb @@ -28,26 +28,26 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Types - PatternCollection = Data.define(:patterns) do - private_class_method :new +module RecurringMeetings + class DeleteService < ::BaseServices::Delete + protected - def self.build(patterns:, contract: PatternCollectionContract.new) - contract.call(patterns).to_monad.fmap { |success| new(success.to_h) } + def default_contract_class + Meetings::DeleteContract end - def initialize(patterns:) - transformed = patterns.transform_values { Pattern.new(**_1) }.freeze + def after_validate(_, call) + send_cancellation_mail(model) - super(patterns: transformed) + call end - def [](value) - patterns.fetch(value) - end - - def to_h - patterns.stringify_keys.transform_values(&:to_h) + def send_cancellation_mail(meeting) + meeting.template.participants.where(invited: true).find_each do |participant| + MeetingMailer + .cancelled_series(meeting, participant.user, User.current) + .deliver_now + end end end end diff --git a/modules/meeting/app/services/recurring_meetings/ical_service.rb b/modules/meeting/app/services/recurring_meetings/ical_service.rb index b68633d16b4e..d530fbc3f354 100644 --- a/modules/meeting/app/services/recurring_meetings/ical_service.rb +++ b/modules/meeting/app/services/recurring_meetings/ical_service.rb @@ -43,23 +43,54 @@ class ICalService def initialize(series:, user:) @user = user @series = series + @schedule = series.schedule @url_helpers = OpenProject::StaticRouting::StaticUrlHelpers.new end - def call # rubocop:disable Metrics/AbcSize - User.execute_as(user) do - @timezone = Time.zone || Time.zone_default - @calendar = build_icalendar(series.start_time) - @schedule = series.schedule - ServiceResult.success(result: generate_ical) + def generate_series(cancelled: false) + ical_result(series) do + series_event(cancelled:) + occurrences_events + calendar_status(cancelled:) end rescue StandardError => e - Rails.logger.error("Failed to generate ICS for meeting series #{@series.id}: #{e.message}") + Rails.logger.error("Failed to generate ICS for meeting series #{series.id}: #{e.message}") + ServiceResult.failure(message: e.message) + end + + def generate_occurrence(meeting, cancelled: false) + # Get the time the meeting was scheduled to take place + scheduled_meeting = meeting.scheduled_meeting + ical_result(scheduled_meeting) do + occurrence_event(scheduled_meeting.start_time, meeting, cancelled:) + calendar_status(cancelled:) + end + rescue StandardError => e + Rails.logger.error("Failed to generate ICS for meeting #{meeting.id}: #{e.message}") ServiceResult.failure(message: e.message) end private + def calendar_status(cancelled:) + if cancelled + calendar.cancel + else + calendar.request + end + end + + def ical_result(meeting) + User.execute_as(user) do + @timezone = Time.zone || Time.zone_default + @calendar = build_icalendar(meeting.start_time) + + yield + + ServiceResult.success(result: calendar.to_ical) + end + end + def tzinfo timezone.tzinfo end @@ -68,18 +99,11 @@ def tzid tzinfo.canonical_identifier end - def generate_ical - series_event - occurrences_events - - calendar.publish - calendar.to_ical - end - - def series_event # rubocop:disable Metrics/AbcSize + def series_event(cancelled:) # rubocop:disable Metrics/AbcSize calendar.event do |e| base_series_attributes(e) + e.rrule = schedule.rrules.first.to_ical # We currently only have one recurrence rule e.dtstart = ical_datetime template.start_time, tzid e.dtend = ical_datetime template.end_time, tzid e.url = url_helpers.project_recurring_meeting_url(series.project, series) @@ -87,16 +111,18 @@ def series_event # rubocop:disable Metrics/AbcSize add_attendees(e, template) e.exdate = cancelled_schedules + + set_status(cancelled, e) end end def occurrences_events upcoming_instantiated_schedules.find_each do |schedule| - occurrence_event(schedule.start_time, schedule.meeting) + occurrence_event(schedule.start_time, schedule.meeting, cancelled: false) end end - def occurrence_event(schedule_start_time, meeting) # rubocop:disable Metrics/AbcSize + def occurrence_event(schedule_start_time, meeting, cancelled:) # rubocop:disable Metrics/AbcSize calendar.event do |e| base_series_attributes(e) @@ -105,8 +131,10 @@ def occurrence_event(schedule_start_time, meeting) # rubocop:disable Metrics/Abc e.dtend = ical_datetime meeting.end_time, tzid e.url = url_helpers.project_meeting_url(meeting.project, meeting) e.location = meeting.location.presence + e.sequence = meeting.lock_version add_attendees(e, meeting) + set_status(cancelled, e) end end @@ -120,7 +148,6 @@ def upcoming_instantiated_schedules def base_series_attributes(event) # rubocop:disable Metrics/AbcSize event.uid = ical_uid("meeting-series-#{series.id}") - event.rrule = schedule.rrules.first.to_ical # We currently only have one recurrence rule event.summary = "[#{series.project.name}] #{series.title}" event.description = "[#{series.project.name}] #{I18n.t(:label_meeting_series)}: #{series.title}" event.organizer = ical_organizer(series) diff --git a/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb b/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb index 098533a52948..e58c926fe735 100644 --- a/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb +++ b/modules/meeting/app/services/recurring_meetings/init_occurrence_service.rb @@ -61,7 +61,8 @@ def instantiate(start_time) def instantiate_params(start_time) { start_time:, - recurring_meeting: + recurring_meeting:, + template: false } end diff --git a/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb b/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb index 9f232da2b303..e8c71f004757 100644 --- a/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb +++ b/modules/meeting/app/services/recurring_meetings/set_attributes_service.rb @@ -43,6 +43,7 @@ def set_attributes(params) def set_default_attributes(_params) model.change_by_system do model.author = user + model.duration ||= 1 end end end diff --git a/modules/meeting/app/services/recurring_meetings/update_service.rb b/modules/meeting/app/services/recurring_meetings/update_service.rb index 80fcf24e97de..054e0702ca8b 100644 --- a/modules/meeting/app/services/recurring_meetings/update_service.rb +++ b/modules/meeting/app/services/recurring_meetings/update_service.rb @@ -32,11 +32,22 @@ class UpdateService < ::BaseServices::Update protected + def validate_params(*) + @old_schedule = model.full_schedule_in_words + super + end + def after_perform(call) return call unless call.success? - cleanup_cancelled_schedules(call.result) - reschedule_init_job(call.result) + recurring_meeting = call.result + cleanup_cancelled_schedules(recurring_meeting) + + if should_reschedule?(recurring_meeting) + reschedule_init_job(recurring_meeting) + send_rescheduled_mail(recurring_meeting) + end + update_template(call) end @@ -61,17 +72,29 @@ def cleanup_cancelled_schedules(recurring_meeting) end end - def reschedule_init_job(recurring_meeting) - return unless should_reschedule?(recurring_meeting) + def send_rescheduled_mail(recurring_meeting) + recurring_meeting + .template + .participants + .invited + .find_each do |participant| + MeetingSeriesMailer.rescheduled( + recurring_meeting, + participant.user, + User.current, + changes: { old_schedule: @old_schedule } + ).deliver_later + end + end + def reschedule_init_job(recurring_meeting) concurrency_key = InitNextOccurrenceJob.unique_key(recurring_meeting) # Delete all scheduled jobs for this meeting GoodJob::Job.where(finished_at: nil, concurrency_key:).delete_all - InitNextOccurrenceJob - .set(wait_until: recurring_meeting.next_occurrence.to_time) - .perform_later(recurring_meeting) + # Ensure we init the next meeting directly + InitNextOccurrenceJob.perform_now(recurring_meeting, recurring_meeting.next_occurrence.to_time) end def should_reschedule?(recurring_meeting) diff --git a/modules/meeting/app/views/meeting_mailer/cancelled.html.erb b/modules/meeting/app/views/meeting_mailer/cancelled.html.erb new file mode 100644 index 000000000000..60b556e7820a --- /dev/null +++ b/modules/meeting/app/views/meeting_mailer/cancelled.html.erb @@ -0,0 +1,103 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<% + summary = + if @meeting.recurring? + I18n.t("meeting.email.cancelled.summary_occurrence", + title: @meeting.title, + actor: @actor) + else + I18n.t("meeting.email.cancelled.summary", + title: @meeting.title, + actor: @actor) + end +%> + +<%= render layout: "mailer/spacer_table" do %> + <%= render partial: "mailer/mailer_header", + locals: { + user: @user, + summary:, + bottom_spacing: false + } %> + + <%= render layout: "mailer/border_table" do %> + + <%= placeholder_cell("24px", vertical: true) %> + + + + + + + <% if @meeting.location.present? %> + + + + + <% end %> + + + + +
    "> + <%= t("meeting.email.cancelled.date_time") %> + + + <%= format_time_as_date @meeting.start_time %> <%= format_time @meeting.start_time, include_date: false %> + - + <%= format_time @meeting.end_time, include_date: false %> (<%= formatted_time_zone_offset %>) + +
    "> + <%= Meeting.human_attribute_name(:location) %> + + <%= auto_link @meeting.location %> +
    "> + <%= Meeting.human_attribute_name(:project) %> + + <%= link_to @meeting.project.name, project_url(@meeting.project) %> +
    + + + <% end %> + + + + <%= placeholder_cell("20px", vertical: false) %> + +
    + + <%= action_button do %> + <%= link_to I18n.t(:"meeting.email.open_my_meetings_link"), + meetings_url, + target: "_blank", + style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;", rel: "noopener" %> + <% end %> +<% end %> diff --git a/modules/meeting/app/views/meeting_mailer/cancelled.text.erb b/modules/meeting/app/views/meeting_mailer/cancelled.text.erb new file mode 100644 index 000000000000..8e2a05f3f3ef --- /dev/null +++ b/modules/meeting/app/views/meeting_mailer/cancelled.text.erb @@ -0,0 +1,47 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<% + summary = + if @meeting.recurring? + I18n.t("meeting.email.cancelled.summary_occurrence", + title: @meeting.title, + actor: @actor) + else + I18n.t("meeting.email.cancelled.summary", + title: @meeting.title, + actor: @actor) + end +%> + +<%= summary %> + +<%= @meeting.project.name %>: <%= @meeting.title %> +<%= @meeting.author %> +<%= t :label_meeting_date_time %>: <%= format_time_as_date @meeting.start_time %> <%= format_time @meeting.start_time, include_date: false %>-<%= format_time @meeting.end_time, include_date: false %> (<%= formatted_time_zone_offset %>) diff --git a/modules/meeting/app/views/meeting_mailer/cancelled_series.html.erb b/modules/meeting/app/views/meeting_mailer/cancelled_series.html.erb new file mode 100644 index 000000000000..4144daf8c3fd --- /dev/null +++ b/modules/meeting/app/views/meeting_mailer/cancelled_series.html.erb @@ -0,0 +1,78 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= render layout: "mailer/spacer_table" do %> + <%= render partial: "mailer/mailer_header", + locals: { + user: @user, + summary: I18n.t("meeting.email.cancelled.summary_series", title: @series.title, actor: @actor), + bottom_spacing: false + } %> + + <%= render layout: "mailer/border_table" do %> + + <%= placeholder_cell("24px", vertical: true) %> + + + + + + + + + + +
    "> + <%= t(:label_recurring_meeting_schedule) %> + + + <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>) + +
    "> + <%= Meeting.human_attribute_name(:project) %> + + <%= link_to @series.project.name, project_url(@series.project) %> +
    + + + <% end %> + + + + <%= placeholder_cell("20px", vertical: false) %> + +
    + + <%= action_button do %> + <%= link_to I18n.t(:"meeting.email.open_my_meetings_link"), + meetings_url, + target: "_blank", + style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;", rel: "noopener" %> + <% end %> +<% end %> diff --git a/modules/meeting/app/views/meeting_mailer/cancelled_series.text.erb b/modules/meeting/app/views/meeting_mailer/cancelled_series.text.erb new file mode 100644 index 000000000000..4d85d63df083 --- /dev/null +++ b/modules/meeting/app/views/meeting_mailer/cancelled_series.text.erb @@ -0,0 +1,36 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= I18n.t("meeting.email.cancelled.summary_series", + title: @series.title, + actor: @actor) %> + +<%= @series.project.name %>: <%= @series.title %> +<%= @series.author %> +<%= t :label_recurring_meeting_schedule %>: <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>) diff --git a/modules/meeting/app/views/meeting_series_mailer/rescheduled.html.erb b/modules/meeting/app/views/meeting_series_mailer/rescheduled.html.erb new file mode 100644 index 000000000000..85ef00eb5377 --- /dev/null +++ b/modules/meeting/app/views/meeting_series_mailer/rescheduled.html.erb @@ -0,0 +1,94 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= render layout: "mailer/spacer_table" do %> + <%= render partial: "mailer/mailer_header", + locals: { + user: @user, + summary: I18n.t("meeting.email.series_rescheduled.summary", title: @series.title, actor: @actor), + bottom_spacing: false + } %> + + <%= render layout: "mailer/border_table" do %> + + <%= placeholder_cell("24px", vertical: true) %> + + + + + + + + + + + + + + + + + + +
    "> + <%= t("meeting.email.series_rescheduled.old_schedule") %> + + + <%= @changes[:old_schedule] %> (<%= formatted_time_zone_offset %>) + +
    "> + <%= t("meeting.email.series_rescheduled.new_schedule") %> + "> + <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>) +
    "> + <%= Meeting.human_attribute_name(:project) %> + + <%= link_to @series.project.name, project_url(@series.project) %> +
    "> + <%= Meeting.human_attribute_name(:author) %> + + <%= @series.author %> +
    + + + <% end %> + + + + <%= placeholder_cell("20px", vertical: false) %> + +
    + + <%= action_button do %> + <%= link_to I18n.t(:"meeting.email.open_meeting_link"), + recurring_meeting_url(@series), + target: "_blank", + style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;", rel: "noopener" %> + <% end %> +<% end %> diff --git a/modules/meeting/app/views/meeting_series_mailer/rescheduled.text.erb b/modules/meeting/app/views/meeting_series_mailer/rescheduled.text.erb new file mode 100644 index 000000000000..594b498e796d --- /dev/null +++ b/modules/meeting/app/views/meeting_series_mailer/rescheduled.text.erb @@ -0,0 +1,41 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= @series.project.name %>: <%= @series.title %> (<%= recurring_meeting_url(@series) %>) +<%= @series.author %> + +<%= t('meeting.email.series_rescheduled.summary', + actor: @actor, + title: @series.title) %> + +<%= t('meeting.email.series_rescheduled.old_schedule') %>: +<%= @changes[:old_schedule] %> (<%= formatted_time_zone_offset %>) + +<%= t('meeting.email.series_rescheduled.new_schedule') %>: +<%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>) diff --git a/modules/meeting/app/views/meeting_series_mailer/template_completed.html.erb b/modules/meeting/app/views/meeting_series_mailer/template_completed.html.erb new file mode 100644 index 000000000000..fb9726fd4f19 --- /dev/null +++ b/modules/meeting/app/views/meeting_series_mailer/template_completed.html.erb @@ -0,0 +1,115 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= render layout: 'mailer/spacer_table' do %> + <%= render partial: 'mailer/mailer_header', + locals: { + user: @user, + summary: I18n.t('meeting.email.series.summary', title: @series.title, actor: @actor), + bottom_spacing: false + } %> + + <%= render layout: 'mailer/border_table' do %> + + <%= placeholder_cell('24px', vertical: true) %> + + + + + + + <% if @next_occurrence %> + + + + + <% end %> + <% if @template.location.present? %> + + + + + <% end %> + + + + + + + + + <% if @template.participants.exists? %> + + + + + <% end %> +
    + <%= I18n.t(:label_recurring_meeting_schedule) %> + + <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>) +
    + <%= I18n.t(:label_recurring_meeting_next_occurrence) %> + + <%= format_time_as_date @next_occurrence %> <%= format_time @next_occurrence, include_date: false %> + (<%= formatted_time_zone_offset %>) +
    + <%= Meeting.human_attribute_name(:location) %> + + <%= auto_link @template.location %> +
    + <%= Meeting.human_attribute_name(:project) %> + + <%= link_to @series.project.name, project_url(@series.project) %> +
    + <%= Meeting.human_attribute_name(:author) %> + + <%= @series.author %> +
    + <%= Meeting.human_attribute_name(:participants_invited) %> + + <%= @template.participants.invited.sort.join("; ") %> +
    + + + <% end %> + + + + <%= placeholder_cell('20px', vertical: false) %> + +
    + + <%= action_button do %> + <%= link_to I18n.t(:'meeting.email.open_meeting_link'), + recurring_meeting_url(@series), + target: '_blank', + style: "color: #333333; text-decoration: none; font-size: 14px;white-space: nowrap;" %> + <% end %> +<% end %> diff --git a/modules/meeting/app/views/meeting_series_mailer/template_completed.text.erb b/modules/meeting/app/views/meeting_series_mailer/template_completed.text.erb new file mode 100644 index 000000000000..a48349949f2a --- /dev/null +++ b/modules/meeting/app/views/meeting_series_mailer/template_completed.text.erb @@ -0,0 +1,37 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= I18n.t('meeting.email.series.summary', title: @series.title, actor: @actor) %> + +<%= @series.project.name %>: <%= @series.title %> (<%= meeting_url(@series) %>) +<%= @series.author %> + +<%=t :label_recurring_meeting_schedule %>: <%= @series.full_schedule_in_words %> (<%= formatted_time_zone_offset %>) +<%= Meeting.human_attribute_name(:location) %>: <%= @template.location %> +<%= Meeting.human_attribute_name(:participants_invited) %>: <%= @template.participants.invited.sort.join("; ") %> diff --git a/modules/meeting/app/views/meetings/_grouped_meetings.html.erb b/modules/meeting/app/views/meetings/_grouped_meetings.html.erb new file mode 100644 index 000000000000..116ce8238251 --- /dev/null +++ b/modules/meeting/app/views/meetings/_grouped_meetings.html.erb @@ -0,0 +1,50 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<% if @grouped_meetings.empty? || @grouped_meetings.values.all?(&:empty?) -%> + <%= render Meetings::TableComponent.new( + rows: [], + current_project: @project + ) %> +<% end %> +<% %i[today tomorrow this_week later].each_with_index do |key, i| %> + <% group = @grouped_meetings[key] %> + <% if group.present? %> + <%= render(Primer::OpenProject::Heading.new( + tag: :h3, + mb: 3, + mt: i == 0 ? 0 : 3 + )) { I18n.t("label_meeting_index_#{key}") } %> + <%= render Meetings::TableComponent.new( + rows: group, + current_project: @project, + test_selector: "meetings-table-#{key}" + ) %> + <% end %> +<% end %> diff --git a/modules/meeting/app/views/meetings/index.html.erb b/modules/meeting/app/views/meetings/index.html.erb index 25b173cf481c..520e709b4de3 100644 --- a/modules/meeting/app/views/meetings/index.html.erb +++ b/modules/meeting/app/views/meetings/index.html.erb @@ -31,8 +31,17 @@ See COPYRIGHT and LICENSE files for more details. <%= render(Meetings::IndexPageHeaderComponent.new(project: @project)) %> <%= render(Meetings::IndexSubHeaderComponent.new(query: @query, project: @project, params:)) %> -<% if @meetings.empty? -%> - <%= no_results_box %> -<% else -%> - <%= render Meetings::TableComponent.new(rows: @meetings, current_project: @project) %> +<% if @grouped_meetings -%> + <%= render partial: "grouped_meetings" %> +<% elsif @meetings.empty? -%> + <%= render Meetings::TableComponent.new( + rows: [], + current_project: @project + ) %> +<% else %> + <%= render Meetings::TableComponent.new( + rows: @meetings, + current_project: @project, + upcoming: params[:upcoming] + ) %> <% end -%> diff --git a/modules/meeting/app/views/meetings/menus/_menu.html.erb b/modules/meeting/app/views/meetings/menus/_menu.html.erb index c1fc8a539731..e63b3d148adb 100644 --- a/modules/meeting/app/views/meetings/menus/_menu.html.erb +++ b/modules/meeting/app/views/meetings/menus/_menu.html.erb @@ -1,9 +1,8 @@ <% request_params = params .permit(:filters, :sort) - .merge(current_href: request.path) -%> + .merge(current_href: request.path) %> <%= turbo_frame_tag "meeting_sidemenu", - src: @project.present? ? menu_project_meetings_path(@project, **request_params) : meetings_menu_path(**request_params), - target: '_top', - data: { turbo: false }, - loading: :lazy %> + src: @project.present? ? menu_project_meetings_path(@project, **request_params) : menu_meetings_path(**request_params), + target: "_top", + data: { turbo: false }, + loading: :lazy %> diff --git a/modules/meeting/app/views/meetings/show.html.erb b/modules/meeting/app/views/meetings/show.html.erb index ecb297e3b64e..7c76d8122c7c 100644 --- a/modules/meeting/app/views/meetings/show.html.erb +++ b/modules/meeting/app/views/meetings/show.html.erb @@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details. <%= toolbar title: t(:label_meeting), link_to: link_to(@meeting), - html: { class: 'meeting--main-toolbar -with-dropdown' } do %> + html: { class: "meeting--main-toolbar -with-dropdown" } do %> <% unless User.current.anonymous? %>
  • @@ -39,8 +39,8 @@ See COPYRIGHT and LICENSE files for more details. <% end %> <% if authorize_for(:meetings, :edit) %>
  • - <%= link_to({ :controller => '/meetings', :action => 'edit', :id => @meeting }, class: 'button', :accesskey => accesskey(:edit)) do %> - <%= op_icon('button--icon icon-edit') %> + <%= link_to(edit_project_meeting_path(@project, @meeting), class: "button", accesskey: accesskey(:edit)) do %> + <%= op_icon("button--icon icon-edit") %> <%= t(:button_edit) %> <% end %>
    • @@ -52,38 +52,37 @@ See COPYRIGHT and LICENSE files for more details. aria-haspopup="true" title="<%= t(:label_more) %>" class="button" - data-test-selector="meetings-more-dropdown-menu" - > - <%= op_icon('button--icon icon-show-more') %> + data-test-selector="meetings-more-dropdown-menu"> + <%= op_icon("button--icon icon-show-more") %>

    - <%= Meeting.human_attribute_name(:location) %>: <%= auto_link(h(@meeting.location), link: :all, html: { target: '_blank' }) %> + <%= Meeting.human_attribute_name(:location) %>: <%= auto_link(h(@meeting.location), link: :all, html: { target: "_blank" }) %>

    @@ -121,8 +120,25 @@ See COPYRIGHT and LICENSE files for more details.
    -<%= render_tabs [{ :name => 'agenda', :action => :create_meeting_agendas, :partial => 'meeting_contents/show', :path => meeting_agenda_path(@meeting), :label => :label_meeting_agenda, :content => @meeting.agenda || @meeting.build_agenda, :content_type => "meeting_agenda" }, - { :name => 'minutes', :action => :create_meeting_minutes, :partial => 'meeting_contents/show', :path => meeting_minutes_path(@meeting), :label => :label_meeting_minutes, :content => @meeting.minutes || @meeting.build_minutes, :content_type => "meeting_minutes" }] %> +<%= render_tabs( + [ + { name: "agenda", + action: :create_meeting_agendas, + partial: "meeting_contents/show", + path: meeting_agenda_path(@meeting), + label: :label_meeting_agenda, + content: @meeting.agenda || @meeting.build_agenda, + content_type: "meeting_agenda" }, + { + name: "minutes", + action: :create_meeting_minutes, + partial: "meeting_contents/show", + path: meeting_minutes_path(@meeting), + label: :label_meeting_minutes, content: @meeting.minutes || @meeting.build_minutes, + content_type: "meeting_minutes" + } + ] + ) %> <% if @meeting.journals.changing.present? %>
    diff --git a/modules/meeting/app/views/recurring_meetings/_show_upcoming.html.erb b/modules/meeting/app/views/recurring_meetings/_show_upcoming.html.erb new file mode 100644 index 000000000000..18b9fce5bef8 --- /dev/null +++ b/modules/meeting/app/views/recurring_meetings/_show_upcoming.html.erb @@ -0,0 +1,73 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) 2012-2024 the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<% if @recurring_meeting.has_ended? && @recurring_meeting.ongoing_meetings.empty? -%> + <%= + render(Primer::Beta::Blankslate.new(border: true)) do |component| + component.with_visual_icon(icon: :book) + component.with_heading(tag: :h2).with_content(t("recurring_meeting.ended_blankslate.title")) + component.with_description do + concat render(Primer::Beta::Text.new(tag: :p, color: :subtle)) { t("recurring_meeting.ended_blankslate.message") } + concat render(Primer::Beta::Text.new(tag: :p, color: :subtle)) { t("recurring_meeting.ended_blankslate.action") } + end + end + %> +<% else -%> + <%= render RecurringMeetings::TableHeaderComponent.new( + meeting: @recurring_meeting, + title: I18n.t("recurring_meeting.open.title"), + subtitle: I18n.t("recurring_meeting.open.subtitle") + ) %> + <%= render RecurringMeetings::TableComponent.new( + rows: @meetings, + current_project: @project, + count: @count, + direction: @direction, + max_count: @max_count, + test_selector: "agenda-opened-table", + blankslate_title: I18n.t("recurring_meeting.open.blankslate.title"), + blankslate_desc: I18n.t("recurring_meeting.open.blankslate.desc") + ) %> + <%= render RecurringMeetings::TableHeaderComponent.new( + meeting: @recurring_meeting, + title: I18n.t("recurring_meeting.planned.title"), + subtitle: I18n.t("recurring_meeting.planned.subtitle"), + planned: true + ) %> + <%= render RecurringMeetings::TableComponent.new( + rows: @planned_meetings, + current_project: @project, + count: @count, + direction: @direction, + max_count: @max_count, + test_selector: "planned-table", + blankslate_title: I18n.t("recurring_meeting.planned.blankslate.title"), + blankslate_desc: I18n.t("recurring_meeting.planned.blankslate.desc") + ) %> +<% end -%> diff --git a/modules/meeting/app/views/recurring_meetings/show.html.erb b/modules/meeting/app/views/recurring_meetings/show.html.erb index 476c3b1dbdd3..2f0877c13905 100644 --- a/modules/meeting/app/views/recurring_meetings/show.html.erb +++ b/modules/meeting/app/views/recurring_meetings/show.html.erb @@ -29,11 +29,21 @@ See COPYRIGHT and LICENSE files for more details. <% html_title t(:label_recurring_meeting_plural) %> -<%= render(RecurringMeetings::ShowPageHeaderComponent.new(project: @project, meeting: @recurring_meeting)) %> -<%= render(RecurringMeetings::ShowPageSubHeaderComponent.new(project: @project, meeting: @recurring_meeting, params:)) %> +<%= render(RecurringMeetings::ShowPageHeaderComponent.new(meeting: @recurring_meeting)) %> +<%= render(RecurringMeetings::ShowPageSubHeaderComponent.new(meeting: @recurring_meeting, params:)) %> <% if @recurring_meeting.nil? -%> <%= no_results_box %> <% else -%> - <%= render RecurringMeetings::TableComponent.new(rows: @meetings, current_project: @project, count: @count, direction: @direction, max_count: @max_count) %> + <% if @direction == "past" -%> + <%= render RecurringMeetings::TableComponent.new( + rows: @meetings, + current_project: @project, + count: @count, + direction: @direction, + max_count: @max_count + ) %> + <% else -%> + <%= render partial: "show_upcoming" %> + <% end -%> <% end -%> diff --git a/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_watchdog_job.rb b/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_watchdog_job.rb index 0b99448763d6..df44e57bfd54 100644 --- a/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_watchdog_job.rb +++ b/modules/meeting/app/workers/recurring_meetings/init_next_occurrence_watchdog_job.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH diff --git a/modules/meeting/config/locales/crowdin/af.seeders.yml b/modules/meeting/config/locales/crowdin/af.seeders.yml index 8f2106d7a7a8..dc857ed815f7 100644 --- a/modules/meeting/config/locales/crowdin/af.seeders.yml +++ b/modules/meeting/config/locales/crowdin/af.seeders.yml @@ -7,7 +7,7 @@ af: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/af.yml b/modules/meeting/config/locales/crowdin/af.yml index c3160c00f17c..09a442b0ce01 100644 --- a/modules/meeting/config/locales/crowdin/af.yml +++ b/modules/meeting/config/locales/crowdin/af.yml @@ -54,7 +54,9 @@ af: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ af: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ af: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ af: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ af: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ af: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ af: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ af: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ af: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ af: label_meeting_state_closed: "Gesluit" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/ar.seeders.yml b/modules/meeting/config/locales/crowdin/ar.seeders.yml index 76b236d6e8d0..d48c8574960f 100644 --- a/modules/meeting/config/locales/crowdin/ar.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ar.seeders.yml @@ -7,7 +7,7 @@ ar: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/ar.yml b/modules/meeting/config/locales/crowdin/ar.yml index 7726a8784c54..bb7ee13dedf7 100644 --- a/modules/meeting/config/locales/crowdin/ar.yml +++ b/modules/meeting/config/locales/crowdin/ar.yml @@ -58,7 +58,9 @@ ar: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -120,22 +122,31 @@ ar: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + zero: "There are %{count} more meetings." + one: "There is one more meeting." + two: "There are %{count} more meetings." + few: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -177,12 +188,29 @@ ar: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -196,12 +224,31 @@ ar: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "نسخ من الاجتماع #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -209,7 +256,7 @@ ar: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -225,8 +272,9 @@ ar: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -235,6 +283,41 @@ ar: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "تم إرسال الإشعار بنجاح" notice_timezone_missing: لم يتم تعيين المنطقة الزمنية و%{zone} مُفترض. لاختيار منطقتك الزمنية، من فضلك اضغط هنا. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -256,6 +339,8 @@ ar: text_duration_in_hours: "المدة بالساعات" text_in_hours: "في الساعات" text_meeting_agenda_for_meeting: 'جدول أعمال للاجتماع "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "سيؤدي هذا إلى استبدال جميع التغييرات في المقرر! هل تريد المتابعة؟" text_meeting_minutes_for_meeting: 'محضر الجسلة للاجتماع "%{meeting}"' @@ -270,6 +355,10 @@ ar: label_meeting_created_by: "أنشئ بواسطة" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -295,7 +384,7 @@ ar: label_meeting_state_closed: "مغلق" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/az.seeders.yml b/modules/meeting/config/locales/crowdin/az.seeders.yml index 02ee586c2382..4ac04136915a 100644 --- a/modules/meeting/config/locales/crowdin/az.seeders.yml +++ b/modules/meeting/config/locales/crowdin/az.seeders.yml @@ -7,7 +7,7 @@ az: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/az.yml b/modules/meeting/config/locales/crowdin/az.yml index 40b2355ebcbe..fa3869718143 100644 --- a/modules/meeting/config/locales/crowdin/az.yml +++ b/modules/meeting/config/locales/crowdin/az.yml @@ -54,7 +54,9 @@ az: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ az: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ az: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ az: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ az: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ az: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ az: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ az: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ az: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ az: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/be.seeders.yml b/modules/meeting/config/locales/crowdin/be.seeders.yml index 868b3cbe57fc..98d2ad5322b8 100644 --- a/modules/meeting/config/locales/crowdin/be.seeders.yml +++ b/modules/meeting/config/locales/crowdin/be.seeders.yml @@ -7,7 +7,7 @@ be: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/be.yml b/modules/meeting/config/locales/crowdin/be.yml index 45efdd1617c5..0e53e844fd9f 100644 --- a/modules/meeting/config/locales/crowdin/be.yml +++ b/modules/meeting/config/locales/crowdin/be.yml @@ -56,7 +56,9 @@ be: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -118,22 +120,29 @@ be: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + few: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -175,12 +184,29 @@ be: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -194,12 +220,31 @@ be: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -207,7 +252,7 @@ be: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -223,8 +268,9 @@ be: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -233,6 +279,41 @@ be: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -254,6 +335,8 @@ be: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -268,6 +351,10 @@ be: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -293,7 +380,7 @@ be: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/bg.seeders.yml b/modules/meeting/config/locales/crowdin/bg.seeders.yml index 951ebc8f1b34..8ce848dddc5f 100644 --- a/modules/meeting/config/locales/crowdin/bg.seeders.yml +++ b/modules/meeting/config/locales/crowdin/bg.seeders.yml @@ -7,7 +7,7 @@ bg: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/bg.yml b/modules/meeting/config/locales/crowdin/bg.yml index ef58e70ed1f3..0ce65f683c47 100644 --- a/modules/meeting/config/locales/crowdin/bg.yml +++ b/modules/meeting/config/locales/crowdin/bg.yml @@ -54,7 +54,9 @@ bg: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ bg: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Предстоящи срещи" @@ -173,12 +180,29 @@ bg: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Отворена среща" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} ви е изпратил покана за срещата %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Срещата %{title} е преместена от %{actor}" - body: "Срещата %{title} беше преместена от %{actor}" + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Стара дата/час" new_date_time: "Нова дата/час" label_mail_all_participants: "Изпрати имейл до всички участници" @@ -192,12 +216,31 @@ bg: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Копирането на среща понастоящем не копира свързаните с нея точки от дневния ред, а само подробностите." copied: "Копирано от среща #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Завлечете елементите тук, или създайте нов елемент" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ bg: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ bg: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ bg: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ bg: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ bg: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "пренаредени" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ bg: label_meeting_state_closed: "Затворен" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/ca.seeders.yml b/modules/meeting/config/locales/crowdin/ca.seeders.yml index fc015a53e5d1..7d0f22a23ae8 100644 --- a/modules/meeting/config/locales/crowdin/ca.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ca.seeders.yml @@ -7,9 +7,9 @@ ca: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Setmanal + title: Weekly meeting_agenda_items: item_0: title: Bones notícies diff --git a/modules/meeting/config/locales/crowdin/ca.yml b/modules/meeting/config/locales/crowdin/ca.yml index 2ba94ed00b6b..f6f11e9024f0 100644 --- a/modules/meeting/config/locales/crowdin/ca.yml +++ b/modules/meeting/config/locales/crowdin/ca.yml @@ -54,7 +54,9 @@ ca: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ ca: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Pròximes reunions" @@ -173,12 +180,29 @@ ca: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Reunió oberta" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} us ha enviat una invitació per a la reunió %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "La reunió %{title} ha estat reprogramada per %{actor}" - body: "La reunió %{title} ha estat reprogramada per %{actor}" + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Data/hora antiga" new_date_time: "Data/hora nova" label_mail_all_participants: "Envia un correu a tots els participants" @@ -192,12 +216,31 @@ ca: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Actualment en copiar una reunió no es copiaran els elements associats a l'agenda de la reunió, només els detalls." copied: "Copiat de la reunió #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "Nova secció" empty_text: "Arrossega els elements aquí o crea un de nou" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ ca: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ ca: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ ca: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notificació enviada correctament" notice_timezone_missing: No s'ha configurat la zona horària i la %{zone} és assumida. Per seleccionar la teva zona horària, si us plau, fes clic aquí. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ ca: text_duration_in_hours: "Duració en hores" text_in_hours: "en hores" text_meeting_agenda_for_meeting: 'agenda per la reunió "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Estàs segur que vols tancar l'agenda de la reunió?" text_meeting_agenda_open_are_you_sure: "Això sobreescriurà tots els canvis a l'acte! Vols continuar?" text_meeting_minutes_for_meeting: 'actes per la reunió "%{meeting}"' @@ -266,6 +347,10 @@ ca: label_meeting_created_by: "Creat per" label_meeting_last_updated: "Última actualització" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Punts de l'ordre del dia" label_agenda_items_reordered: "reordenat" label_agenda_item_remove: "Suprimeix de l'agenda" @@ -291,7 +376,7 @@ ca: label_meeting_state_closed: "Tancada" label_meeting_state_closed_html: "Tancat" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reobrir reunió" diff --git a/modules/meeting/config/locales/crowdin/ckb-IR.seeders.yml b/modules/meeting/config/locales/crowdin/ckb-IR.seeders.yml index 68d9a21916c0..8e62aa78491f 100644 --- a/modules/meeting/config/locales/crowdin/ckb-IR.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ckb-IR.seeders.yml @@ -7,7 +7,7 @@ ckb-IR: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/ckb-IR.yml b/modules/meeting/config/locales/crowdin/ckb-IR.yml index 20c392434a8e..649e3933e5cd 100644 --- a/modules/meeting/config/locales/crowdin/ckb-IR.yml +++ b/modules/meeting/config/locales/crowdin/ckb-IR.yml @@ -54,7 +54,9 @@ ckb-IR: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ ckb-IR: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ ckb-IR: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ ckb-IR: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ ckb-IR: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ ckb-IR: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ ckb-IR: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ ckb-IR: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ ckb-IR: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ ckb-IR: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/cs.seeders.yml b/modules/meeting/config/locales/crowdin/cs.seeders.yml index 21dc987fc607..8b8a40ffa145 100644 --- a/modules/meeting/config/locales/crowdin/cs.seeders.yml +++ b/modules/meeting/config/locales/crowdin/cs.seeders.yml @@ -7,9 +7,9 @@ cs: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Týdenní + title: Týdně meeting_agenda_items: item_0: title: Dobré zprávy diff --git a/modules/meeting/config/locales/crowdin/cs.yml b/modules/meeting/config/locales/crowdin/cs.yml index 4d9957ed0625..2dfdb85f520c 100644 --- a/modules/meeting/config/locales/crowdin/cs.yml +++ b/modules/meeting/config/locales/crowdin/cs.yml @@ -56,7 +56,9 @@ cs: frequency: "Frekvence" interval: "Interval" start_date: "Začíná v" - end_after: "Ukončení výskytu po" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Řada schůzek končí" iterations: "Výskyty" errors: messages: @@ -118,22 +120,29 @@ cs: label_recurring_meeting_plural: "Opakující se schůzky" label_template: "Šablona" label_recurring_meeting_view: "Zobrazit sérii schůzek" - label_recurring_meeting_create: "Vytvořit ze šablony" - label_recurring_meeting_copy: "Kopírovat jako jednorázový" + label_recurring_meeting_create: "Otevřít" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Zrušit toto opakování" label_recurring_meeting_delete: "Odstranit výskyt" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Veškeré informace o schůzce, které nejsou v šabloně, budou ztraceny. Chcete pokračovat? label_recurring_meeting_restore: "Obnovit tento výskyt" + label_recurring_meeting_schedule: "Rozvrh" + label_recurring_meeting_next_occurrence: "Další výskyt" label_recurring_meeting_more: "Dalších %{count} naplánovaných schůzek (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "Dalších %{count} minulých schůzek " label_recurring_meeting_more_past_singular: "Dalších %{count} minulých schůzek " label_recurring_meeting_show_more: "Ukázat více" + label_recurring_meeting_series_create: "Vytvořit sérii schůzek" label_recurring_meeting_series_edit: "Upravit sérii schůzek" label_recurring_meeting_series_delete: "Odstranit sérii schůzek" + label_recurring_meeting_series_end: "Ukončení série schůzek" + label_recurring_meeting_series_end_now: "Ukončit sérii nyní" + label_meeting_more: + one: "Proběhne ještě jedna schůzka." + few: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "Moje schůzky" label_all_meetings: "Všechny schůzky" label_upcoming_meetings: "Nadcházející schůzky" @@ -175,12 +184,29 @@ cs: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Otevřít schůzku" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} vám poslal pozvánku na schůzku %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Schůzka %{title} byla přeplánována" - summary: "Schůzka %{title} byla přeplánována %{actor}" - body: "Schůzka %{title} byla přeplánována %{actor}" + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Staré datum/čas" new_date_time: "Nové datum/čas" label_mail_all_participants: "Poslat e-mail všem účastníkům" @@ -194,12 +220,31 @@ cs: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Kopírování schůzky v současné době nezkopíruje související body pořadu jednání, jen podrobnosti" copied: "Zkopírováno ze schůzky #%{id}" + delete_dialog: + one_time: + title: "Odstranit schůzku" + heading: "Smazat tuto schůzku?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Sekce bez názvu" delete_confirmation: "Smazáním sekce také smažete všechny body agendy. Opravdu to chcete udělat?" placeholder_title: "Nová sekce" empty_text: "Přetáhněte položky sem nebo vytvořte nové" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "Tato schůzka je součástí opakované série schůzek." error_no_next: "Na této schůzce není žádný další výskyt." @@ -207,7 +252,7 @@ cs: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Dokončit šablonu" + button_finalize: "Open first meeting" blank_title: "Vaše šablona série schůzek je prázdná" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -223,8 +268,9 @@ cs: working_days: "Každý pracovní den" weekly: "Týdně" end_after: - specific_date: "konkrétní datum" - iterations: "počet výskytů" + never: "nikdy" + specific_date: "po určitém datu" + iterations: "po několika výskytech" starts: "Začíná" in_words: daily_interval: "Každé %{interval} dny" @@ -233,6 +279,41 @@ cs: weekly_interval: "Každý %{interval} týdny v %{weekday}" frequency: "%{base} v %{time}" full: "%{base} v %{time}, končí %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} v %{time}" + open: + title: "Otevřít" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "Momentálně žádné otevřené schůzky" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Plánováno" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "Žádné další plánované schůzky" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Odstranit sérii schůzek" + heading: "Trvale smazat tuto sérii schůzek?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Zrušit výskyt schůzky" + heading: "Zrušit výskyt schůzky" + confirmation_message_html: > + Veškeré informace o schůzce, které nejsou v šabloně, budou ztraceny. Chcete pokračovat? + confirm_button: "Zrušit výskyt" + end_series_dialog: + title: "Ukončení série schůzek" notice_successful_notification: "Oznámení bylo úspěšně odesláno" notice_timezone_missing: Není nastaveno žádné časové pásmo a předpokládá se %{zone} . Chcete-li vybrat časové pásmo, klikněte prosím zde. notice_meeting_updated: "Tato stránka byla aktualizována někým jiným. Pro zobrazení změn znovu načtena." @@ -254,6 +335,8 @@ cs: text_duration_in_hours: "Doba trvání v hodinách" text_in_hours: "v hodinách" text_meeting_agenda_for_meeting: 'Agenda schůzky "%{meeting}"' + text_meeting_series_end_early_heading: "Vymazat budoucí výskyty?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Jste si jisti, že chcete ukončit program schůzky?" text_meeting_agenda_open_are_you_sure: "Toto přepíše všechny změny v zápisech! Chcete pokračovat?" text_meeting_minutes_for_meeting: 'zápis pro schůzku "%{meeting}"' @@ -268,6 +351,10 @@ cs: label_meeting_created_by: "Vytvořil" label_meeting_last_updated: "Naposledy aktualizováno" label_meeting_reload: "Obnovit" + label_meeting_index_today: "Dnes" + label_meeting_index_tomorrow: "Zítra" + label_meeting_index_this_week: "Později tento týden" + label_meeting_index_later: "Příští týden a později" label_agenda_items: "Bod programu" label_agenda_items_reordered: "přeřazeno" label_agenda_item_remove: "Odebrat z programu" @@ -293,7 +380,7 @@ cs: label_meeting_state_closed: "Uzavřený" label_meeting_state_closed_html: "Uzavřeno" label_meeting_state_agenda_created: "Program byl vytvořen" - label_meeting_state_scheduled: "Naplánováno" + label_meeting_state_planned: "Plánováno" label_meeting_state_cancelled: "Zrušeno" label_meeting_state_skipped: "Přeskočeno" label_meeting_reopen_action: "Znovu otevřít schůzku" diff --git a/modules/meeting/config/locales/crowdin/da.seeders.yml b/modules/meeting/config/locales/crowdin/da.seeders.yml index fefe716b05cf..807cd9fb4318 100644 --- a/modules/meeting/config/locales/crowdin/da.seeders.yml +++ b/modules/meeting/config/locales/crowdin/da.seeders.yml @@ -7,7 +7,7 @@ da: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/da.yml b/modules/meeting/config/locales/crowdin/da.yml index d6c6873f63be..2cbba514cf2f 100644 --- a/modules/meeting/config/locales/crowdin/da.yml +++ b/modules/meeting/config/locales/crowdin/da.yml @@ -54,7 +54,9 @@ da: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ da: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ da: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ da: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ da: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ da: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ da: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Påmindelse er afsendt" notice_timezone_missing: Der er ikke sat en tidszone og systemet har valgt %{zone}. For at vælge din egen tidszone, klik venligst her. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ da: text_duration_in_hours: "Duration in hours" text_in_hours: "i timer" text_meeting_agenda_for_meeting: 'dagsorden for mødet "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "Dette vil overskrive alle ændringer i minutterne! Vil du fortsætte?" text_meeting_minutes_for_meeting: 'referat for mødet "%{meeting}"' @@ -266,6 +347,10 @@ da: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ da: label_meeting_state_closed: "Lukket" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/de.seeders.yml b/modules/meeting/config/locales/crowdin/de.seeders.yml index 6977ec91bce2..204c5c44d7d4 100644 --- a/modules/meeting/config/locales/crowdin/de.seeders.yml +++ b/modules/meeting/config/locales/crowdin/de.seeders.yml @@ -7,7 +7,7 @@ de: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Wöchentlich meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/de.yml b/modules/meeting/config/locales/crowdin/de.yml index 8e1189021cf9..b715b5728f42 100644 --- a/modules/meeting/config/locales/crowdin/de.yml +++ b/modules/meeting/config/locales/crowdin/de.yml @@ -54,7 +54,9 @@ de: frequency: "Häufigkeit" interval: "Intervall" start_date: "Started am" - end_after: "Serie endet nach" + start_time: "Startdatum" + start_time_hour: "Uhrzeit" + end_after: "Ende der Terminserie" iterations: "Ereignisse" errors: messages: @@ -116,22 +118,27 @@ de: label_recurring_meeting_plural: "Wiederkehrende Besprechungen" label_template: "Vorlage" label_recurring_meeting_view: "Terminserie ansehen" - label_recurring_meeting_create: "Aus Vorlage erstellen" + label_recurring_meeting_create: "Öffnen" label_recurring_meeting_copy: "Als einmalige Besprechung kopieren" label_recurring_meeting_cancel: "Diese Besprechung absagen" label_recurring_meeting_delete: "Besprechung löschen" - label_recurring_meeting_delete_confirmation: > - Diese Besprechung ist Teil der Terminserie %{name}. Dadurch wird nur dieses bestimmte Ereignis und nicht die gesamte Serie gelöscht. Möchten Sie fortfahren? - label_recurring_occurrence_delete_confirmation: > - Alle Inhalte der Besprechung, die nicht aus der Vorlage stammen, werden gelöscht werden. Möchten Sie fortfahren? label_recurring_meeting_restore: "Dieses Vorkommen wiederherstellen" + label_recurring_meeting_schedule: "Terminplan" + label_recurring_meeting_next_occurrence: "Nächstes Ereignis" label_recurring_meeting_more: "Es gibt %{count} folgende Besprechungen (%{schedule})." + label_recurring_meeting_no_end_date: "Es sind weitere Besprechungen geplant (%{schedule})." label_recurring_meeting_more_singular: "Es gibt %{count} folgende Besprechung (%{schedule})." label_recurring_meeting_more_past: "Es gibt %{count} weitere vergangene Besprechungen." label_recurring_meeting_more_past_singular: "Es gibt %{count} weitere vergangene Besprechung." label_recurring_meeting_show_more: "Mehr anzeigen" + label_recurring_meeting_series_create: "Terminserie erstellen" label_recurring_meeting_series_edit: "Terminserie bearbeiten" label_recurring_meeting_series_delete: "Terminserie löschen" + label_recurring_meeting_series_end: "Terminserie beenden" + label_recurring_meeting_series_end_now: "Serie jetzt beenden" + label_meeting_more: + one: "Es gibt eine weitere Besprechung." + other: "Es gibt %{count} weitere Besprechungen." label_my_meetings: "Meine Besprechungen" label_all_meetings: "Alle Besprechungen" label_upcoming_meetings: "Zukünftige Meetings" @@ -173,31 +180,67 @@ de: Senden Sie sofort eine E-Mail Einladung an die oben ausgewählten Teilnehmer. Sie können dies auch jederzeit manuell durchführen. send_invitation_emails_structured: "Sofortige E-Mail-Einladung an alle Teilnehmer senden. Sie können dies auch zu einem späteren Zeitpunkt manuell tun." open_meeting_link: "Besprechung öffnen" + open_my_meetings_link: "Meine Besprechungen anzeigen" + series: + title: "[%{project_name}] Terminserie '%{title}'" + summary: "%{actor} hat eine neue Terminserie '%{title}' eingerichtet" + series_rescheduled: + title: "[%{project_name}] Terminserie ''%{title}' verschoben" + summary: "%{actor} hat den Zeitplan für die Terminserie '%{title}' geändert" + old_schedule: "Alter Zeitplan" + new_schedule: "Neuer Zeitplan" invited: - summary: "%{actor} hat Ihnen eine Einladung für die folgende Besprechung gesendet: %{title}" + summary: "%{actor} hat Ihnen eine Einladung für die folgende Besprechung gesendet: '%{title}'" + cancelled: + header: "Abgesagt: Besprechung '%{title}'" + header_occurrence: "Abgesagt: Wiederkehrende Besprechung '%{title}'" + header_series: "Abgesagt: Terminserie '%{title}'" + summary_occurrence: "Ein Vorkommen von '%{title}' wurde von %{actor} gelöscht." + summary_series: "Die Terminserie '%{title}' wurde von %{actor} abgesagt." + summary: "Besprechung '%{title}' wurde von %{actor} abgesagt." + date_time: "Geplanter Zeitpunkt" rescheduled: - header: "Besprechung %{title} verschoben" - summary: "Die Besprechung %{title} wurde durch %{actor} verschoben." - body: "Die Besprechung %{title} wurde durch %{actor} verschoben." + header: "Besprechung '%{title}' wurde verschoben" + summary: "Die Besprechung '%{title}' wurde durch %{actor} verschoben" + body: "Die Besprechung '%{title}' wurde durch %{actor} verschoben." old_date_time: "Alte(s) Datum/Zeit" new_date_time: "Neue(s) Datum/Zeit" label_mail_all_participants: "E-Mail an alle Teilnehmer senden" types: classic: "Klassisch" classic_text: "Organisieren Sie Ihre Besprechung und zugehöriges Protokoll in einem einzelnen Notizblock." - structured: "Strukturiert" + structured: "Dynamisch" one_time: "Einmalig" recurring: "Terminserie" recurring_text: "Erstellen Sie eine Terminserie mit einer dynamischen Vorlage und wiederkehrenden Besprechungen." structured_text: "Organisieren Sie Ihr Meeting als strukturierte Liste von Einträgen und verknüpfen Sie diese optional mit einem Arbeitspaket." structured_text_copy: "Das Kopieren einer Besprechung kopiert derzeit nicht die zugehörigen Tagesordnungspunkte, sondern nur dessen Details" copied: "Kopiert von Meeting #%{id}" + delete_dialog: + one_time: + title: "Besprechung löschen" + heading: "Diese Besprechung löschen?" + confirmation_message_html: > + Diese Aktion kann nicht rückgängig gemacht werden. Bitte prüfen Sie die Angaben, bevor Sie fortfahren. + occurrence: + title: "Wiederkehrende Besprechung absagen" + heading: "Dieses Ereignis absagen?" + confirmation_message_html: > + Sämtliche Inhalte der Besprechung, die nicht aus der Vorlage entstammen, werden gelöscht und verloren werden. Möchten Sie fortfahren? + confirm_button: "Besprechung absagen" + blankslate: + title: "Keine Besprechungen anzuzeigen" + desc: "Es gibt keine Besprechungen, die die Kriterien des aktiven Filters erfüllen." meeting_section: untitled_title: "Unbenannter Abschnitt" delete_confirmation: "Wenn Sie den Abschnitt löschen, werden auch alle zugehörigen Tagesordnungspunkte gelöscht. Möchten Sie fortfahren?" placeholder_title: "Neuer Abschnitt" empty_text: "Neue Agendapunkte hierhin bewegen oder neu erstellen" recurring_meeting: + ended_blankslate: + title: "Terminserie beendet" + message: "Diese Terminserie ist beendet. Es finden keine weiteren Ereignisse statt. " + action: "Sie können immer noch vorangegangene Besprechungen dieser Serie anzeigen oder die Serie bearbeiten, um weitere Termine ergänzen." occurrence: infoline: "Diese Besprechung ist Teil einer Terminserie." error_no_next: "Es gibt keinen nächsten Termin für diese Serie." @@ -205,7 +248,7 @@ de: first_created: > Die erste Besprechung wurde erfolgreich aus der Vorlage erstellt. Weitere werden automatisch zu dem Zeitpunkt erstellt, wenn die vorhergehende Besprechung startet. template: - button_finalize: "Vorlage fertigstellen" + button_finalize: "Erste Besprechung öffnen" blank_title: "Die Vorlage für die wiederkehrenden Besprechungen ist leer" description: > Diese Vorlage wird immer dann verwendet, wenn neue Besprechungen der Terminserie erstellt werden. Sie können zu dieser Vorlage Tagesordnungspunkte, Teilnehmer und Anhänge hinzufügen. @@ -221,8 +264,9 @@ de: working_days: "An Arbeitstagen" weekly: "Wöchentlich" end_after: - specific_date: "einem bestimmten Datum" - iterations: "nach Anzahl von Ereignissen" + never: "nie" + specific_date: "nach einem bestimmten Datum" + iterations: "nach einer Reihe von Ereignissen" starts: "Beginnt" in_words: daily_interval: "Alle %{interval} Tage" @@ -231,6 +275,41 @@ de: weekly_interval: "Alle %{interval} Wochen am %{weekday}" frequency: "%{base} um %{time}" full: "%{base} um %{time}, endet %{end_date}" + full_past: "%{base} um %{time}, endet am %{end_date}" + never_ending: "%{base} um %{time}" + open: + title: "Öffnen" + subtitle: > + Offene Besprechungen haben Tagesordnungen, die bearbeitet werden können und im Bereich "Meine Meetings" der Teilnehmer angezeigt werden. Änderungen an der Vorlage für Besprechungsserien wirken sich nicht mehr auf diese bereits geöffneten Besprechungen aus. + blankslate: + title: "Zurzeit keine offenen Besprechungen" + desc: "Sie können eine geplante Besprechung manuell öffnen, indem Sie unten auf die Schaltfläche \"Öffnen\" klicken" + planned: + title: "Geplant" + subtitle: > + Die folgenden Besprechungen sind als Teil der Terminserie geplant, aber noch nicht geöffnet. Jedes Mal, wenn eine geplante Besprechung beginnt, wird die nächste automatisch für Sie geöffnet. Sie können geplante Besprechungen auch manuell öffnen, um die Vorlage zu importieren und mit der Bearbeitung der Tagesordnung zu beginnen. + blankslate: + title: "Keine weiteren geplanten Besprechungen" + desc: > + In dieser Terminserie sind keine weiteren Besprechungen geplant. Um weitere Besprechungen zu planen oder die Serie zu erweitern, gehen Sie zur Vorlage und bearbeiten Sie die Besprechungsdetails, um das Enddatum, die Häufigkeit oder das Intervall zu ändern. + delete_dialog: + title: "Terminserie löschen" + heading: "Diese Terminserie endgültig löschen?" + confirmation_message_html: + zero: > + Die Terminserie %{title} enthält keine Besprechungen. Die Serie wird für alle gelöscht. Bitte gehen Sie mit Vorsicht vor. + one: > + Durch die Löschung von %{title} wird eine bestehende Besprechung in dieser Serie gelöscht. Diese Aktion ist nicht rückgängig zu machen. Bitte prüfen Sie die Angaben, bevor Sie fortfahren. + other: > + Durch die Löschung von %{title} werden alle %{count} Besprechungen in dieser Serie gelöscht. Diese Aktion ist nicht rückgängig zu machen. Bitte prüfen Sie die Angaben, bevor Sie fortfahren. + scheduled_delete_dialog: + title: "Terminserie abbrechen" + heading: "Dieses Ereignis absagen?" + confirmation_message_html: > + Sämtliche Inhalte der Besprechung, die nicht aus der Vorlage entstammen, werden gelöscht und verloren werden. Möchten Sie fortfahren? + confirm_button: "Besprechung absagen" + end_series_dialog: + title: "Terminserie beenden" notice_successful_notification: "Benachrichtigung erfolgreich gesendet" notice_timezone_missing: Keine Zeitzone eingestellt und daher %{zone} angenommen. Um Ihre Zeitzone einzustellen, klicken Sie bitte hier. notice_meeting_updated: "Diese Seite wurde von einem anderen Benutzer verändert. Laden Sie neu, um die Änderungen zu sehen." @@ -252,6 +331,8 @@ de: text_duration_in_hours: "Dauer in Stunden" text_in_hours: "in Stunden" text_meeting_agenda_for_meeting: 'die Agenda für die Besprechung "%{meeting}"' + text_meeting_series_end_early_heading: "Zukünftige Ereignisse löschen?" + text_meeting_series_end_early: "Durch das Beenden der Terminserie werden alle zukünftigen offenen oder geplanten Besprechungsereignisse gelöscht" text_meeting_closing_are_you_sure: "Sind Sie sicher, dass Sie die Agenda schließen wollen?" text_meeting_agenda_open_are_you_sure: "Es werden alle Änderungen im Protokoll überschrieben! Wollen Sie fortfahren?" text_meeting_minutes_for_meeting: 'das Protokoll für die Besprechung "%{meeting}"' @@ -266,6 +347,10 @@ de: label_meeting_created_by: "Erstellt von" label_meeting_last_updated: "Zuletzt aktualisiert" label_meeting_reload: "Neu laden" + label_meeting_index_today: "Heute" + label_meeting_index_tomorrow: "Morgen" + label_meeting_index_this_week: "Später in dieser Woche" + label_meeting_index_later: "Nächste Woche und später" label_agenda_items: "Tagesordnungspunkte" label_agenda_items_reordered: "neu geordnet" label_agenda_item_remove: "Von der Tagesordnung entfernen" @@ -291,7 +376,7 @@ de: label_meeting_state_closed: "Geschlossen" label_meeting_state_closed_html: "Geschlossen" label_meeting_state_agenda_created: "Tagesordnung erstellt" - label_meeting_state_scheduled: "Geplant" + label_meeting_state_planned: "Geplant" label_meeting_state_cancelled: "Abgesagt" label_meeting_state_skipped: "Übersprungen" label_meeting_reopen_action: "Besprechung wiedereröffnen" diff --git a/modules/meeting/config/locales/crowdin/el.seeders.yml b/modules/meeting/config/locales/crowdin/el.seeders.yml index d6f2a650024c..3da15d971804 100644 --- a/modules/meeting/config/locales/crowdin/el.seeders.yml +++ b/modules/meeting/config/locales/crowdin/el.seeders.yml @@ -7,7 +7,7 @@ el: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/el.yml b/modules/meeting/config/locales/crowdin/el.yml index 51d6d211942e..b353b989c490 100644 --- a/modules/meeting/config/locales/crowdin/el.yml +++ b/modules/meeting/config/locales/crowdin/el.yml @@ -54,7 +54,9 @@ el: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ el: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ el: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ el: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Αντιγράφηκε από τη Συνάντηση #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ el: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ el: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ el: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Η ειδοποίηση απεστάλη επιτυχώς" notice_timezone_missing: Δεν έχει οριστεί ζώνη ώρας και θεωρήθηκε η %{zone}. Για να επιλέξετε την ζώνη ώρας σας, παρακαλούμε κάντε κλικ εδώ. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ el: text_duration_in_hours: "Διάρκεια σε ώρες" text_in_hours: "σε ώρες" text_meeting_agenda_for_meeting: 'ατζέντα για τη συνάντηση "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "Αυτό θα αντικαταστήσει όλες τις αλλαγές στα πρακτικά συνάντησης! Θέλετε να συνεχίσετε;" text_meeting_minutes_for_meeting: 'πρακτικά για τη συνάντηση "%{meeting}"' @@ -266,6 +347,10 @@ el: label_meeting_created_by: "Δημιουργήθηκε από" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ el: label_meeting_state_closed: "Κλειστό" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/eo.seeders.yml b/modules/meeting/config/locales/crowdin/eo.seeders.yml index 1b1bd8aa042f..cbe57477fdbf 100644 --- a/modules/meeting/config/locales/crowdin/eo.seeders.yml +++ b/modules/meeting/config/locales/crowdin/eo.seeders.yml @@ -7,7 +7,7 @@ eo: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/eo.yml b/modules/meeting/config/locales/crowdin/eo.yml index 5cdc2bca204a..579d3f3281d9 100644 --- a/modules/meeting/config/locales/crowdin/eo.yml +++ b/modules/meeting/config/locales/crowdin/eo.yml @@ -54,7 +54,9 @@ eo: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ eo: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ eo: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ eo: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ eo: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ eo: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ eo: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ eo: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ eo: label_meeting_created_by: "Kreita de" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ eo: label_meeting_state_closed: "Fermita" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/es.seeders.yml b/modules/meeting/config/locales/crowdin/es.seeders.yml index 017b5be41cc2..d7acbd005ee8 100644 --- a/modules/meeting/config/locales/crowdin/es.seeders.yml +++ b/modules/meeting/config/locales/crowdin/es.seeders.yml @@ -7,9 +7,9 @@ es: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Semanal + title: Semanalmente meeting_agenda_items: item_0: title: Buenas noticias diff --git a/modules/meeting/config/locales/crowdin/es.yml b/modules/meeting/config/locales/crowdin/es.yml index d75a09f5f19e..947eee5889a4 100644 --- a/modules/meeting/config/locales/crowdin/es.yml +++ b/modules/meeting/config/locales/crowdin/es.yml @@ -54,7 +54,9 @@ es: frequency: "Frecuencia" interval: "Intervalo" start_date: "Empieza el" - end_after: "Finalizar la serie después de" + start_time: "Hora de inicio" + start_time_hour: "Hora de inicio" + end_after: "Fin de la serie de reuniones" iterations: "Repeticiones" errors: messages: @@ -116,22 +118,27 @@ es: label_recurring_meeting_plural: "Reuniones periódicas" label_template: "Plantilla" label_recurring_meeting_view: "Ver serie de reuniones" - label_recurring_meeting_create: "Crear a partir de una plantilla" + label_recurring_meeting_create: "Abrir" label_recurring_meeting_copy: "Copiar como única" label_recurring_meeting_cancel: "Cancelar esta repetición" label_recurring_meeting_delete: "Eliminar repetición" - label_recurring_meeting_delete_confirmation: > - Esta reunión forma parte de una serie llamada %{name}. Esto solo eliminará esta reunión en particular y no toda la serie. ¿Desea continuar? - label_recurring_occurrence_delete_confirmation: > - Cualquier información sobre la reunión que no figure en la plantilla se perderá. ¿Desea continuar? label_recurring_meeting_restore: "Restaurar esta repetición" + label_recurring_meeting_schedule: "Programar" + label_recurring_meeting_next_occurrence: "Siguiente repetición" label_recurring_meeting_more: "Hay %{count} reuniones más programadas (%{schedule})." + label_recurring_meeting_no_end_date: "Hay más reuniones programadas (%{schedule})." label_recurring_meeting_more_singular: "Hay %{count} reuniones más programadas (%{schedule})." label_recurring_meeting_more_past: "Hay %{count} reuniones más pasadas." label_recurring_meeting_more_past_singular: "Hay %{count} reuniones más pasadas." label_recurring_meeting_show_more: "Mostrar más" + label_recurring_meeting_series_create: "Crear serie de reuniones" label_recurring_meeting_series_edit: "Editar serie de reuniones" label_recurring_meeting_series_delete: "Eliminar serie de reuniones" + label_recurring_meeting_series_end: "Finalizar serie de reuniones" + label_recurring_meeting_series_end_now: "Finalizar la serie ahora" + label_meeting_more: + one: "Hay una reunión más." + other: "Hay %{count} reuniones más." label_my_meetings: "Mis reuniones" label_all_meetings: "Todas las reuniones" label_upcoming_meetings: "Próximas reuniones" @@ -173,12 +180,29 @@ es: Envíe inmediatamente una invitación por correo electrónico a los participantes seleccionados anteriormente. También puede hacerlo manualmente en cualquier momento posterior. send_invitation_emails_structured: "Envíe inmediatamente una invitación por correo electrónico a todos los participantes. También puede hacerlo manualmente en cualquier momento posterior." open_meeting_link: "Abrir reunión" + open_my_meetings_link: "Ir a Mis reuniones" + series: + title: "[%{project_name}] Serie de reuniones «%{title}»" + summary: "%{actor} ha creado una nueva serie de reuniones «%{title}»" + series_rescheduled: + title: "[%{project_name}] Serie de reuniones «%{title}» reprogramada" + summary: "%{actor} ha cambiado la programación de la serie de reuniones «%{title}»" + old_schedule: "Programación antigua" + new_schedule: "Nueva programación" invited: - summary: "%{actor} te ha enviado una invitación para la reunión %{title}" + summary: "%{actor} te ha enviado una invitación para la reunión «%{title}»" + cancelled: + header: "Cancelada: Reunión «%{title}»" + header_occurrence: "Cancelada: Repetición de la reunión «%{title}»" + header_series: "Cancelada: Serie de reuniones «%{title}»" + summary_occurrence: "%{actor} ha cancelado una repetición de «%{title}»." + summary_series: "%{actor} ha cancelado la serie de reuniones «%{title}»." + summary: "%{actor} ha cancelado «%{title}»." + date_time: "Fecha/hora programada" rescheduled: - header: "La reunión %{title} ha sido reprogramada" - summary: "La reunión %{title} ha sido reprogramada por %{actor}" - body: "La reunión %{title} ha sido reprogramada por %{actor}" + header: "La reunión «%{title}» ha sido reprogramada" + summary: "%{actor} ha reprogramado la reunión «%{title}»" + body: "%{actor} ha reprogramado la reunión «%{title}»." old_date_time: "Fecha y hora anteriores" new_date_time: "Fecha y hora nuevas" label_mail_all_participants: "Enviar email a todos los participantes" @@ -192,12 +216,31 @@ es: structured_text: "Organice su reunión como una lista dinámica de temas del orden del día, enlazándolos opcionalmente a un paquete de trabajo." structured_text_copy: "Copiar una reunión no copiará actualmente los elementos asociados de la agenda de la reunión, solo los detalles" copied: "Copiado de la reunión %{id}" + delete_dialog: + one_time: + title: "Eliminar reunión" + heading: "¿Eliminar esta reunión?" + confirmation_message_html: > + Esta acción no es reversible. Proceda con precaución. + occurrence: + title: "Cancelar repetición de reunión" + heading: "¿Desea cancelar esta repetición de reunión?" + confirmation_message_html: > + Cualquier información sobre la reunión que no figure en la plantilla se perderá. ¿Desea continuar? + confirm_button: "Cancelar repetición" + blankslate: + title: "No hay reuniones que mostrar" + desc: "No hay reuniones que cumplan los criterios del filtro activo." meeting_section: untitled_title: "Sección sin título" delete_confirmation: "Al eliminar esta sección también se eliminarán todos sus puntos de agenda. ¿Seguro que desea hacerlo?" placeholder_title: "Nueva sección" empty_text: "Arrastre los elementos aquí o cree uno nuevo" recurring_meeting: + ended_blankslate: + title: "Serie de reuniones finalizada" + message: "Esta serie de reuniones ha llegado a su fin. No hay reuniones programadas. " + action: "Puede seguir viendo las repeticiones anteriores o editar la serie de reuniones para ampliarla." occurrence: infoline: "Esta reunión forma parte de una serie de reuniones periódicas." error_no_next: "No hay próxima repetición para esta reunión." @@ -205,7 +248,7 @@ es: first_created: > La primera reunión se ha creado correctamente a partir de la plantilla. Todas las reuniones futuras se crearán automáticamente al mismo tiempo que la anterior. template: - button_finalize: "Finalizar plantilla" + button_finalize: "Abrir primera reunión" blank_title: "La plantilla de la serie de reuniones está vacía" description: > Esta plantilla se usará siempre que se creen nuevas reuniones de la serie. Puede añadir elementos de agenda, participantes y archivos adjuntos a esta plantilla. @@ -221,8 +264,9 @@ es: working_days: "Todos los dias hábiles" weekly: "Semanalmente" end_after: - specific_date: "una fecha específica" - iterations: "un número de repeticiones" + never: "nunca" + specific_date: "después de una fecha específica" + iterations: "después de un número de repeticiones" starts: "Empieza" in_words: daily_interval: "Cada %{interval} días" @@ -231,6 +275,41 @@ es: weekly_interval: "Cada %{interval} semanas el %{weekday}" frequency: "%{base} a las %{time}" full: "%{base} a las %{time}, finaliza el %{end_date}" + full_past: "%{base} a las %{time}, finalizó el %{end_date}" + never_ending: "%{base} a las %{time}" + open: + title: "Abrir" + subtitle: > + Las reuniones abiertas tienen agendas que se pueden editar y que aparecen en la sección «Mis reuniones» de los usuarios individuales. Los cambios en la plantilla de la serie de reuniones no afectan a las repeticiones ya abiertas. + blankslate: + title: "No hay reuniones abiertas por el momento" + desc: "Puede abrir manualmente una reunión programada haciendo clic en el botón «Abrir» que aparece a continuación" + planned: + title: "Planificada" + subtitle: > + Las siguientes reuniones están planificadas en el calendario de reuniones periódicas, pero aún no están abiertas. Cada vez que comience una reunión planificada, se abrirá automáticamente la siguiente. También puede abrir reuniones planificadas manualmente para importar la plantilla y empezar a editar la agenda. + blankslate: + title: "No hay más reuniones planificadas" + desc: > + No hay reuniones adicionales programadas en esta serie. Para programar reuniones adicionales o ampliar la serie, vaya a la plantilla y edite los detalles de la reunión para cambiar la fecha de finalización, la frecuencia o el intervalo. + delete_dialog: + title: "Eliminar serie de reuniones" + heading: "¿Eliminar permanentemente esta serie de reuniones?" + confirmation_message_html: + zero: > + La serie de reuniones %{title} no tiene ninguna reunión. La serie se eliminará para todos. Proceda con precaución. + one: > + Al eliminar %{title} también se eliminará una repetición de esta serie. Esta acción no es reversible. Proceda con precaución. + other: > + Al eliminar %{title} se eliminarán todas las apariciones de %{count} en esta serie. Esta acción no es reversible. Proceda con precaución. + scheduled_delete_dialog: + title: "Cancelar repetición de reunión" + heading: "¿Desea cancelar esta repetición de reunión?" + confirmation_message_html: > + Cualquier información sobre la reunión que no figure en la plantilla se perderá. ¿Desea continuar? + confirm_button: "Cancelar repetición" + end_series_dialog: + title: "Finalizar serie de reuniones" notice_successful_notification: "Notificación enviada correctamente" notice_timezone_missing: No se ha establecido zona horaria y se asume %{zone}. Para elegir su zona horaria, por favor, haga clic aquí. notice_meeting_updated: "Esta página ha sido actualizada por otra persona. Recárguela para ver los cambios." @@ -252,6 +331,8 @@ es: text_duration_in_hours: "Duración en horas" text_in_hours: "en horas" text_meeting_agenda_for_meeting: 'agenda para la reunión "%{meeting}"' + text_meeting_series_end_early_heading: "¿Eliminar futuras repeticiones?" + text_meeting_series_end_early: "Al finalizar la serie, se eliminarán todas las repeticiones futuras abiertas o programadas" text_meeting_closing_are_you_sure: "¿Seguro que quiere cerrar el orden del día de la reunión?" text_meeting_agenda_open_are_you_sure: "Se sobrescribirán todos los cambios en las minutas. ¿Quiere continuar?" text_meeting_minutes_for_meeting: 'minutas para la reunión "%{meeting}"' @@ -266,6 +347,10 @@ es: label_meeting_created_by: "Creado por" label_meeting_last_updated: "Última actualización" label_meeting_reload: "Recargar" + label_meeting_index_today: "Hoy" + label_meeting_index_tomorrow: "Mañana" + label_meeting_index_this_week: "A finales de esta semana" + label_meeting_index_later: "La semana que viene y después" label_agenda_items: "Puntos del orden del día" label_agenda_items_reordered: "reordenados" label_agenda_item_remove: "Quitar del orden del día" @@ -291,7 +376,7 @@ es: label_meeting_state_closed: "Cerrado" label_meeting_state_closed_html: "Cerrada" label_meeting_state_agenda_created: "Agenda creada" - label_meeting_state_scheduled: "Programada" + label_meeting_state_planned: "Planificada" label_meeting_state_cancelled: "Cancelada" label_meeting_state_skipped: "Omitida" label_meeting_reopen_action: "Reabrir reunión" diff --git a/modules/meeting/config/locales/crowdin/et.seeders.yml b/modules/meeting/config/locales/crowdin/et.seeders.yml index 0fc7beb62c7b..7ab8339b3b27 100644 --- a/modules/meeting/config/locales/crowdin/et.seeders.yml +++ b/modules/meeting/config/locales/crowdin/et.seeders.yml @@ -7,7 +7,7 @@ et: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/et.yml b/modules/meeting/config/locales/crowdin/et.yml index b539ec4982f1..be9c6e56d2f7 100644 --- a/modules/meeting/config/locales/crowdin/et.yml +++ b/modules/meeting/config/locales/crowdin/et.yml @@ -54,7 +54,9 @@ et: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ et: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ et: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ et: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ et: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ et: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ et: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ et: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ et: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ et: label_meeting_state_closed: "Suletud" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/eu.seeders.yml b/modules/meeting/config/locales/crowdin/eu.seeders.yml index 92efad114e5f..daab3fb7983c 100644 --- a/modules/meeting/config/locales/crowdin/eu.seeders.yml +++ b/modules/meeting/config/locales/crowdin/eu.seeders.yml @@ -7,7 +7,7 @@ eu: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/eu.yml b/modules/meeting/config/locales/crowdin/eu.yml index 72de155c8704..b367e4ae11af 100644 --- a/modules/meeting/config/locales/crowdin/eu.yml +++ b/modules/meeting/config/locales/crowdin/eu.yml @@ -54,7 +54,9 @@ eu: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ eu: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ eu: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ eu: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "#%{id} Hitzordutik kopiatua" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ eu: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ eu: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ eu: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Jakinarazpena ondo bidali da" notice_timezone_missing: Ez da ordu-eremurik zehaztu eta %{zone} hartu da ontzat. Ordu-eremua aukeratzeko klikatu hemen, mesedez. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ eu: text_duration_in_hours: "Iraupena ordutan" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ eu: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ eu: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/fa.seeders.yml b/modules/meeting/config/locales/crowdin/fa.seeders.yml index 603d8ddcca3c..7ea5c1030eaf 100644 --- a/modules/meeting/config/locales/crowdin/fa.seeders.yml +++ b/modules/meeting/config/locales/crowdin/fa.seeders.yml @@ -7,7 +7,7 @@ fa: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/fa.yml b/modules/meeting/config/locales/crowdin/fa.yml index a251f3d8f863..5de66f3c8255 100644 --- a/modules/meeting/config/locales/crowdin/fa.yml +++ b/modules/meeting/config/locales/crowdin/fa.yml @@ -54,7 +54,9 @@ fa: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ fa: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ fa: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ fa: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ fa: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ fa: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ fa: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ fa: text_duration_in_hours: "Duration in hours" text_in_hours: "در ساعات" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ fa: label_meeting_created_by: "ایجاد شده توسط" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ fa: label_meeting_state_closed: "بسته" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/fi.seeders.yml b/modules/meeting/config/locales/crowdin/fi.seeders.yml index ad45d7e2262d..8eb522a1a4da 100644 --- a/modules/meeting/config/locales/crowdin/fi.seeders.yml +++ b/modules/meeting/config/locales/crowdin/fi.seeders.yml @@ -7,7 +7,7 @@ fi: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/fi.yml b/modules/meeting/config/locales/crowdin/fi.yml index 868fb3990e9c..402b6ae75490 100644 --- a/modules/meeting/config/locales/crowdin/fi.yml +++ b/modules/meeting/config/locales/crowdin/fi.yml @@ -54,7 +54,9 @@ fi: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ fi: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ fi: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ fi: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Kopioitu kokouksesta #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ fi: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ fi: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ fi: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Ilmoituksen lähettäminen onnistui" notice_timezone_missing: Aikavyöhykettä ei ole määritetty, joten oletuksena on %{zone}. Valitaksesi aikavyöhykkeen, klikkaa tästä. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ fi: text_duration_in_hours: "Keston tunteina" text_in_hours: "tuntia" text_meeting_agenda_for_meeting: 'kokouksen "%{meeting}" esityslista' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "Tämä korvaa kaikki muutokset pöytäkirjassa! Haluatko jatkaa?" text_meeting_minutes_for_meeting: 'kokouksen "%{meeting}" pöytäkirja' @@ -266,6 +347,10 @@ fi: label_meeting_created_by: "Luonut" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ fi: label_meeting_state_closed: "Suljettu" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/fil.seeders.yml b/modules/meeting/config/locales/crowdin/fil.seeders.yml index 2fb019d1e7b3..e123f3a6a508 100644 --- a/modules/meeting/config/locales/crowdin/fil.seeders.yml +++ b/modules/meeting/config/locales/crowdin/fil.seeders.yml @@ -7,7 +7,7 @@ fil: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/fil.yml b/modules/meeting/config/locales/crowdin/fil.yml index e5b283a4b0de..d6ec01d8a736 100644 --- a/modules/meeting/config/locales/crowdin/fil.yml +++ b/modules/meeting/config/locales/crowdin/fil.yml @@ -54,7 +54,9 @@ fil: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ fil: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ fil: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ fil: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ fil: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ fil: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ fil: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Ang abiso ay naipadala ng matagumpay" notice_timezone_missing: Walang nakatakdang time zone at ang %{zone} ay ipinagpalagay na siyang time zone. Para piliin ang iyong time zone, mangyaring magclick dito. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ fil: text_duration_in_hours: "Tagal sa oras" text_in_hours: "sa mga oras" text_meeting_agenda_for_meeting: 'adyenda para sa pulong "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes para sa pulong "%{meeting}"' @@ -266,6 +347,10 @@ fil: label_meeting_created_by: "Nilikha ni" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ fil: label_meeting_state_closed: "Isinara" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/fr.seeders.yml b/modules/meeting/config/locales/crowdin/fr.seeders.yml index fe82866481dd..60437be35210 100644 --- a/modules/meeting/config/locales/crowdin/fr.seeders.yml +++ b/modules/meeting/config/locales/crowdin/fr.seeders.yml @@ -7,7 +7,7 @@ fr: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Hebdomadaire meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/fr.yml b/modules/meeting/config/locales/crowdin/fr.yml index 415bab49f895..c90156ea51f7 100644 --- a/modules/meeting/config/locales/crowdin/fr.yml +++ b/modules/meeting/config/locales/crowdin/fr.yml @@ -54,7 +54,9 @@ fr: frequency: "Fréquence" interval: "Intervalle" start_date: "Commence le" - end_after: "Terminer la série après" + start_time: "Heure de début" + start_time_hour: "Heure de début" + end_after: "La série de réunions se termine" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ fr: label_recurring_meeting_plural: "Réunions récurrentes" label_template: "Modèle" label_recurring_meeting_view: "Voir la série de réunions" - label_recurring_meeting_create: "Créer à partir d'un modèle" + label_recurring_meeting_create: "Ouvrir" label_recurring_meeting_copy: "Copier en tant que réunion ponctuelle" label_recurring_meeting_cancel: "Annuler cette occurrence" label_recurring_meeting_delete: "Supprimer l'occurrence" - label_recurring_meeting_delete_confirmation: > - Cette réunion fait partie d'une série appelée %{name}. Cette opération ne supprimera que cette réunion particulière et non l'ensemble de la série. Voulez-vous continuer ? - label_recurring_occurrence_delete_confirmation: > - Toutes les informations relatives à la réunion qui ne figurent pas dans le modèle seront perdues. Voulez-vous continuer ? label_recurring_meeting_restore: "Restaurer cette occurrence" + label_recurring_meeting_schedule: "Programmer" + label_recurring_meeting_next_occurrence: "Occurrence suivante" label_recurring_meeting_more: "Il y a %{count} autres réunions prévues (%{schedule})." + label_recurring_meeting_no_end_date: "Il y a d'autres réunions planifiées (%{schedule})." label_recurring_meeting_more_singular: "Il y a %{count} autre réunion prévue (%{schedule})." label_recurring_meeting_more_past: "Il y a %{count} autres réunions passées." label_recurring_meeting_more_past_singular: "Il y a %{count} autre réunion passée." label_recurring_meeting_show_more: "Afficher plus" + label_recurring_meeting_series_create: "Créer une série de réunions" label_recurring_meeting_series_edit: "Modifier la série de réunions" label_recurring_meeting_series_delete: "Supprimer la série de réunions" + label_recurring_meeting_series_end: "Terminer la série de réunions" + label_recurring_meeting_series_end_now: "Terminer la série maintenant" + label_meeting_more: + one: "Il reste une réunion." + other: "Il reste %{count} réunions." label_my_meetings: "Mes réunions" label_all_meetings: "Toutes les réunions" label_upcoming_meetings: "Réunions à venir" @@ -173,12 +180,29 @@ fr: Envoyez immédiatement une invitation par e-mail aux participants sélectionnés ci-dessus. Vous pouvez également le faire manuellement à tout moment par la suite. send_invitation_emails_structured: "Envoyez immédiatement une invitation par e-mail à tous les participants. Vous pouvez également le faire manuellement à tout moment par la suite." open_meeting_link: "Ouvrir la réunion" + open_my_meetings_link: "Accéder à Mes réunions" + series: + title: "[%{project_name}] Série de réunions « %{title} »" + summary: "%{actor} a mis en place une nouvelle série de réunions « %{title} »" + series_rescheduled: + title: "[%{project_name}] La série de réunions « %{title} » a été reprogrammée" + summary: "%{actor} a modifié le calendrier de la série de réunions « %{title} »" + old_schedule: "Ancienne planification" + new_schedule: "Nouvelle planification" invited: - summary: "%{actor} vous a envoyé une invitation pour la réunion %{title}" + summary: "%{actor} vous a envoyé une invitation pour la réunion « %{title} »" + cancelled: + header: "Annulée : Réunion « %{title} »" + header_occurrence: "Annulée : occurrence de la réunion « %{title} »" + header_series: "Annulée : série de réunions « %{title} »" + summary_occurrence: "Une occurrence de « %{title} » a été annulée par %{actor}." + summary_series: "La série de réunions « %{title} » a été annulée par %{actor}." + summary: "« %{title} » a été annulée par %{actor}." + date_time: "Date/heure prévue" rescheduled: - header: "La réunion %{title} a été reprogrammée" - summary: "La réunion %{title} a été reprogrammée par %{actor}" - body: "La réunion %{title} a été reprogrammée par %{actor}." + header: "La réunion « %{title} » a été reprogrammée" + summary: "La réunion « %{title} » a été reprogrammée par %{actor}" + body: "La réunion « %{title} » a été reprogrammée par %{actor}." old_date_time: "Ancienne date/heure" new_date_time: "Nouvelle date/heure" label_mail_all_participants: "Envoyer un mail à tous les participants" @@ -192,12 +216,31 @@ fr: structured_text: "Organisez votre réunion sous la forme d'une liste dynamique de points à l'ordre du jour, en les reliant éventuellement à un lot de travaux." structured_text_copy: "Actuellement, la copie d'une réunion n'entraîne pas la copie des points de l'ordre du jour de la réunion, mais uniquement des détails." copied: "Copié depuis la réunion #%{id}" + delete_dialog: + one_time: + title: "Supprimer la réunion" + heading: "Supprimer cette réunion ?" + confirmation_message_html: > + Cette action est irréversible. Veuillez procéder avec prudence. + occurrence: + title: "Annuler l'occurrence de la réunion" + heading: "Annuler cette occurrence de réunion ?" + confirmation_message_html: > + Toutes les informations relatives à la réunion qui ne figurent pas dans le modèle seront perdues. Voulez-vous continuer ? + confirm_button: "Annuler l'occurrence" + blankslate: + title: "Aucune réunion à afficher" + desc: "Aucune réunion ne répond aux critères du filtre actif." meeting_section: untitled_title: "Section sans titre" delete_confirmation: "Supprimer la section supprimera également tous les éléments de l'ordre du jour qui s'y rapportent. Voulez-vous vraiment continuer ?" placeholder_title: "Nouvelle section" empty_text: "Faites glisser des éléments ici ou créez-en un nouveau" recurring_meeting: + ended_blankslate: + title: "La série de réunions est terminée" + message: "Cette série de réunions est terminée. Il n'y a pas de prochaines réunions. " + action: "Vous pouvez toujours consulter les événements passés ou modifier la série de réunions pour la prolonger." occurrence: infoline: "Cette réunion fait partie d'une série de réunions récurrentes." error_no_next: "Il n'y a pas de prochaine occurrence pour cette réunion." @@ -205,7 +248,7 @@ fr: first_created: > La première réunion a été créée avec succès à partir du modèle. Toutes les réunions futures seront créées automatiquement au moment de l'occurrence précédente. template: - button_finalize: "Terminer le modèle" + button_finalize: "Ouvrir la première réunion" blank_title: "Votre modèle de série de réunions est vide" description: > Ce modèle sera utilisé chaque fois que de nouvelles réunions seront créées dans la série. Vous pouvez ajouter des points à l'ordre du jour, des participants et des pièces jointes à ce modèle. @@ -221,8 +264,9 @@ fr: working_days: "Chaque jour ouvrable" weekly: "Hebdomadaire" end_after: - specific_date: "une date spécifique" - iterations: "un nombre d'occurrences" + never: "jamais" + specific_date: "après une date précise" + iterations: "après un certain nombre d'occurrences" starts: "Début" in_words: daily_interval: "Tous les %{interval} jours" @@ -231,6 +275,41 @@ fr: weekly_interval: "Toutes les %{interval} semaines le %{weekday}" frequency: "%{base} à %{time}" full: "%{base} à %{time}, se termine le %{end_date}" + full_past: "%{base} à %{time}, terminée le %{end_date}" + never_ending: "%{base} à %{time}" + open: + title: "Ouvrir" + subtitle: > + Les réunions ouvertes ont un ordre du jour qui peut être modifié et qui apparaît dans la section « Mes réunions » de chaque utilisateur. Les modifications apportées au modèle de série de réunions n'affectent pas les réunions déjà ouvertes. + blankslate: + title: "Aucune réunion ouverte pour le moment" + desc: "Vous pouvez ouvrir manuellement une réunion planifiée en cliquant sur le bouton « Ouvrir » ci-dessous" + planned: + title: "Planifiée" + subtitle: > + Les réunions suivantes sont planifiées dans le calendrier des réunions récurrentes, mais ne sont pas encore ouvertes. Chaque fois qu'une réunion planifiée commence, la suivante est automatiquement ouverte pour vous. Vous pouvez également ouvrir les réunions planifiées manuellement pour importer le modèle et commencer à modifier l'ordre du jour. + blankslate: + title: "Plus de réunions planifiées" + desc: > + Aucune réunion supplémentaire n'est prévue dans cette série. Pour planifier des réunions supplémentaires ou prolonger la série, accédez au modèle et modifiez les détails de la réunion pour changer la date de fin, la fréquence ou l'intervalle. + delete_dialog: + title: "Supprimer la série de réunions" + heading: "Supprimer définitivement cette série de réunions ?" + confirmation_message_html: + zero: > + La série de réunions %{title} n'a aucune occurrence de réunion. La série sera supprimée pour tout le monde. Veuillez procéder avec prudence. + one: > + La suppression de %{title} supprimera également une occurrence de cette série. Cette action est irréversible. Veuillez procéder avec prudence. + other: > + La suppression de %{title} supprimera les %{count} occurrences de cette série. Cette action est irréversible. Veuillez procéder avec prudence. + scheduled_delete_dialog: + title: "Annuler l'occurrence de la réunion" + heading: "Annuler cette occurrence de réunion ?" + confirmation_message_html: > + Toutes les informations relatives à la réunion qui ne figurent pas dans le modèle seront perdues. Voulez-vous continuer ? + confirm_button: "Annuler l'occurrence" + end_series_dialog: + title: "Terminer la série de réunions" notice_successful_notification: "Notification envoyée avec succès" notice_timezone_missing: Aucun fuseau horaire n'est défini et %{zone} est supposé. Pour choisir votre fuseau horaire, veuillez cliquer ici. notice_meeting_updated: "Cette page a été mise à jour par quelqu'un d'autre. Rechargez pour voir les changements." @@ -252,6 +331,8 @@ fr: text_duration_in_hours: "Durée en heures" text_in_hours: "en heures" text_meeting_agenda_for_meeting: 'ordre du jour de la réunion «%{meeting} »' + text_meeting_series_end_early_heading: "Supprimer les futures occurrences ?" + text_meeting_series_end_early: "La fin de la série supprimera les futures occurrences de réunions ouvertes ou planifiées" text_meeting_closing_are_you_sure: "Voulez-vous vraiment clôturer l'ordre du jour de la réunion ?" text_meeting_agenda_open_are_you_sure: "Ceci va écraser toutes les modifications dans les minutes ! Voulez-vous continuer ?" text_meeting_minutes_for_meeting: 'Minutes de la réunion "%{meeting}"' @@ -266,6 +347,10 @@ fr: label_meeting_created_by: "Créé par" label_meeting_last_updated: "Dernière mise à jour" label_meeting_reload: "Actualiser" + label_meeting_index_today: "Aujourd'hui" + label_meeting_index_tomorrow: "Demain" + label_meeting_index_this_week: "Plus tard dans la semaine" + label_meeting_index_later: "La semaine prochaine et plus tard" label_agenda_items: "Points de l'ordre du jour" label_agenda_items_reordered: "réorganisé" label_agenda_item_remove: "Supprimer de l'ordre du jour" @@ -291,7 +376,7 @@ fr: label_meeting_state_closed: "Fermé" label_meeting_state_closed_html: "Fermé" label_meeting_state_agenda_created: "Ordre du jour créé" - label_meeting_state_scheduled: "Planifiée" + label_meeting_state_planned: "Planifiée" label_meeting_state_cancelled: "Annulée" label_meeting_state_skipped: "Ignorée" label_meeting_reopen_action: "Réouvrir la réunion" diff --git a/modules/meeting/config/locales/crowdin/he.seeders.yml b/modules/meeting/config/locales/crowdin/he.seeders.yml index 861515aa12a9..aedaeba6b1ad 100644 --- a/modules/meeting/config/locales/crowdin/he.seeders.yml +++ b/modules/meeting/config/locales/crowdin/he.seeders.yml @@ -7,7 +7,7 @@ he: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/he.yml b/modules/meeting/config/locales/crowdin/he.yml index 3e1e5e9541a4..304be09bc82d 100644 --- a/modules/meeting/config/locales/crowdin/he.yml +++ b/modules/meeting/config/locales/crowdin/he.yml @@ -56,7 +56,9 @@ he: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -118,22 +120,29 @@ he: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + two: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -175,12 +184,29 @@ he: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -194,12 +220,31 @@ he: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -207,7 +252,7 @@ he: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -223,8 +268,9 @@ he: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -233,6 +279,41 @@ he: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "הודעה נשלחה בהצלחה" notice_timezone_missing: אין איזור זמן מוגדר, ההערכה היא %{zone}. כדי לבחור את איזור הזמן שלך, אנא לחץ כאן. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -254,6 +335,8 @@ he: text_duration_in_hours: "משך הזמן בשעות" text_in_hours: "בשעות" text_meeting_agenda_for_meeting: 'סדר היום לפגישה "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'דקות לפגישה "%{meeting}"' @@ -268,6 +351,10 @@ he: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -293,7 +380,7 @@ he: label_meeting_state_closed: "סגור" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/hi.seeders.yml b/modules/meeting/config/locales/crowdin/hi.seeders.yml index 147b674a9141..a2e5457f5205 100644 --- a/modules/meeting/config/locales/crowdin/hi.seeders.yml +++ b/modules/meeting/config/locales/crowdin/hi.seeders.yml @@ -7,7 +7,7 @@ hi: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/hi.yml b/modules/meeting/config/locales/crowdin/hi.yml index bf260932a8bf..0c54cfdec7f9 100644 --- a/modules/meeting/config/locales/crowdin/hi.yml +++ b/modules/meeting/config/locales/crowdin/hi.yml @@ -54,7 +54,9 @@ hi: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ hi: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ hi: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ hi: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ hi: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ hi: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ hi: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ hi: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ hi: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ hi: label_meeting_state_closed: "बंद" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/hr.seeders.yml b/modules/meeting/config/locales/crowdin/hr.seeders.yml index e7b4fd7bda34..096d9965119f 100644 --- a/modules/meeting/config/locales/crowdin/hr.seeders.yml +++ b/modules/meeting/config/locales/crowdin/hr.seeders.yml @@ -7,7 +7,7 @@ hr: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/hr.yml b/modules/meeting/config/locales/crowdin/hr.yml index 2c8d8a3e6d07..ce2499ce841f 100644 --- a/modules/meeting/config/locales/crowdin/hr.yml +++ b/modules/meeting/config/locales/crowdin/hr.yml @@ -55,7 +55,9 @@ hr: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -117,22 +119,28 @@ hr: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + few: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -174,12 +182,29 @@ hr: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -193,12 +218,31 @@ hr: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -206,7 +250,7 @@ hr: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -222,8 +266,9 @@ hr: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -232,6 +277,41 @@ hr: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notifikacija uspješno poslana" notice_timezone_missing: Vremenska zona nije postavljena na osnovu zamišljene %{zone} zone. Da bi ste odabrali vremensku zonu molim vas kliknite ovdje. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -253,6 +333,8 @@ hr: text_duration_in_hours: "Duration in hours" text_in_hours: "u satima" text_meeting_agenda_for_meeting: 'dnevni red za sastank "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minute za sastanak "%{meeting}"' @@ -267,6 +349,10 @@ hr: label_meeting_created_by: "Kreirao korisnik" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -292,7 +378,7 @@ hr: label_meeting_state_closed: "Zaključeno" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/hu.seeders.yml b/modules/meeting/config/locales/crowdin/hu.seeders.yml index 266bde26cec5..2aace3935944 100644 --- a/modules/meeting/config/locales/crowdin/hu.seeders.yml +++ b/modules/meeting/config/locales/crowdin/hu.seeders.yml @@ -7,7 +7,7 @@ hu: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/hu.yml b/modules/meeting/config/locales/crowdin/hu.yml index 3571238b10e7..2c047bbd6728 100644 --- a/modules/meeting/config/locales/crowdin/hu.yml +++ b/modules/meeting/config/locales/crowdin/hu.yml @@ -54,7 +54,9 @@ hu: frequency: "Gyakoriság" interval: "Időköz" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Előfordulások" errors: messages: @@ -116,22 +118,27 @@ hu: label_recurring_meeting_plural: "Recurring meetings" label_template: "Sablon" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Közelgő megbeszélések" @@ -173,12 +180,29 @@ hu: Azonnal küldjön e-mail meghívót a fent kiválasztott résztvevőknek. Ezt később bármikor manuálisan is megteheti. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Nyitott megbeszélés" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} meghívott a következő megbeszélésre: %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "%{title} elnevezésű megbeszélés átütemezésre került a következő által: %{actor}" - body: "%{title} elnevezésű megbeszélés átütemezésre került a következő által: %{actor}" + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Régi időpont" new_date_time: "Új időpont" label_mail_all_participants: "Email küldése minden résztvevőnek" @@ -192,12 +216,31 @@ hu: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "A megbeszélés másolásával jelnleg nem fogja átmásolni a hozzákapcsolt napirendi pontokat, csak a megbeszélés részleteit." copied: "#%{id} megbeszélésből másolva" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Húzza ide az elemeket, vagy hozzon létre egy újat" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ hu: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ hu: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ hu: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Értesítés sikeresen kiküldve" notice_timezone_missing: Nincs időzóna beállítva, %{zone} a feltételezett. Időzóna beállításához kattintson ide. notice_meeting_updated: "Ezt az oldalt valaki más frissítette. A változások megtekintéséhez töltse újra." @@ -252,6 +331,8 @@ hu: text_duration_in_hours: "Hossza (óra)" text_in_hours: "órában" text_meeting_agenda_for_meeting: 'a "%{meeting}" megbeszélés napirendje' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Biztosan le szeretnéd zárni a megbeszélés napirendjét?" text_meeting_agenda_open_are_you_sure: "Ez minden változást felül fog írni. Biztosan folytani akarja?" text_meeting_minutes_for_meeting: 'a "%{meeting}" megbeszélés jegyzőkönyve' @@ -266,6 +347,10 @@ hu: label_meeting_created_by: "Létrehozta" label_meeting_last_updated: "Utoljára frissítve" label_meeting_reload: "Újratöltés" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Napirendi pontok" label_agenda_items_reordered: "Átrakva" label_agenda_item_remove: "Levétel a napirendről" @@ -291,7 +376,7 @@ hu: label_meeting_state_closed: "Lezárva" label_meeting_state_closed_html: "Lezárva" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "A megbeszélés újranyitása" diff --git a/modules/meeting/config/locales/crowdin/id.seeders.yml b/modules/meeting/config/locales/crowdin/id.seeders.yml index f480d70069cc..c27ed7f53535 100644 --- a/modules/meeting/config/locales/crowdin/id.seeders.yml +++ b/modules/meeting/config/locales/crowdin/id.seeders.yml @@ -7,7 +7,7 @@ id: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/id.yml b/modules/meeting/config/locales/crowdin/id.yml index ac99e9ec7323..59cb0c4d3e93 100644 --- a/modules/meeting/config/locales/crowdin/id.yml +++ b/modules/meeting/config/locales/crowdin/id.yml @@ -53,7 +53,9 @@ id: frequency: "Kekerapan" interval: "Sela Waktu" start_date: "Mulai pada" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Kejadian" errors: messages: @@ -115,22 +117,26 @@ id: label_recurring_meeting_plural: "Recurring meetings" label_template: "Templat" label_recurring_meeting_view: "Lihat jajaran rapat" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Tampilkan lebih" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Rapat mendatang" @@ -172,12 +178,29 @@ id: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Rapat terbuka" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} telah mengirimi Anda undangan untuk rapat %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Rapat %{title} telah dijadwalkan ulang oleh %{actor}" - body: "Rapat tersebut %{title} telah dijadwalkan ulang oleh %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Tanggal/waktu lama" new_date_time: "Tanggal/waktu baru" label_mail_all_participants: "Kirim email ke semua peserta" @@ -191,12 +214,31 @@ id: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Disalin dari Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -204,7 +246,7 @@ id: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -220,8 +262,9 @@ id: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -230,6 +273,41 @@ id: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Berhasil mengirim notifikasi" notice_timezone_missing: Tidak ada zona waktu yang ditetapkan sehingga diasumsikan %{zone}. Untuk memilih zona waktu, silakan mengeklik di sini. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -251,6 +329,8 @@ id: text_duration_in_hours: "Durasi dalam jam" text_in_hours: "dalam jam" text_meeting_agenda_for_meeting: 'agenda untuk rapat "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "Ini akan mengganti semua perubahan dalam beberapa menit! Apakah anda ingin lanjut?" text_meeting_minutes_for_meeting: 'laporan untuk rapat "%{meeting}"' @@ -265,6 +345,10 @@ id: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "disusun ulang" label_agenda_item_remove: "Remove from agenda" @@ -290,7 +374,7 @@ id: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/it.seeders.yml b/modules/meeting/config/locales/crowdin/it.seeders.yml index b31ebbaed45e..c56cf3e2e5b4 100644 --- a/modules/meeting/config/locales/crowdin/it.seeders.yml +++ b/modules/meeting/config/locales/crowdin/it.seeders.yml @@ -7,9 +7,9 @@ it: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Settimanale + title: Ogni settimana meeting_agenda_items: item_0: title: Buone notizie diff --git a/modules/meeting/config/locales/crowdin/it.yml b/modules/meeting/config/locales/crowdin/it.yml index 6e05f1613f29..523972eb89e7 100644 --- a/modules/meeting/config/locales/crowdin/it.yml +++ b/modules/meeting/config/locales/crowdin/it.yml @@ -54,7 +54,9 @@ it: frequency: "Frequenza" interval: "Intervallo" start_date: "Inizio il" - end_after: "Fine serie dopo" + start_time: "Ora di inizio" + start_time_hour: "Ora di inizio" + end_after: "Termine della serie di riunioni" iterations: "Ricorrenze" errors: messages: @@ -116,22 +118,27 @@ it: label_recurring_meeting_plural: "Riunioni ricorrenti" label_template: "Modello" label_recurring_meeting_view: "Visualizza la serie di riunioni" - label_recurring_meeting_create: "Crea da modello" + label_recurring_meeting_create: "Apri" label_recurring_meeting_copy: "Copia come una tantum" label_recurring_meeting_cancel: "Annulla questa ricorrenza" label_recurring_meeting_delete: "Elimina ricorrenza" - label_recurring_meeting_delete_confirmation: > - Questa riunione fa parte di una serie chiamata %{name}. L'operazione eliminerà solo questa particolare ricorrenza e non l'intera serie. Vuoi continuare? - label_recurring_occurrence_delete_confirmation: > - Qualsiasi informazione sulla riunione non contenuta nel modello andrà persa. Vuole continuare? label_recurring_meeting_restore: "Ripristina questa ricorrenza" + label_recurring_meeting_schedule: "Programma" + label_recurring_meeting_next_occurrence: "Occorrenza successiva" label_recurring_meeting_more: "Ci sono altre %{count} riunioni programmate (%{schedule})." + label_recurring_meeting_no_end_date: "Ci sono altre riunioni programmate (%{schedule})." label_recurring_meeting_more_singular: "C'è %{count} altra riunione programmata (%{schedule})." label_recurring_meeting_more_past: "Ci sono altre %{count} riunioni passate." label_recurring_meeting_more_past_singular: "C'è %{count} altra riunione passata." label_recurring_meeting_show_more: "Mostra di più" + label_recurring_meeting_series_create: "Crea serie di riunioni" label_recurring_meeting_series_edit: "Modifica serie di riunioni" label_recurring_meeting_series_delete: "Elimina serie di riunioni" + label_recurring_meeting_series_end: "Termina serie di riunioni" + label_recurring_meeting_series_end_now: "Temina la serie ora" + label_meeting_more: + one: "C'è un'altra riunione." + other: "Ci sono altre %{count} riunioni." label_my_meetings: "Le mie riunioni" label_all_meetings: "Tutte le riunioni" label_upcoming_meetings: "Prossime riunioni" @@ -173,12 +180,29 @@ it: Invia immediatamente un invito via e-mail ai partecipanti selezionati in precedenza. Puoi anche farlo manualmente in qualsiasi momento. send_invitation_emails_structured: "Invia immediatamente un invito via e-mail a tutti i partecipanti. Puoi anche farlo manualmente in qualsiasi momento." open_meeting_link: "Apri riunione" + open_my_meetings_link: "Vai alle mie riunioni" + series: + title: "[%{project_name}] Serie di riunioni \"%{title}\"" + summary: "%{actor} ha organizzato una nuova serie di riunioni \"%{title}\"" + series_rescheduled: + title: "[%{project_name}] Serie di riunioni \"%{title}\" riprogrammati" + summary: "%{actor} ha modificato l'ordine del giorno della serie di riunioni \"%{title}\"" + old_schedule: "Ordine del giorno precedente" + new_schedule: "Ordine del giorno nuovo" invited: - summary: "%{actor} ti ha inviato un invito per la riunione %{title}" + summary: "%{actor} ti ha inviato un invito per la riunione \"%{title}\"" + cancelled: + header: "Cancellata: riunione \"%{title}\"" + header_occurrence: "Cancellata: occorrenza della riunione \"%{title}\"" + header_series: "Cancellata: serie di riunioni \"%{title}\"" + summary_occurrence: "Un'occorrenza di \"%{title}\" è stata cancellata da %{actor}." + summary_series: "La serie di riunioni \"%{title}\" è stata cancellata da %{actor}." + summary: "\"%{title}\" è stata cancellata da %{actor}." + date_time: "Data/ora programmata" rescheduled: - header: "La riunione %{title} è stata riprogrammata" - summary: "La riunione %{title} è stata riprogrammata da %{actor}" - body: "La riunione %{title} è stata riprogrammata da %{actor}." + header: "La riunione \"%{title}\" è stata riprogrammata" + summary: "La riunione \"%{title}\" è stata riprogrammata da %{actor}" + body: "La riunione \"%{title}\" è stata riprogrammata da %{actor}." old_date_time: "Data/ora precedente" new_date_time: "Nuova data/ora" label_mail_all_participants: "Invia e-mail a tutti i partecipanti" @@ -192,12 +216,31 @@ it: structured_text: "Organizza la tua riunione come un elenco dinamico di punti all'ordine del giorno, collegandoli facoltativamente a una macro-attività." structured_text_copy: "La copia di una riunione al momento non copierà gli elementi dell'ordine del giorno della riunione, ma solo i dettagli" copied: "Copiato dalla riunione #%{id}" + delete_dialog: + one_time: + title: "Cancella la riunione" + heading: "Cancellare questa riunione?" + confirmation_message_html: > + Questa azione è irreversibile. Procedi con cautela. + occurrence: + title: "Cancella l'occorrenza della riunione" + heading: "Cancellare questa occorrenza della riunione?" + confirmation_message_html: > + Qualsiasi informazione sulla riunione non contenuta nel modello andrà persa. Vuole continuare? + confirm_button: "Cancella l'occorrenza" + blankslate: + title: "Nessuna riunione da visualizzare" + desc: "Non ci sono riunioni che soddisfano i criteri del filtro attivo." meeting_section: untitled_title: "Sezione senza titolo" delete_confirmation: "L'eliminazione della sezione eliminerà anche tutti i suoi elementi dell'ordine del giorno. Continuare?" placeholder_title: "Nuova sezione" empty_text: "Trascina gli elementi qui o creane una nuova" recurring_meeting: + ended_blankslate: + title: "Serie di riunioni terminata" + message: "Questa serie di riunioni è giunta al termine. Non ci sono altre riunioni. " + action: "Può ancora visualizzare le occorrenze passate o modificare la serie di riunioni per estenderla." occurrence: infoline: "Questa riunione fa parte di una serie di riunioni ricorrenti." error_no_next: "Non ci sono ricorrenze successive per questa riunione." @@ -205,7 +248,7 @@ it: first_created: > La prima riunione è stata creata con successo dal modello. Tutte le riunioni future saranno create automaticamente al momento della ricorrenza precedente. template: - button_finalize: "Termina modello" + button_finalize: "Apri la prima riunione" blank_title: "Il modello della tua serie di riunioni è vuoto" description: > Questo modello verrà utilizzato ogni volta che verranno create nuove riunioni della serie. A questo modello può aggiungere punti dell'ordine del giorno, partecipanti e allegati. @@ -221,8 +264,9 @@ it: working_days: "Ogni giorno lavorativo" weekly: "Ogni settimana" end_after: - specific_date: "una data specifica" - iterations: "un numero di occorrenze" + never: "mai" + specific_date: "dopo una data specifica" + iterations: "dopo un certo numero di occorrenze" starts: "Inizio" in_words: daily_interval: "Ogni %{interval} giorni" @@ -231,6 +275,41 @@ it: weekly_interval: "Ogni %{interval} settimane di %{weekday}" frequency: "%{base} alle ore %{time}" full: "%{base} alle ore %{time}, fine alle ore %{end_date}" + full_past: "%{base} alle ore %{time}, finita alle ore %{end_date}" + never_ending: "%{base} alle ore %{time}" + open: + title: "Aperte" + subtitle: > + Le riunioni aperte hanno ordini del giorno che possono essere modificati e vengono visualizzate nella sezione "Le mie riunioni" dei singoli utenti. Le modifiche al modello della serie di riunioni non influiscono sulle occorrenze delle riunioni già aperte. + blankslate: + title: "Non ci sono riunioni aperte al momento" + desc: "Può aprire manualmente una riunione pianificata cliccando sul pulsante \"Apri\" qui di seguito" + planned: + title: "Pianificate" + subtitle: > + Le seguenti riunioni sono pianificate nel calendario delle riunioni ricorrenti, ma non sono ancora aperte. Ogni volta che inizia una riunione pianificata, la successiva verrà automaticamente aperta per te. Puoi anche aprire manualmente le riunioni pianificate per importare il modello e iniziare a modificare l'ordine del giorno. + blankslate: + title: "Non ci sono più riunioni programmate" + desc: > + Non sono previsti altre riunioni in questa serie. Per pianificare altre riunioni o estendere la serie, vai al modello e modifica i dettagli del meeting per cambiare la data di fine, la frequenza o l'intervallo. + delete_dialog: + title: "Elimina serie di riunioni" + heading: "Cancellare definitivamente questa serie di riunioni?" + confirmation_message_html: + zero: > + La serie di riunioni %{title} non ha alcuna occorrenza di riunione. La serie sarà cancellata per tutti. Procedi con cautela. + one: > + Eliminando %{title} eliminerai anche un'occorrenza di questa serie. Questa azione non è reversibile. Procedi con cautela. + other: > + Eliminando %{title} cancellerai tutte le %{count} occorrenze in questa serie. Questa azione non è reversibile. Procedi con cautela. + scheduled_delete_dialog: + title: "Cancella l'occorrenza della riunione" + heading: "Cancellare questa occorrenza della riunione?" + confirmation_message_html: > + Qualsiasi informazione sulla riunione non contenuta nel modello andrà persa. Vuole continuare? + confirm_button: "Cancella l'occorrenza" + end_series_dialog: + title: "Termina serie di riunioni" notice_successful_notification: "Notifica inviata con successo" notice_timezone_missing: Nessun fuso orario è impostato e la %{zone} è un requisito necessario. Per scegliere il tuo fuso orario, fare clic qui. notice_meeting_updated: "Questa pagina è stata aggiornata da qualcun altro. Ricarica per visualizzare le modifiche." @@ -252,6 +331,8 @@ it: text_duration_in_hours: "Durata in ore" text_in_hours: "in ore" text_meeting_agenda_for_meeting: 'ordine del giorno della riunione "%{meeting}"' + text_meeting_series_end_early_heading: "Cancellare le occorrenze future?" + text_meeting_series_end_early: "La chiusura della serie cancellerà tutte le future occorrenze di riunioni aperte o programmate" text_meeting_closing_are_you_sure: "Vuoi davvero chiudere l'agenda di questa riunione?" text_meeting_agenda_open_are_you_sure: "Questo sovrascriverà tutte le modifiche nei verbali! Vuoi continuare?" text_meeting_minutes_for_meeting: 'verbali per l''incontro "%{meeting}"' @@ -266,6 +347,10 @@ it: label_meeting_created_by: "Creato da" label_meeting_last_updated: "Ultimo aggiornamento" label_meeting_reload: "Ricarica" + label_meeting_index_today: "Oggi" + label_meeting_index_tomorrow: "Domani" + label_meeting_index_this_week: "Più tardi questa settimana" + label_meeting_index_later: "La prossima settimana e più tardi" label_agenda_items: "Punti all'ordine del giorno" label_agenda_items_reordered: "riordinato" label_agenda_item_remove: "Rimuovi dall'ordine del giorno" @@ -291,7 +376,7 @@ it: label_meeting_state_closed: "Chiuso" label_meeting_state_closed_html: "Chiusa" label_meeting_state_agenda_created: "Ordine del giorno creato" - label_meeting_state_scheduled: "Programmato" + label_meeting_state_planned: "Pianificata" label_meeting_state_cancelled: "Annullato" label_meeting_state_skipped: "Saltato" label_meeting_reopen_action: "Riapri la riunione" diff --git a/modules/meeting/config/locales/crowdin/ja.seeders.yml b/modules/meeting/config/locales/crowdin/ja.seeders.yml index 69011110013f..83d3cdc21eeb 100644 --- a/modules/meeting/config/locales/crowdin/ja.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ja.seeders.yml @@ -7,9 +7,9 @@ ja: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: 毎週 + title: Weekly meeting_agenda_items: item_0: title: 朗報 diff --git a/modules/meeting/config/locales/crowdin/ja.yml b/modules/meeting/config/locales/crowdin/ja.yml index 751c160bb2d5..94b4ca2d4f06 100644 --- a/modules/meeting/config/locales/crowdin/ja.yml +++ b/modules/meeting/config/locales/crowdin/ja.yml @@ -53,7 +53,9 @@ ja: frequency: "頻度" interval: "インターバル" start_date: "開始:" - end_after: "シリーズ終了" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -115,22 +117,26 @@ ja: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "今後の会議" @@ -172,12 +178,29 @@ ja: 上記で選択した参加者にすぐにメール招待を送信します。また、後で手動で行うこともできます。 send_invitation_emails_structured: "すべての参加者にすぐにメール招待を送信します。また、後で手動で行うこともできます。" open_meeting_link: "会議を開く" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} が会議「%{title}」の招待状を送信しました。" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "会議「%{title}」は再スケジュールされました。" - summary: "会議「%{title}」は、%{actor} によって再スケジュールされました。" - body: "会議「%{title}」は、%{actor} によって再スケジュールされました。" + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "古い日付/時刻" new_date_time: "新しい日付/時刻" label_mail_all_participants: "すべての参加者にメールを送信" @@ -191,12 +214,31 @@ ja: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "会議をコピーする場合、現在は関連する議題項目はコピーされず、詳細のみがコピーされます。" copied: "ミーティング#%{id} からコピーしました" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "タイトルなしセクション" delete_confirmation: "セクションを削除すると、そのすべての議題項目も削除されます。これを実行してもよろしいですか？" placeholder_title: "新しいセクション" empty_text: "アイテムをここにドラッグするか、新しいアイテムを作成してください" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -204,7 +246,7 @@ ja: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -220,8 +262,9 @@ ja: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "特定の日付" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -230,6 +273,41 @@ ja: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "通知が正常に送信されました" notice_timezone_missing: タイムゾーンが設定されていない場合、%{zone} が使用されます。タイムゾーンを選択するには、ここをクリックしてください。 notice_meeting_updated: "このページは他の誰かによって更新されました。変更を表示するには再読み込みしてください。" @@ -251,6 +329,8 @@ ja: text_duration_in_hours: "期間（時間）" text_in_hours: "数時間以内" text_meeting_agenda_for_meeting: '会議の議題 "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "会議アジェンダを終了してもよろしいですか？" text_meeting_agenda_open_are_you_sure: "数分内のすべての変更が上書きされます！続けますか？" text_meeting_minutes_for_meeting: '会議の議事録 "%{meeting}"' @@ -265,6 +345,10 @@ ja: label_meeting_created_by: "作成者：" label_meeting_last_updated: "最終更新日" label_meeting_reload: "再読み込み" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "議題項目" label_agenda_items_reordered: "並べ替えられました" label_agenda_item_remove: "議題から削除" @@ -290,7 +374,7 @@ ja: label_meeting_state_closed: "終了" label_meeting_state_closed_html: "終了" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "会議を再開する" diff --git a/modules/meeting/config/locales/crowdin/ka.seeders.yml b/modules/meeting/config/locales/crowdin/ka.seeders.yml index c617bccc000b..8d38a3f8fca7 100644 --- a/modules/meeting/config/locales/crowdin/ka.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ka.seeders.yml @@ -7,9 +7,9 @@ ka: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: ყოველკვირეული + title: Weekly meeting_agenda_items: item_0: title: კარგი სიახლეები diff --git a/modules/meeting/config/locales/crowdin/ka.yml b/modules/meeting/config/locales/crowdin/ka.yml index d74a857c10ce..518997203814 100644 --- a/modules/meeting/config/locales/crowdin/ka.yml +++ b/modules/meeting/config/locales/crowdin/ka.yml @@ -54,7 +54,9 @@ ka: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ ka: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ ka: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "შეხვედრის გახსნა" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "ძველი თარიღი/დრო" new_date_time: "ახალი თარიღი/დრო" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ ka: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ ka: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ ka: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ ka: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ ka: text_duration_in_hours: "Duration in hours" text_in_hours: "საათებში" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ ka: label_meeting_created_by: "შექმნილია" label_meeting_last_updated: "უკანასკნელი განახლება" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ ka: label_meeting_state_closed: "დახურულია" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "შეხვედრის თავიდან გახსნა" diff --git a/modules/meeting/config/locales/crowdin/kk.seeders.yml b/modules/meeting/config/locales/crowdin/kk.seeders.yml index 43013d8626da..3370d62faea0 100644 --- a/modules/meeting/config/locales/crowdin/kk.seeders.yml +++ b/modules/meeting/config/locales/crowdin/kk.seeders.yml @@ -7,7 +7,7 @@ kk: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/kk.yml b/modules/meeting/config/locales/crowdin/kk.yml index cedb1ece5a99..1cb440a7def2 100644 --- a/modules/meeting/config/locales/crowdin/kk.yml +++ b/modules/meeting/config/locales/crowdin/kk.yml @@ -54,7 +54,9 @@ kk: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ kk: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ kk: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ kk: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ kk: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ kk: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ kk: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ kk: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ kk: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ kk: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/ko.seeders.yml b/modules/meeting/config/locales/crowdin/ko.seeders.yml index a94cc2ecba27..0102046787ef 100644 --- a/modules/meeting/config/locales/crowdin/ko.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ko.seeders.yml @@ -7,7 +7,7 @@ ko: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: 매주 meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/ko.yml b/modules/meeting/config/locales/crowdin/ko.yml index dea720c5fd0b..1898abcafa20 100644 --- a/modules/meeting/config/locales/crowdin/ko.yml +++ b/modules/meeting/config/locales/crowdin/ko.yml @@ -53,7 +53,9 @@ ko: frequency: "빈도" interval: "간격" start_date: "시작:" - end_after: "다음 이후 시리즈 종료:" + start_time: "시작 시간" + start_time_hour: "시작 시간" + end_after: "미팅 시리즈 종료" iterations: "항목" errors: messages: @@ -115,22 +117,26 @@ ko: label_recurring_meeting_plural: "반복 미팅" label_template: "템플릿" label_recurring_meeting_view: "미팅 시리즈 보기" - label_recurring_meeting_create: "템플릿에서 만들기" + label_recurring_meeting_create: "열기" label_recurring_meeting_copy: "일회성 복사" label_recurring_meeting_cancel: "이 항목 취소" label_recurring_meeting_delete: "항목 삭제" - label_recurring_meeting_delete_confirmation: > - 이 미팅은 %{name}(이)라는 시리즈의 일부입니다. 이렇게 하면 전체 시리즈가 아닌 이 특정 항목만 삭제됩니다. 계속하시겠습니까? - label_recurring_occurrence_delete_confirmation: > - 템플릿에 없는 미팅 정보는 모두 손실됩니다. 계속하시겠습니까? label_recurring_meeting_restore: "이 항목 복원" + label_recurring_meeting_schedule: "스케줄" + label_recurring_meeting_next_occurrence: "다음 항목" label_recurring_meeting_more: "예정된 미팅(%{schedule})이 %{count}개 더 있습니다." + label_recurring_meeting_no_end_date: "예정된 미팅(%{schedule})이 더 있습니다." label_recurring_meeting_more_singular: "예정된 미팅(%{schedule})이 %{count}개 더 있습니다." label_recurring_meeting_more_past: "지난 미팅이 %{count}개 더 있습니다." label_recurring_meeting_more_past_singular: "지난 미팅이 %{count}개 더 있습니다." label_recurring_meeting_show_more: "자세히 표시" + label_recurring_meeting_series_create: "미팅 시리즈 만들기" label_recurring_meeting_series_edit: "미팅 시리즈 편집" label_recurring_meeting_series_delete: "미팅 시리즈 삭제" + label_recurring_meeting_series_end: "미팅 시리즈 종료" + label_recurring_meeting_series_end_now: "지금 시리즈 종료" + label_meeting_more: + other: "미팅이 %{count}개 더 있습니다." label_my_meetings: "내 미팅" label_all_meetings: "모든 미팅" label_upcoming_meetings: "다가오는 이벤트" @@ -172,12 +178,29 @@ ko: 위에서 선택한 참가자에게 즉시 이메일 초대를 보내세요. 나중에 언제든지 수동으로 할 수도 있습니다. send_invitation_emails_structured: "모든 참가자에게 즉시 이메일 초대를 보내세요. 나중에 언제든지 수동으로 할 수도 있습니다." open_meeting_link: "미팅 열기" + open_my_meetings_link: "내 미팅으로 이동" + series: + title: "[%{project_name}] 미팅 시리즈 '%{title}'" + summary: "%{actor} 님이 새로운 미팅 시리즈 '%{title}'을(를) 설정했습니다" + series_rescheduled: + title: "[%{project_name}] 미팅 시리즈 '%{title}' 다시 예약됨" + summary: "%{actor} 님이 미팅 시리즈 '%{title}'의 스케줄을 변경했습니다" + old_schedule: "이전 스케줄" + new_schedule: "새로운 스케줄" invited: - summary: "%{actor} 님이 %{title} 미팅 초대장을 귀하에게 보냈습니다" + summary: "%{actor} 님이 '%{title}' 미팅 초대장을 귀하에게 보냈습니다" + cancelled: + header: "취소됨: 미팅 '%{title}'" + header_occurrence: "취소됨: 미팅 항목 '%{title}'" + header_series: "취소됨: 미팅 시리즈 '%{title}'" + summary_occurrence: "'%{title}' 항목을 %{actor} 님이 취소했습니다." + summary_series: "'%{title}' 미팅 시리즈를 %{actor} 님이 취소했습니다." + summary: "'%{title}'을(를) %{actor} 님이 취소했습니다." + date_time: "스케줄링된 날짜/시간" rescheduled: - header: "%{title} 미팅이 다시 예약되었습니다" - summary: "%{actor} 님이 %{title} 미팅을 다시 예약했습니다" - body: "%{actor} 님이 %{title} 미팅을 다시 예약했습니다." + header: "'%{title}' 미팅이 다시 예약되었습니다" + summary: "%{actor} 님이 '%{title}' 미팅을 다시 예약했습니다" + body: "%{actor} 님이 '%{title}' 미팅을 다시 예약했습니다." old_date_time: "이전 날짜/시간" new_date_time: "새로운 날짜/시간" label_mail_all_participants: "모든 참가자에게 이메일 보내기" @@ -191,12 +214,31 @@ ko: structured_text: "미팅을 의제 항목의 다이내믹 목록으로 구성하고, 선택적으로 작업 패키지에 연결합니다." structured_text_copy: "미팅을 복사하면 관련 미팅 의제 항목은 현재 복사되지 않고 세부 정보만 복사됩니다" copied: "미팅 #%{id}에서 복사됨" + delete_dialog: + one_time: + title: "미팅 삭제" + heading: "이 미팅을 삭제하시겠습니까?" + confirmation_message_html: > + 이 작업은 되돌릴 수 없습니다. 주의하여 진행하세요. + occurrence: + title: "미팅 항목 취소" + heading: "이 미팅 항목을 취소하시겠습니까?" + confirmation_message_html: > + 템플릿에 없는 미팅 정보는 모두 손실됩니다. 계속하시겠습니까? + confirm_button: "항목 취소" + blankslate: + title: "표시할 미팅 없음" + desc: "활성 필터 기준을 충족하는 미팅이 없습니다." meeting_section: untitled_title: "제목 없는 섹션" delete_confirmation: "이 섹션을 삭제하면 모든 의제 항목도 삭제됩니다. 계속하시겠습니까?" placeholder_title: "새 섹션" empty_text: "항목을 여기에 끌어오거나 새로 만들기" recurring_meeting: + ended_blankslate: + title: "미팅 시리즈 종료됨" + message: "이 미팅 시리즈는 종료되었습니다. 향후 미팅이 없습니다. " + action: "이전 항목을 보거나, 미팅 시리즈를 편집하여 연장할 수는 있습니다." occurrence: infoline: "이 미팅은 반복 미팅 시리즈의 일부입니다." error_no_next: "이 미팅의 다음 항목이 없습니다." @@ -204,7 +246,7 @@ ko: first_created: > 첫 번째 미팅이 템플릿에서 성공적으로 생성되었습니다. 향후 모든 미팅은 이전 항목이 발생한 시점에 자동으로 생성됩니다. template: - button_finalize: "템플릿 완료" + button_finalize: "첫 번째 미팅 열기" blank_title: "미팅 시리즈 템플릿이 비어 있습니다." description: > 이 템플릿은 시리즈의 새로운 미팅이 생성될 때마다 사용됩니다. 이 템플릿에 안건 항목, 참가자 및 첨부 파일을 추가할 수 있습니다. @@ -220,8 +262,9 @@ ko: working_days: "근무일마다" weekly: "매주" end_after: - specific_date: "특정 날짜" - iterations: "항목 수" + never: "안 함" + specific_date: "특정 날짜 이후" + iterations: "여러 항목 이후" starts: "시작" in_words: daily_interval: "%{interval}일마다" @@ -230,6 +273,41 @@ ko: weekly_interval: "%{interval}주마다 %{weekday}" frequency: "%{base}, %{time}" full: "%{base}, %{time}, %{end_date}에 종료" + full_past: "%{base}, %{time}, %{end_date}에 종료" + never_ending: "%{base}, %{time}" + open: + title: "열기" + subtitle: > + 오픈 미팅에는 편집할 수 있는 의제가 있으며 개별 사용자의 '내 미팅' 섹션에 표시됩니다. 미팅 시리즈 템플릿의 변경 사항은 이미 오픈된 미팅 항목에 영향을 미치지 않습니다. + blankslate: + title: "현재는 오픈 미팅 없음" + desc: "아래의 '열기' 버튼을 클릭하여 계획된 미팅을 수동으로 열 수 있습니다" + planned: + title: "계획됨" + subtitle: > + 다음 미팅은 반복 미팅 스케줄에서 계획되어 있지만 아직 열리지 않은 미팅입니다. 계획된 미팅이 시작될 때마다 다음 미팅이 자동으로 열립니다. 계획된 미팅을 수동으로 열어 템플릿을 가져오고 의제 편집을 시작할 수도 있습니다. + blankslate: + title: "더 이상 계획된 미팅 없음" + desc: > + 이 시리즈에는 계획된 추가 미팅이 없습니다. 추가 미팅을 스케줄링하거나 시리즈를 연장하려면 템플릿으로 이동하고 미팅 세부 정보를 편집하여 종료 날짜, 빈도 또는 간격을 변경하세요. + delete_dialog: + title: "미팅 시리즈 삭제" + heading: "이 미팅 시리즈를 영구적으로 삭제하시겠습니까?" + confirmation_message_html: + zero: > + 미팅 시리즈 %{title}에는 미팅 항목이 없습니다. 모든 사용자에 대해 이 시리즈가 삭제됩니다. 주의하여 진행하세요. + one: > + %{title} 삭제를 하면 이 시리즈에서 하나의 항목도 삭제됩니다. 이 작업은 되돌릴 수 없습니다. 주의하여 진행하세요. + other: > + %{title} 삭제를 하면 이 시리즈에서 %{count}개 항목 모두가 삭제됩니다. 이 작업은 되돌릴 수 없습니다. 주의하여 진행하세요. + scheduled_delete_dialog: + title: "미팅 항목 취소" + heading: "이 미팅 항목을 취소하시겠습니까?" + confirmation_message_html: > + 템플릿에 없는 미팅 정보는 모두 손실됩니다. 계속하시겠습니까? + confirm_button: "항목 취소" + end_series_dialog: + title: "미팅 시리즈 종료" notice_successful_notification: "알림이 전송됨" notice_timezone_missing: 표준 시간대가 설정되지 않았으며 %{zone}(으)로 간주됩니다. 해당 표준 시간대를 선택하려면 여기를 클릭하세요. notice_meeting_updated: "이 페이지는 다른 사람이 업데이트했습니다. 변경 사항을 보려면 다시 로드하세요." @@ -251,6 +329,8 @@ ko: text_duration_in_hours: "기간(시간)" text_in_hours: " 시간" text_meeting_agenda_for_meeting: '미팅 "%{meeting}"에 대한 의제' + text_meeting_series_end_early_heading: "향후 항목을 삭제하시겠습니까?" + text_meeting_series_end_early: "이 시리즈를 종료하면 향후 오픈 또는 예정된 미팅 항목이 모두 삭제됩니다" text_meeting_closing_are_you_sure: "미팅 어젠더를 닫으시겠습니까?" text_meeting_agenda_open_are_you_sure: "그러면 몇 분 내에 모든 변경 사항을 덮어씁니다. 계속하시겠습니까?" text_meeting_minutes_for_meeting: '미팅 "%{meeting}"에 대한 의사록' @@ -265,6 +345,10 @@ ko: label_meeting_created_by: "작성자" label_meeting_last_updated: "마지막 업데이트" label_meeting_reload: "다시 로드" + label_meeting_index_today: "오늘" + label_meeting_index_tomorrow: "내일" + label_meeting_index_this_week: "이번 주 후반에" + label_meeting_index_later: "다음 주 그리고 그 이후에" label_agenda_items: "의제 항목" label_agenda_items_reordered: "재정렬됨" label_agenda_item_remove: "의제에서 제거" @@ -290,7 +374,7 @@ ko: label_meeting_state_closed: "닫음" label_meeting_state_closed_html: "닫힘" label_meeting_state_agenda_created: "의제 생성됨" - label_meeting_state_scheduled: "예약됨" + label_meeting_state_planned: "계획됨" label_meeting_state_cancelled: "취소됨" label_meeting_state_skipped: "건너뜀" label_meeting_reopen_action: "미팅 다시 열기" diff --git a/modules/meeting/config/locales/crowdin/lt.seeders.yml b/modules/meeting/config/locales/crowdin/lt.seeders.yml index fedd769553d9..189e442b8a4c 100644 --- a/modules/meeting/config/locales/crowdin/lt.seeders.yml +++ b/modules/meeting/config/locales/crowdin/lt.seeders.yml @@ -7,9 +7,9 @@ lt: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Savaitiniai + title: Weekly meeting_agenda_items: item_0: title: Geros naujienos diff --git a/modules/meeting/config/locales/crowdin/lt.yml b/modules/meeting/config/locales/crowdin/lt.yml index 212d471d37da..bb8221aa284d 100644 --- a/modules/meeting/config/locales/crowdin/lt.yml +++ b/modules/meeting/config/locales/crowdin/lt.yml @@ -56,7 +56,9 @@ lt: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -118,22 +120,29 @@ lt: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + few: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Artėjantys susirinkimai" @@ -175,12 +184,29 @@ lt: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Atverti susitikimą" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} atsiuntė jums pakvietimą į susitikimą %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Susitikimas %{title} buvo perplanuotas" - summary: "Susitikimą %{title} perplanavo %{actor}" - body: "Susitikimą %{title} perplanavo %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Sena data/laikas" new_date_time: "Nauja data/laikas" label_mail_all_participants: "Siųsti e-laišką visiems dalyviams" @@ -194,12 +220,31 @@ lt: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Šiuo metu nukopijavus susitikimą, susiję susitikimo elmentai nebus kopijuojami, tik detalės." copied: "Nukopijuota iš susitikimo #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Bevardė skiltis" delete_confirmation: "Ištrynus skiltį taipogi bus ištrinti ir visi jos plano elementai. Ar tikrai norite tai padaryti?" placeholder_title: "Nauja skiltis" empty_text: "Tempkite elementus čia arba sukurtkite naują" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -207,7 +252,7 @@ lt: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -223,8 +268,9 @@ lt: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -233,6 +279,41 @@ lt: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Pranešimas sėkmingai išsiųstas" notice_timezone_missing: Laiko zona nenustatyta ir %{zone} zona yra rekomenduojama. Kad pasirinktumėte laiko zoną, paspauskite čia. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -254,6 +335,8 @@ lt: text_duration_in_hours: "Trukmė valandomis" text_in_hours: " valandos(-ų) " text_meeting_agenda_for_meeting: 'pasitarimo „%{meeting}“ darbotvarkę' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Ar tikrai norite uždaryti susitikimo planą?" text_meeting_agenda_open_are_you_sure: "Tai perrašys visus pakeitimus minutėse! Ar norite tęsti?" text_meeting_minutes_for_meeting: 'pasitarimo „%{meeting}“ minutės' @@ -268,6 +351,10 @@ lt: label_meeting_created_by: "Sukūrė" label_meeting_last_updated: "Atnaujinta" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Darbotvarkės klausimai" label_agenda_items_reordered: "perrikiuota" label_agenda_item_remove: "Išimti iš plano" @@ -293,7 +380,7 @@ lt: label_meeting_state_closed: "Uždarytas" label_meeting_state_closed_html: "Uždarytas" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Iš naujo atidaryti susitikimą" diff --git a/modules/meeting/config/locales/crowdin/lv.seeders.yml b/modules/meeting/config/locales/crowdin/lv.seeders.yml index 1fdde03d764a..25eecc957c05 100644 --- a/modules/meeting/config/locales/crowdin/lv.seeders.yml +++ b/modules/meeting/config/locales/crowdin/lv.seeders.yml @@ -7,7 +7,7 @@ lv: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/lv.yml b/modules/meeting/config/locales/crowdin/lv.yml index 69829cedf7d6..8bd6cc484d26 100644 --- a/modules/meeting/config/locales/crowdin/lv.yml +++ b/modules/meeting/config/locales/crowdin/lv.yml @@ -55,7 +55,9 @@ lv: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -117,22 +119,28 @@ lv: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + zero: "There are %{count} more meetings." + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Gaidāmās sanāksmes" @@ -174,12 +182,29 @@ lv: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -193,12 +218,31 @@ lv: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -206,7 +250,7 @@ lv: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -222,8 +266,9 @@ lv: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -232,6 +277,41 @@ lv: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Paziņojums veiksmīgi nosūtīts" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -253,6 +333,8 @@ lv: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -267,6 +349,10 @@ lv: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -292,7 +378,7 @@ lv: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/mn.seeders.yml b/modules/meeting/config/locales/crowdin/mn.seeders.yml index 519fe9a40dc1..8a124e19a1fa 100644 --- a/modules/meeting/config/locales/crowdin/mn.seeders.yml +++ b/modules/meeting/config/locales/crowdin/mn.seeders.yml @@ -7,7 +7,7 @@ mn: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/mn.yml b/modules/meeting/config/locales/crowdin/mn.yml index 99952ef29227..9eab061e61db 100644 --- a/modules/meeting/config/locales/crowdin/mn.yml +++ b/modules/meeting/config/locales/crowdin/mn.yml @@ -54,7 +54,9 @@ mn: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ mn: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ mn: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ mn: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ mn: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ mn: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ mn: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ mn: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ mn: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ mn: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/ms.seeders.yml b/modules/meeting/config/locales/crowdin/ms.seeders.yml index 028a74374084..102e8ea32cbb 100644 --- a/modules/meeting/config/locales/crowdin/ms.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ms.seeders.yml @@ -7,9 +7,9 @@ ms: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Mingguan + title: Weekly meeting_agenda_items: item_0: title: Berita baik diff --git a/modules/meeting/config/locales/crowdin/ms.yml b/modules/meeting/config/locales/crowdin/ms.yml index ca838068de73..23ba8c924b85 100644 --- a/modules/meeting/config/locales/crowdin/ms.yml +++ b/modules/meeting/config/locales/crowdin/ms.yml @@ -53,7 +53,9 @@ ms: frequency: "Frekuensi" interval: "Selang waktu" start_date: "Bermula pada" - end_after: "Tamat siri selepas" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Kejadian" errors: messages: @@ -115,22 +117,26 @@ ms: label_recurring_meeting_plural: "Mesyuarat berulang" label_template: "templat" label_recurring_meeting_view: "Lihat siri mesyuarat" - label_recurring_meeting_create: "Buat daripada templat" - label_recurring_meeting_copy: "Salin sebagai one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Batalkan kejadian ini" label_recurring_meeting_delete: "Padam kejadian" - label_recurring_meeting_delete_confirmation: > - Mesyuarat ini adalah sebahagian daripada siri yang dipanggil %{name}. Ini hanya akan memadamkan kejadian tertentu ini dan bukan keseluruhan siri. Adakah anda mahu meneruskan? - label_recurring_occurrence_delete_confirmation: > - Sebarang maklumat mesyuarat yang tiada dalam templat akan hilang. Adakah anda mahu meneruskan? label_recurring_meeting_restore: "Pulihkan kejadian ini" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "Terdapat %{count} lagi mesyuarat yang dijadualkan (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "Terdapat %{count} lagi mesyuarat berjadual (%{schedule})." label_recurring_meeting_more_past: "Terdapat %{count} lagi mesyuarat yang lalu." label_recurring_meeting_more_past_singular: "Terdapat %{count} lagi mesyuarat yang lalu." label_recurring_meeting_show_more: "Tunjukkan lagi" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit siri mesyuarat" label_recurring_meeting_series_delete: "Padamkan siri mesyuarat" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + other: "There are %{count} more meetings." label_my_meetings: "Mesyuarat saya" label_all_meetings: "Semua mesyuarat" label_upcoming_meetings: "Mesyuarat akan datang" @@ -172,12 +178,29 @@ ms: Hantar jemputan e-mel segera kepada peserta yang dipilih di atas. Anda juga boleh melakukan ini secara manual pada bila-bila masa kemudian. send_invitation_emails_structured: "Hantar jemputan e-mel dengan segera kepada semua peserta. Anda juga boleh melakukan ini secara manual pada bila-bila masa kemudian." open_meeting_link: "Buka mesyuarat" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} telah menghantar anda jemputan ke mesyuarat %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Mesyuarat %{title} telah dijadualkan semula" - summary: "Mesyuarat %{title} telah dijadualkan semula oleh %{actor}" - body: "Mesyuarat %{title} telah dijadualkan semula oleh %{actor}" + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Tarikh/masa lama" new_date_time: "Tarikh/masa baharu" label_mail_all_participants: "Hantar e-mel kepada semua peserta" @@ -191,12 +214,31 @@ ms: structured_text: "Atur mesyuarat anda sebagai senarai item agenda yang dinamik, secara pilihan memautkannya ke pakej kerja." structured_text_copy: "Menyalin mesyuarat pada masa ini tidak akan menyalin item agenda mesyuarat yang berkaitan, hanya butiran sahaja" copied: "Disalin daripada Mesyuarat #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Bahagian tanpa tajuk" delete_confirmation: "Memadam bahagian ini akan memadam setiap item agenda juga. Adakah anda pasti anda ingin berbuat demikian?" placeholder_title: "Bahagian baharu" empty_text: "Tarik item ke sini atau cipta yang baharu" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "Mesyuarat ini adalah sebahagian daripada siri mesyuarat berulang." error_no_next: "Tiada kejadian seterusnya untuk mesyuarat ini." @@ -204,7 +246,7 @@ ms: first_created: > Mesyuarat pertama telah berjaya dibuat daripada templat. Semua mesyuarat akan datang akan dibuat secara automatik pada masa kejadian sebelumnya. template: - button_finalize: "Selesaikan templat" + button_finalize: "Open first meeting" blank_title: "Templat siri mesyuarat anda kosong" description: > Templat ini akan digunakan apabila mesyuarat baharu dalam siri dibuat. Anda boleh menambah item agenda, peserta dan lampiran pada templat ini. @@ -220,8 +262,9 @@ ms: working_days: "Setiap hari bekerja" weekly: "Mingguan" end_after: - specific_date: "tarikh tertentu" - iterations: "beberapa kejadian" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Mula" in_words: daily_interval: "Setiap %{interval} hari" @@ -230,6 +273,41 @@ ms: weekly_interval: "Setiap %{interval} minggu pada %{weekday}" frequency: "%{base} pada %{time}" full: "%{base} pada %{time}, berakhir pada %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Pemberitahuan berjaya dihantar" notice_timezone_missing: Tiada zon waktu yang ditetapkan dan %{zone} adalah diandaikan. Untuk pilih zon waktu anda, sila klik sini. notice_meeting_updated: "Halaman ini telah dikemas kini oleh orang lain. Muat semula untuk melihat perubahan." @@ -251,6 +329,8 @@ ms: text_duration_in_hours: "Tempoh masa dalam jam" text_in_hours: "dalam jam" text_meeting_agenda_for_meeting: 'agenda untuk mesyuarat "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Adakah anda pasti anda ingin menutup agenda mesyuarat?" text_meeting_agenda_open_are_you_sure: "Ini akan menggantikan semua perubahan dalam minit mesyuarat! Adakah anda ingin teruskan?" text_meeting_minutes_for_meeting: 'minit untuk mesyuarat "%{meeting}"' @@ -265,6 +345,10 @@ ms: label_meeting_created_by: "Dicipta oleh" label_meeting_last_updated: "Kemas kini terakhir" label_meeting_reload: "Muat semula" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Item-item agenda" label_agenda_items_reordered: "disusun semula" label_agenda_item_remove: "Keluarkan daripada agenda" @@ -290,7 +374,7 @@ ms: label_meeting_state_closed: "Ditutup" label_meeting_state_closed_html: "Ditutup" label_meeting_state_agenda_created: "Agenda dicipta" - label_meeting_state_scheduled: "Dijadualkan" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Dibatalkan" label_meeting_state_skipped: "Dilangkau" label_meeting_reopen_action: "Buka semula mesyuarat" diff --git a/modules/meeting/config/locales/crowdin/ne.seeders.yml b/modules/meeting/config/locales/crowdin/ne.seeders.yml index 0471e47f764a..6662450cf1d0 100644 --- a/modules/meeting/config/locales/crowdin/ne.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ne.seeders.yml @@ -7,7 +7,7 @@ ne: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/ne.yml b/modules/meeting/config/locales/crowdin/ne.yml index 7b35eb8097b1..08a399a351ef 100644 --- a/modules/meeting/config/locales/crowdin/ne.yml +++ b/modules/meeting/config/locales/crowdin/ne.yml @@ -54,7 +54,9 @@ ne: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ ne: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ ne: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ ne: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ ne: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ ne: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ ne: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ ne: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ ne: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ ne: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/nl.seeders.yml b/modules/meeting/config/locales/crowdin/nl.seeders.yml index 648d19db185e..1b0746d71198 100644 --- a/modules/meeting/config/locales/crowdin/nl.seeders.yml +++ b/modules/meeting/config/locales/crowdin/nl.seeders.yml @@ -7,7 +7,7 @@ nl: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Wekelijks meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/nl.yml b/modules/meeting/config/locales/crowdin/nl.yml index 63c2ab409429..d91bf38843d2 100644 --- a/modules/meeting/config/locales/crowdin/nl.yml +++ b/modules/meeting/config/locales/crowdin/nl.yml @@ -54,8 +54,10 @@ nl: frequency: "Frequentie" interval: "Interval" start_date: "Begint op" - end_after: "Serie beëindigen na" - iterations: "Voorvallen" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Vergaderreeks eindigt" + iterations: "Gebeurtenissen" errors: messages: invalid_time_format: "is geen geldige tijd. Vereist formaat: UH:MM" @@ -116,22 +118,27 @@ nl: label_recurring_meeting_plural: "Terugkerende vergaderingen" label_template: "Sjabloon" label_recurring_meeting_view: "Bekijk vergaderreeksen" - label_recurring_meeting_create: "Op basis van sjabloon maken" - label_recurring_meeting_copy: "Eenmalig kopiëren" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Deze gebeurtenis annuleren" label_recurring_meeting_delete: "Gebeurtenis verwijderen" - label_recurring_meeting_delete_confirmation: > - Deze bijeenkomst maakt deel uit van een serie genaamd %{name}. Hiermee wordt alleen deze specifieke gebeurtenis verwijderd en niet de hele serie. Wilt u doorgaan? - label_recurring_occurrence_delete_confirmation: > - Alle vergaderinformatie die niet in de sjabloon staat, zal verloren gaan. Wilt u doorgaan? label_recurring_meeting_restore: "Herstel deze gebeurtenis" + label_recurring_meeting_schedule: "Planning" + label_recurring_meeting_next_occurrence: "Volgende gebeurtenis" label_recurring_meeting_more: "Er zijn nog %{count} geplande vergaderingen (%{schedule})." + label_recurring_meeting_no_end_date: "Er zijn meer geplande vergaderingen (%{schedule})." label_recurring_meeting_more_singular: "Er zijn nog %{count} geplande vergaderingen (%{schedule})." label_recurring_meeting_more_past: "Er zijn %{count} meer eerdere vergaderingen." label_recurring_meeting_more_past_singular: "Er zijn %{count} meer eerdere vergaderingen." label_recurring_meeting_show_more: "Toon meer" + label_recurring_meeting_series_create: "Maak vergader reeks" label_recurring_meeting_series_edit: "Vergaderreeks bewerken" label_recurring_meeting_series_delete: "Verwijder serie van vergaderingen" + label_recurring_meeting_series_end: "Vergaderreeks beëindigen" + label_recurring_meeting_series_end_now: "Serie nu beëindigen" + label_meeting_more: + one: "Er is nog één vergadering." + other: "Er zijn nog %{count} vergaderingen." label_my_meetings: "Mijn vergaderingen" label_all_meetings: "Alle vergaderingen" label_upcoming_meetings: "Geplande vergaderingen" @@ -173,12 +180,29 @@ nl: Stuur onmiddellijk een e-mailuitnodiging naar de hierboven geselecteerde deelnemers. U kunt dit ook later op elk gewenst moment handmatig doen. send_invitation_emails_structured: "Stuur onmiddellijk een e-mailuitnodiging naar de hierboven geselecteerde deelnemers. U kunt dit ook later op elk gewenst moment handmatig doen." open_meeting_link: "Open vergadering" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} heeft je een uitnodiging gestuurd voor de meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Vergadering %{title} is verplaatst" - summary: "Vergadering %{title} is verplaatst door %{actor}" - body: "De vergadering %{title} is opnieuw gepland door %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Oude datum/tijd" new_date_time: "Nieuwe datum/tijd" label_mail_all_participants: "E-mail verzenden naar alle deelnemers" @@ -192,12 +216,31 @@ nl: structured_text: "Organiseer uw vergadering als een dynamische lijst met agendapunten, optioneel gekoppeld aan een werkpakket." structured_text_copy: "Een vergadering kopiëren zal momenteel niet de bijbehorende agendapunten kopiëren, alleen de details" copied: "Gekopieerd van vergadering #%{id}" + delete_dialog: + one_time: + title: "Verwijder vergadering" + heading: "Verwijder deze vergadering?" + confirmation_message_html: > + Deze actie is niet omkeerbaar. Ga voorzichtig te werk. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "Geen vergaderingen om weer te geven" + desc: "Er zijn geen vergaderingen die voldoen aan de actieve filtercriteria." meeting_section: untitled_title: "Naamloze sectie" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "Nieuwe Sectie" empty_text: "Sleep items hierheen of maak een nieuwe" recurring_meeting: + ended_blankslate: + title: "Vergaderreeks geëindigd" + message: "Deze serie vergaderingen zijn afgelopen. Er zijn geen aanstaande vergaderingen. " + action: "U kunt nog steeds eerdere gebeurtenissen bekijken of de vergaderreeks bewerken om deze uit te breiden." occurrence: infoline: "Deze vergadering is onderdeel van een herhalende vergaderreeks." error_no_next: "Er is geen volgende gebeurtenis voor deze vergadering." @@ -205,7 +248,7 @@ nl: first_created: > De eerste vergadering is succesvol aangemaakt vanuit het sjabloon. Alle toekomstige vergaderingen worden automatisch aangemaakt op het moment van de vorige vergadering. template: - button_finalize: "Sjabloon voltooien" + button_finalize: "Open first meeting" blank_title: "Uw vergaderreeks sjabloon is leeg" description: > Dit sjabloon wordt gebruikt wanneer nieuwe vergaderingen in de serie worden aangemaakt. U kunt agendapunten, deelnemers en bijlagen aan het sjabloon toevoegen. @@ -221,8 +264,9 @@ nl: working_days: "Elke werkdag" weekly: "Wekelijks" end_after: - specific_date: "een specifieke datum" - iterations: "een aantal gebeurtenissen" + never: "nooit" + specific_date: "na een specifieke datum" + iterations: "na een aantal gebeurtenissen" starts: "Begint" in_words: daily_interval: "Elke %{interval} dagen" @@ -231,6 +275,41 @@ nl: weekly_interval: "Elke %{interval} weken op %{weekday}" frequency: "%{base} op %{time}" full: "%{base} op %{time}, eindigt op %{end_date}" + full_past: "%{base} op %{time}, geëindigd op %{end_date}" + never_ending: "%{base} op %{time}" + open: + title: "Open" + subtitle: > + Open vergaderingen hebben agenda's die bewerkt kunnen worden en verschijnen in het gedeelte "Mijn vergaderingen" van individuele gebruikers. Wijzigingen aan het sjabloon voor reeksen vergaderingen hebben geen invloed op al geopende vergaderingen. + blankslate: + title: "Momenteel geen open vergaderingen" + desc: "U kunt een geplande vergadering handmatig openen door op de knop \"Openen\" hieronder te klikken" + planned: + title: "Gepland" + subtitle: > + De volgende vergaderingen zijn gepland in het terugkerende vergaderschema, maar zijn nog niet geopend. Telkens wanneer een geplande vergadering begint, wordt de volgende automatisch voor u geopend. U kunt geplande vergaderingen ook handmatig openen om de sjabloon te importeren en te beginnen met het bewerken van de agenda. + blankslate: + title: "Geen geplande vergaderingen meer" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notificatie succesvol verzonden" notice_timezone_missing: Geen tijdzone is ingesteld en %{zone} is aangenomen. Om uw tijdzone te kiezen, klik dan hier. notice_meeting_updated: "Deze pagina is door iemand anders bijgewerkt. Herlaad om wijzigingen te bekijken." @@ -252,6 +331,8 @@ nl: text_duration_in_hours: "Duur in uren" text_in_hours: "in uren" text_meeting_agenda_for_meeting: 'agenda voor de vergadering "%{meeting}"' + text_meeting_series_end_early_heading: "Toekomstige gebeurtenissen verwijderen?" + text_meeting_series_end_early: "Als u de serie beëindigt, worden alle toekomstige open of geplande vergaderingen verwijderd" text_meeting_closing_are_you_sure: "Weet je zeker dat je de vergaderagenda wilt sluiten?" text_meeting_agenda_open_are_you_sure: "Dit overschrijft alle wijzigingen in de aantekeningen! Wilt u doorgaan?" text_meeting_minutes_for_meeting: 'minuten voor de vergadering "%{meeting}"' @@ -266,6 +347,10 @@ nl: label_meeting_created_by: "Gemaakt door" label_meeting_last_updated: "Laatst bijgewerkt" label_meeting_reload: "Herladen" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agendapunten" label_agenda_items_reordered: "herschikken" label_agenda_item_remove: "Van de agenda schrappen" @@ -291,7 +376,7 @@ nl: label_meeting_state_closed: "Gesloten" label_meeting_state_closed_html: "Gesloten" label_meeting_state_agenda_created: "Agenda aangemaakt" - label_meeting_state_scheduled: "Gepland" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Geannuleerd" label_meeting_state_skipped: "Overgeslagen" label_meeting_reopen_action: "Heropen vergadering" diff --git a/modules/meeting/config/locales/crowdin/no.seeders.yml b/modules/meeting/config/locales/crowdin/no.seeders.yml index 94f08bc8f261..ab662aad82ac 100644 --- a/modules/meeting/config/locales/crowdin/no.seeders.yml +++ b/modules/meeting/config/locales/crowdin/no.seeders.yml @@ -7,9 +7,9 @@ standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Ukentlig + title: Weekly meeting_agenda_items: item_0: title: Gode nyheter diff --git a/modules/meeting/config/locales/crowdin/no.yml b/modules/meeting/config/locales/crowdin/no.yml index c3d6e3dddd9f..e2d3228a3be4 100644 --- a/modules/meeting/config/locales/crowdin/no.yml +++ b/modules/meeting/config/locales/crowdin/no.yml @@ -54,7 +54,9 @@ frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Kommende møter" @@ -173,12 +180,29 @@ Send en e-postinvitasjon til deltakerne som er valgt over. Du kan også gjøre dette manuelt når som helst senere. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Åpent møte" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} har sendt deg en invitasjon til møtet %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Møtet %{title} har blitt endret" - summary: "Møte %{title} har blitt endret av %{actor}" - body: "Møtet %{title} har blitt endret av %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Gammel dato/tid" new_date_time: "Ny dato/tid" label_mail_all_participants: "Send e-post til alle deltagere" @@ -192,12 +216,31 @@ structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Kopiering av et møte vil for tiden ikke kopiere de tilknyttede elementene på dagsordenen, bare detaljene" copied: "Kopiert fra møte #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Ikke navngitt del" delete_confirmation: "Hvis du sletter denne delen, slettes også dets verdier i alle prosjekter. Er du sikker på at du vil gjøre dette?" placeholder_title: "Ny seksjon" empty_text: "Dra punkter hit eller opprett et nytt" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Påminning sendt" notice_timezone_missing: Ingen tidssone angis og %{zone} antas. Vennligst klikk her for å velge egen tidssone. notice_meeting_updated: "Denne siden er oppdatert av noen andre. Last siden på nytt for å se endringer." @@ -252,6 +331,8 @@ text_duration_in_hours: "Varighet i timer" text_in_hours: "i timer" text_meeting_agenda_for_meeting: 'saksliste for møtet "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Er du sikker på at du vil lukke agendaen?" text_meeting_agenda_open_are_you_sure: "Dette vil overskrive alle endringer i referatet! Vil du fortsette?" text_meeting_minutes_for_meeting: 'referat for møtet "%{meeting}"' @@ -266,6 +347,10 @@ label_meeting_created_by: "Opprettet av" label_meeting_last_updated: "Sist oppdatert" label_meeting_reload: "Last på nytt" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Dagsordenens poster" label_agenda_items_reordered: "omsortert" label_agenda_item_remove: "Fjern fra dagsorden" @@ -291,7 +376,7 @@ label_meeting_state_closed: "Stengt" label_meeting_state_closed_html: "Stengt" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Gjenåpne møte" diff --git a/modules/meeting/config/locales/crowdin/pl.seeders.yml b/modules/meeting/config/locales/crowdin/pl.seeders.yml index c8f26174c30a..06fc4d95add5 100644 --- a/modules/meeting/config/locales/crowdin/pl.seeders.yml +++ b/modules/meeting/config/locales/crowdin/pl.seeders.yml @@ -7,7 +7,7 @@ pl: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Co tydzień meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/pl.yml b/modules/meeting/config/locales/crowdin/pl.yml index 5a27070c977e..d1fbb826728e 100644 --- a/modules/meeting/config/locales/crowdin/pl.yml +++ b/modules/meeting/config/locales/crowdin/pl.yml @@ -56,7 +56,9 @@ pl: frequency: "Częstotliwość" interval: "Interwał" start_date: "Rozpoczyna się" - end_after: "Zakończ serię po" + start_time: "Czas rozpoczęcia" + start_time_hour: "Czas rozpoczęcia" + end_after: "Seria spotkań kończy się" iterations: "Wystąpienia" errors: messages: @@ -118,22 +120,29 @@ pl: label_recurring_meeting_plural: "Spotkania cykliczne" label_template: "Szablon" label_recurring_meeting_view: "Wyświetl serię spotkań" - label_recurring_meeting_create: "Utwórz z szablonu" + label_recurring_meeting_create: "Otwórz" label_recurring_meeting_copy: "Skopiuj jako jednorazowe" label_recurring_meeting_cancel: "Anuluj to wystąpienie" label_recurring_meeting_delete: "Usuń wystąpienie" - label_recurring_meeting_delete_confirmation: > - To spotkanie jest częścią serii o nazwie %{name}. Spowoduje to usunięcie tylko tego konkretnego wystąpienia, a nie całej serii. Czy chcesz kontynuować? - label_recurring_occurrence_delete_confirmation: > - Wszelkie informacje o spotkaniu, które nie znajdują się w szablonie, zostaną utracone. Czy chcesz kontynuować? label_recurring_meeting_restore: "Przywróć to wystąpienie" + label_recurring_meeting_schedule: "Harmonogram" + label_recurring_meeting_next_occurrence: "Następne wystąpienie" label_recurring_meeting_more: "Jest więcej (%{count}) zaplanowanych spotkań (%{schedule})." + label_recurring_meeting_no_end_date: "Jest więcej zaplanowanych spotkań (%{schedule})." label_recurring_meeting_more_singular: "Jest jeszcze %{count} zaplanowane spotkanie (%{schedule})." label_recurring_meeting_more_past: "Jest więcej (%{count}) poprzednich spotkań." label_recurring_meeting_more_past_singular: "Jest jeszcze %{count} poprzednie spotkanie." label_recurring_meeting_show_more: "Pokaż więcej" + label_recurring_meeting_series_create: "Utwórz serię spotkań" label_recurring_meeting_series_edit: "Edytuj serię spotkań" label_recurring_meeting_series_delete: "Usuń serię spotkań" + label_recurring_meeting_series_end: "Zakończ serię spotkań" + label_recurring_meeting_series_end_now: "Zakończ serię teraz" + label_meeting_more: + one: "Jest jeszcze jedno spotkanie." + few: "Są jeszcze %{count} spotkania." + many: "Jest jeszcze %{count} spotkań." + other: "Jest jeszcze %{count} spotkania." label_my_meetings: "Moje spotkania" label_all_meetings: "Wszystkie spotkania" label_upcoming_meetings: "Nadchodzące spotkania" @@ -175,12 +184,29 @@ pl: Natychmiast wyślij zaproszenie w wiadomości e-mail do uczestników wybranych powyżej. Możesz to również zrobić ręcznie w dowolnym momencie później. send_invitation_emails_structured: "Natychmiast wyślij zaproszenie w wiadomości e-mail do wszystkich uczestników. Możesz to również zrobić ręcznie w dowolnym momencie później." open_meeting_link: "Spotkania otwarte" + open_my_meetings_link: "Przejdź do sekcji Moje spotkania" + series: + title: "[%{project_name}] Seria spotkań „%{title}”" + summary: "Użytkownik %{actor} utworzył nową serię spotkań „%{title}”" + series_rescheduled: + title: "[%{project_name}] Zmieniono terminy serii spotkań „%{title}”" + summary: "Użytkownik %{actor} zmienił harmonogram serii spotkań „%{title}”" + old_schedule: "Stary harmonogram" + new_schedule: "Nowy harmonogram" invited: - summary: "Użytkownik %{actor} wysłał Ci zaproszenie na spotkanie %{title}" + summary: "Użytkownik %{actor} wysłał Ci zaproszenie na spotkanie „%{title}”" + cancelled: + header: "Anulowano: spotkanie „%{title}”" + header_occurrence: "Anulowano: wystąpienie spotkania „%{title}”" + header_series: "Anulowano: serię spotkań „%{title}”" + summary_occurrence: "Wystąpienie „%{title}” zostało anulowane przez użytkownika %{actor}." + summary_series: "Seria spotkań „%{title}” została anulowana przez użytkownika %{actor}." + summary: "„%{title}” anulował użytkownik %{actor}." + date_time: "Zaplanowana data/godzina" rescheduled: - header: "Spotkanie %{title} zostało przełożone" - summary: "Spotkanie %{title} zostało przełożone przez użytkownika %{actor}" - body: "Spotkanie %{title} zostało przełożone przez użytkownika %{actor}" + header: "Spotkanie „%{title}” zostało przełożone" + summary: "Spotkanie „%{title}” zostało przełożone przez użytkownika %{actor}" + body: "Spotkanie „%{title}” zostało przełożone przez użytkownika %{actor}." old_date_time: "Stara data/godzina" new_date_time: "Nowa data/godzina" label_mail_all_participants: "Wyślij wiadomość e-mail do wszystkich uczestników" @@ -194,12 +220,31 @@ pl: structured_text: "Zorganizuj spotkanie jako dynamiczną listę punktów planu spotkania, opcjonalnie powiązując je z pakietem roboczym." structured_text_copy: "Skopiowanie spotkania nie powoduje obecnie skopiowania powiązanych pozycji planu spotkania, a jedynie szczegółów" copied: "Skopiowano ze spotkania #%{id}" + delete_dialog: + one_time: + title: "Usuń spotkanie" + heading: "Usunąć to spotkanie?" + confirmation_message_html: > + To działanie jest nieodwracalne. Postępuj ostrożnie. + occurrence: + title: "Anuluj wystąpienie spotkania" + heading: "Anulować to wystąpienie spotkania?" + confirmation_message_html: > + Wszelkie informacje o spotkaniu, które nie znajdują się w szablonie, zostaną utracone. Czy chcesz kontynuować? + confirm_button: "Anuluj wystąpienie" + blankslate: + title: "Brak spotkań do wyświetlenia" + desc: "Nie ma spotkań spełniających kryteria aktywnego filtru." meeting_section: untitled_title: "Sekcja bez nazwy" delete_confirmation: "Usunięcie sekcji spowoduje również usunięcie wszystkich jej elementów punktów planu spotkania. Czy na pewno chcesz to zrobić?" placeholder_title: "Nowa sekcja" empty_text: "Przeciągnij elementy tutaj lub utwórz nowe" recurring_meeting: + ended_blankslate: + title: "Seria spotkań zakończyła się" + message: "Ta seria spotkań dobiegła końca. Nie ma nadchodzących spotkań. " + action: "Nadal można przeglądać poprzednie wystąpienia lub edytować serię spotkań, aby ją przedłużyć." occurrence: infoline: "Spotkanie to jest częścią serii spotkań cyklicznych." error_no_next: "Nie ma następnego wystąpienia tego spotkania." @@ -207,7 +252,7 @@ pl: first_created: > Pierwsze spotkanie zostało utworzone z szablonu. Wszystkie przyszłe spotkania zostaną utworzone automatycznie o godzinie poprzedniego wystąpienia. template: - button_finalize: "Zakończ szablon" + button_finalize: "Otwarte pierwsze spotkanie" blank_title: "Szablon serii spotkań jest pusty" description: > Ten szablon będzie używany za każdym razem, gdy zostaną utworzone nowe spotkania w serii. Do tego szablonu możesz dodać elementy planu spotkania, uczestników i załączniki. @@ -223,8 +268,9 @@ pl: working_days: "W każdy dzień roboczy" weekly: "Co tydzień" end_after: - specific_date: "określona data" - iterations: "liczba wystąpień" + never: "nigdy" + specific_date: "po określonej dacie" + iterations: "po określonej liczbie wystąpień" starts: "Zaczyna się" in_words: daily_interval: "Co %{interval} dni" @@ -233,6 +279,41 @@ pl: weekly_interval: "Co %{interval} tyg. w %{weekday}" frequency: "%{base} o %{time}" full: "%{base} o %{time}, kończy się %{end_date}" + full_past: "%{base} o %{time}, zakończone %{end_date}" + never_ending: "%{base} o %{time}" + open: + title: "Otwórz" + subtitle: > + Spotkania otwarte mają porządek obrad, który można edytować i prezentować w sekcji „Moje spotkania”. Zmiany w szablonie serii spotkań nie mają wpływu na już otwarte wystąpienia spotkania. + blankslate: + title: "Obecnie nie ma otwartych spotkań" + desc: "Zaplanowane spotkanie można otworzyć ręcznie, klikając poniżej przycisk „Otwórz”" + planned: + title: "Zaplanowane" + subtitle: > + Poniższe spotkania są zaplanowane w harmonogramie spotkań cyklicznych, ale nie są jeszcze otwarte. Za każdym razem, gdy rozpocznie się zaplanowane spotkanie, następne sptokanie zostanie automatycznie otwarte dla Ciebie. Możesz także otworzyć zaplanowane spotkania ręcznie, aby zaimportować szablon i rozpocząć edycję porządku obrad. + blankslate: + title: "Nie ma już zaplanowanych spotkań" + desc: > + W tej serii nie zaplanowano żadnych dodatkowych spotkań. Aby zaplanować dodatkowe spotkania lub przedłużyć serię, przejdź do szablonu i edytuj szczegóły spotkania, aby zmienić datę zakończenia, częstotliwość lub interwał. + delete_dialog: + title: "Usuń serię spotkań" + heading: "Trwale usunąć tę serię spotkań?" + confirmation_message_html: + zero: > + Seria spotkań %{title} nie ma żadnych wystąpień spotkania. Seria zostanie usunięta dla wszystkich. Postępuj ostrożnie. + one: > + Usunięcie %{title} usunie także jedno wystąpienie w tej serii. To działanie jest nieodwracalne. Postępuj ostrożnie. + other: > + Usunięcie %{title} usunie wszystkie wystąpienia (%{count}) w tej serii. To działanie jest nieodwracalne. Postępuj ostrożnie. + scheduled_delete_dialog: + title: "Anuluj wystąpienie spotkania" + heading: "Anulować to wystąpienie spotkania?" + confirmation_message_html: > + Wszelkie informacje o spotkaniu, które nie znajdują się w szablonie, zostaną utracone. Czy chcesz kontynuować? + confirm_button: "Anuluj wystąpienie" + end_series_dialog: + title: "Zakończ serię spotkań" notice_successful_notification: "Powiadomienia wysłane pomyślnie" notice_timezone_missing: 'Została ustawiona domyślna strefa czasowa: %{zone}. Aby zmienić strefę czasową, kliknij tutaj.' notice_meeting_updated: "Ta strona została zaktualizowana przez kogoś innego. Załaduj ją ponownie, aby wyświetlić zmiany." @@ -254,6 +335,8 @@ pl: text_duration_in_hours: "Czas trwania w godzinach" text_in_hours: "w godzinach" text_meeting_agenda_for_meeting: 'agenda spotkania "%{meeting}"' + text_meeting_series_end_early_heading: "Usunąć przyszłe wystąpienia?" + text_meeting_series_end_early: "Zakończenie serii spowoduje usunięcie wszelkich przyszłych otwartych lub zaplanowanych wystąpień spotkania" text_meeting_closing_are_you_sure: "Czy na pewno chcesz zamknąć plan spotkania?" text_meeting_agenda_open_are_you_sure: "To zastąpił wszystkie zmiany w protokołach! Czy chcesz kontynuować?" text_meeting_minutes_for_meeting: 'protokół ze spotkania "%{meeting}"' @@ -268,6 +351,10 @@ pl: label_meeting_created_by: "Utworzony przez" label_meeting_last_updated: "Ostatnia aktualizacja" label_meeting_reload: "Załaduj ponownie" + label_meeting_index_today: "Dzisiaj" + label_meeting_index_tomorrow: "Jutro" + label_meeting_index_this_week: "Później w tym tygodniu" + label_meeting_index_later: "W przyszłym tygodniu i później" label_agenda_items: "Punkty planu spotkania" label_agenda_items_reordered: "zmieniono kolejność" label_agenda_item_remove: "Usuń z planu spotkania" @@ -293,7 +380,7 @@ pl: label_meeting_state_closed: "Zamknięte" label_meeting_state_closed_html: "Zamknięte" label_meeting_state_agenda_created: "Utworzono plan spotkania" - label_meeting_state_scheduled: "Zaplanowano" + label_meeting_state_planned: "Zaplanowane" label_meeting_state_cancelled: "Anulowano" label_meeting_state_skipped: "Pominięto" label_meeting_reopen_action: "Otwórz ponownie spotkanie" diff --git a/modules/meeting/config/locales/crowdin/pt-BR.seeders.yml b/modules/meeting/config/locales/crowdin/pt-BR.seeders.yml index aa253d771ff3..bdd1f714e2cf 100644 --- a/modules/meeting/config/locales/crowdin/pt-BR.seeders.yml +++ b/modules/meeting/config/locales/crowdin/pt-BR.seeders.yml @@ -7,7 +7,7 @@ pt-BR: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Semanal meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/pt-BR.yml b/modules/meeting/config/locales/crowdin/pt-BR.yml index 81fb5437cce0..7c6c860b78f8 100644 --- a/modules/meeting/config/locales/crowdin/pt-BR.yml +++ b/modules/meeting/config/locales/crowdin/pt-BR.yml @@ -54,7 +54,9 @@ pt-BR: frequency: "Frequência" interval: "Intervalo" start_date: "Começa em" - end_after: "Encerrar série após" + start_time: "Hora de início" + start_time_hour: "Hora de início" + end_after: "Série de reuniões termina" iterations: "Ocorrências" errors: messages: @@ -116,22 +118,27 @@ pt-BR: label_recurring_meeting_plural: "Reuniões recorrentes" label_template: "Modelo" label_recurring_meeting_view: "Visualizar série de reuniões" - label_recurring_meeting_create: "Criar a partir de um modelo" - label_recurring_meeting_copy: "Copiar como único" + label_recurring_meeting_create: "Abrir" + label_recurring_meeting_copy: "Copiar como único uso" label_recurring_meeting_cancel: "Cancelar esta ocorrência" label_recurring_meeting_delete: "Excluir ocorrência" - label_recurring_meeting_delete_confirmation: > - Esta reunião faz parte da série %{name}. Apenas esta ocorrência será excluída, não a série inteira. Deseja continuar? - label_recurring_occurrence_delete_confirmation: > - Quaisquer informações da reunião que não estejam no modelo serão descartadas. Deseja continuar? label_recurring_meeting_restore: "Restaurar esta ocorrência" + label_recurring_meeting_schedule: "Programar" + label_recurring_meeting_next_occurrence: "Próxima ocorrência" label_recurring_meeting_more: "Há mais %{count} reuniões programadas (%{schedule})." + label_recurring_meeting_no_end_date: "Há mais reuniões programadas (%{schedule})." label_recurring_meeting_more_singular: "Há mais %{count} reunião programada (%{schedule})." label_recurring_meeting_more_past: "Há mais %{count} reuniões anteriores." label_recurring_meeting_more_past_singular: "Há mais %{count} reunião anterior." label_recurring_meeting_show_more: "Exibir mais" + label_recurring_meeting_series_create: "Criar série de reuniões" label_recurring_meeting_series_edit: "Editar série de reuniões" label_recurring_meeting_series_delete: "Excluir série de reuniões" + label_recurring_meeting_series_end: "Encerrar série de reuniões" + label_recurring_meeting_series_end_now: "Encerrar a série agora" + label_meeting_more: + one: "Há mais uma reunião." + other: "Há mais %{count} reuniões." label_my_meetings: "Minhas reuniões" label_all_meetings: "Todas as reuniões" label_upcoming_meetings: "Próximas reuniões" @@ -173,12 +180,29 @@ pt-BR: Envie um convite por e-mail imediatamente para os participantes selecionados acima. Você também pode enviar convites manualmente a qualquer momento no futuro. send_invitation_emails_structured: "Envie imediatamente um convite por e-mail para todos os participantes. Você também pode enviá-lo manualmente a qualquer momento." open_meeting_link: "Abrir reunião" + open_my_meetings_link: "Ir para Minhas reuniões" + series: + title: "[%{project_name}] Série de reuniões \"%{title}\"" + summary: "%{actor} criou uma série de reuniões \"%{title}\"" + series_rescheduled: + title: "[%{project_name}] Série de reuniões \"%{title}\" remarcada" + summary: "%{actor} alterou a programação para a série de reuniões\"%{title}\"" + old_schedule: "Programação antiga" + new_schedule: "Nova programação" invited: - summary: "%{actor} enviou a você um convite para a reunião %{title}" + summary: "%{actor} enviou a você um convite para a reunião \"%{title}\"" + cancelled: + header: "Cancelada: Reunião \"%{title}\"" + header_occurrence: "Cancelada: Ocorrência de reunião \"%{title}\"" + header_series: "Cancelada: série de reuniões \"%{title}\"" + summary_occurrence: "Uma ocorrência de \"%{title}\" foi cancelada por %{actor}." + summary_series: "A série de reuniões \"%{title}\" foi cancelada por %{actor}." + summary: "\"%{title}\" foi cancelada por %{actor}." + date_time: "Data/hora programada" rescheduled: - header: "A reunião %{title} foi remarcada" - summary: "A reunião %{title} foi remarcada por %{actor}" - body: "A reunião %{title} foi remarcada por %{actor}" + header: "A reunião \"%{title}\" foi remarcada" + summary: "A reunião \"%{title}\" foi remarcada por %{actor}" + body: "A reunião \"%{title}\" foi remarcada por %{actor}." old_date_time: "Data/hora antiga" new_date_time: "Nova data/hora" label_mail_all_participants: "Enviar e-mail para todos os participantes" @@ -192,12 +216,31 @@ pt-BR: structured_text: "Organize sua reunião como uma lista dinâmica de itens da agenda, opcionalmente vinculando-os a um pacote de trabalho." structured_text_copy: "Copiar uma reunião atualmente não copiará os itens associados da agenda da reunião, apenas os detalhes" copied: "Copiado para a Reunião #%{id}" + delete_dialog: + one_time: + title: "Excluir reunião" + heading: "Excluir esta reunião?" + confirmation_message_html: > + Essa ação não pode ser desfeita. Prossiga com cautela. + occurrence: + title: "Cancelar ocorrência da reunião" + heading: "Cancelar esta ocorrência da reunião?" + confirmation_message_html: > + Quaisquer informações da reunião que não estiverem no modelo serão descartadas. Você deseja continuar? + confirm_button: "Cancelar ocorrência" + blankslate: + title: "Nenhuma reunião para exibir" + desc: "Nenhuma reunião atende aos critérios do filtro ativo." meeting_section: untitled_title: "Seção sem título" delete_confirmation: "Excluir a seção também excluirá todos os itens da pauta. Tem certeza de que deseja fazer isso?" placeholder_title: "Nova seção" empty_text: "Arraste itens para cá ou crie um novo." recurring_meeting: + ended_blankslate: + title: "Série de reuniões encerrada" + message: "Esta série de reuniões chegou ao fim. Não há próximas reuniões. " + action: "Você ainda pode visualizar ocorrências passadas ou editar a série de reuniões para estendê-la." occurrence: infoline: "Esta reunião faz parte de uma série de reuniões recorrentes." error_no_next: "Não há uma próxima ocorrência desta reunião." @@ -205,7 +248,7 @@ pt-BR: first_created: > A primeira reunião foi criada com sucesso a partir do modelo. Todas as reuniões subsequentes serão criadas automaticamente no horário da ocorrência anterior. template: - button_finalize: "Finalizar modelo" + button_finalize: "Abrir a primeira reunião" blank_title: "O modelo da sua série de reuniões está vazio" description: > Este modelo será utilizado sempre que novas reuniões na série forem criadas. Você pode adicionar itens da agenda, participantes e anexos a este modelo. @@ -221,8 +264,9 @@ pt-BR: working_days: "Todos os dias úteis" weekly: "Semanalmente" end_after: - specific_date: "uma data específica" - iterations: "um número de ocorrências" + never: "nunca" + specific_date: "após uma data específica" + iterations: "após um número de ocorrências" starts: "Começa" in_words: daily_interval: "A cada %{interval} dias" @@ -231,6 +275,41 @@ pt-BR: weekly_interval: "Todas as %{interval} semanas em %{weekday}" frequency: "%{base} em %{time}" full: "%{base} em %{time}, termina em %{end_date}" + full_past: "%{base} em %{time}, terminou em %{end_date}" + never_ending: "%{base} em %{time}" + open: + title: "Abrir" + subtitle: > + Reuniões abertas possuem pautas editáveis e aparecem na seção “Minhas reuniões” de cada usuário. Alterações no modelo da série não afetam reuniões já abertas. + blankslate: + title: "Nenhuma reunião aberta no momento" + desc: "Você pode abrir manualmente uma reunião planejada clicando no botão “Abrir” abaixo" + planned: + title: "Planejado" + subtitle: > + As seguintes reuniões estão programadas no cronograma de reuniões recorrentes, mas ainda não foram abertas. Sempre que uma reunião começar, a próxima será aberta automaticamente para você. Também é possível abrir as reuniões programadas manualmente para importar o modelo e começar a editar a agenda. + blankslate: + title: "Não há mais reuniões planejadas" + desc: > + Não há mais reuniões programadas para esta série. Para agendar novas reuniões ou estender a série, acesse o modelo e altere os detalhes da reunião, ajustando a data de término, a frequência ou o intervalo. + delete_dialog: + title: "Excluir série de reuniões" + heading: "Deseja excluir de forma permanente esta série de reuniões?" + confirmation_message_html: + zero: > + A série de reuniões %{title} não tem ocorrências registradas. Ela será excluída para todos. Prossiga com cautela. + one: > + Excluir %{title} também removerá uma ocorrência desta série. Essa ação não pode ser desfeita. Prossiga com cuidado. + other: > + Excluir %{title} removerá todas as ocorrências %{count} desta série. Essa ação não pode ser desfeita. Prossiga com cuidado. + scheduled_delete_dialog: + title: "Cancelar ocorrência da reunião" + heading: "Cancelar esta ocorrência da reunião?" + confirmation_message_html: > + Quaisquer informações da reunião que não estejam no modelo serão descartadas. Deseja continuar? + confirm_button: "Cancelar ocorrência" + end_series_dialog: + title: "Encerrar série de reuniões" notice_successful_notification: "Notificação enviada com sucesso" notice_timezone_missing: Nenhum fuso horário está definido, portanto assumiu-se %{zone}. Para escolher o seu fuso horário, clique aqui. notice_meeting_updated: "Esta página foi atualizada por outra pessoa. Recarregue para visualizar as alterações." @@ -252,6 +331,8 @@ pt-BR: text_duration_in_hours: "Duração em horas" text_in_hours: "em horas" text_meeting_agenda_for_meeting: 'agenda para a reunião "%{meeting}"' + text_meeting_series_end_early_heading: "Excluir ocorrências futuras?" + text_meeting_series_end_early: "Encerrar a série excluirá qualquer reunião futura, aberta ou agendada" text_meeting_closing_are_you_sure: "Você tem certeza de que deseja encerar a pauta da reunião?" text_meeting_agenda_open_are_you_sure: "Esta ação sobrepões todas as alterações nos minutos! Pretende continuar?" text_meeting_minutes_for_meeting: 'ata da reunião "%{meeting}"' @@ -266,6 +347,10 @@ pt-BR: label_meeting_created_by: "Criado por" label_meeting_last_updated: "Última atualização" label_meeting_reload: "Recarregar" + label_meeting_index_today: "Hoje" + label_meeting_index_tomorrow: "Amanhã" + label_meeting_index_this_week: "Mais tarde nesta semana" + label_meeting_index_later: "Próxima semana em diante" label_agenda_items: "Itens da agenda" label_agenda_items_reordered: "reorganizado" label_agenda_item_remove: "Remover da agenda" @@ -291,7 +376,7 @@ pt-BR: label_meeting_state_closed: "Fechada" label_meeting_state_closed_html: "Fechada" label_meeting_state_agenda_created: "Agenda criada" - label_meeting_state_scheduled: "Planejada" + label_meeting_state_planned: "Planejado" label_meeting_state_cancelled: "Cancelada" label_meeting_state_skipped: "Pulada" label_meeting_reopen_action: "Reabrir reunião" diff --git a/modules/meeting/config/locales/crowdin/pt-PT.seeders.yml b/modules/meeting/config/locales/crowdin/pt-PT.seeders.yml index 4bcd1ab0fd1a..f82eb5d5de6a 100644 --- a/modules/meeting/config/locales/crowdin/pt-PT.seeders.yml +++ b/modules/meeting/config/locales/crowdin/pt-PT.seeders.yml @@ -7,7 +7,7 @@ pt-PT: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Semanal meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/pt-PT.yml b/modules/meeting/config/locales/crowdin/pt-PT.yml index f654c868220e..d87e57a3642e 100644 --- a/modules/meeting/config/locales/crowdin/pt-PT.yml +++ b/modules/meeting/config/locales/crowdin/pt-PT.yml @@ -54,7 +54,9 @@ pt-PT: frequency: "Frequência" interval: "Intervalo" start_date: "Inicia em" - end_after: "Terminar a série após" + start_time: "Hora de início" + start_time_hour: "Hora de início" + end_after: "Fim da série de reuniões" iterations: "Ocorrências" errors: messages: @@ -116,22 +118,27 @@ pt-PT: label_recurring_meeting_plural: "Reuniões recorrentes" label_template: "Modelo" label_recurring_meeting_view: "Ver séries de reuniões" - label_recurring_meeting_create: "Criar a partir do modelo" - label_recurring_meeting_copy: "Copie como uma única" + label_recurring_meeting_create: "Abrir" + label_recurring_meeting_copy: "Copiar como única vez" label_recurring_meeting_cancel: "Cancelar esta ocorrência" label_recurring_meeting_delete: "Eliminar ocorrência" - label_recurring_meeting_delete_confirmation: > - Esta reunião faz parte de uma série chamada %{name}. Esta ação apenas irá eliminar esta ocorrência em particular e não toda a série. Deseja continuar? - label_recurring_occurrence_delete_confirmation: > - Qualquer informação da reunião que não esteja no modelo será perdida. Pretende continuar? label_recurring_meeting_restore: "Restaurar esta ocorrência" + label_recurring_meeting_schedule: "Agendar" + label_recurring_meeting_next_occurrence: "Próxima ocorrência" label_recurring_meeting_more: "Existem mais %{count} reuniões agendadas (%{schedule})." + label_recurring_meeting_no_end_date: "Existem mais reuniões agendadas (%{schedule})." label_recurring_meeting_more_singular: "Existe mais %{count} reunião agendada (%{schedule})." label_recurring_meeting_more_past: "Existem mais %{count} reuniões no passado." label_recurring_meeting_more_past_singular: "Existe mais %{count} reunião no passado." label_recurring_meeting_show_more: "Mostrar mais" + label_recurring_meeting_series_create: "Criar série de reuniões" label_recurring_meeting_series_edit: "Editar série de reuniões" label_recurring_meeting_series_delete: "Eliminar série de reuniões" + label_recurring_meeting_series_end: "Terminar série de reuniões" + label_recurring_meeting_series_end_now: "Termine a série agora" + label_meeting_more: + one: "Há mais uma reunião." + other: "Há mais %{count} reuniões." label_my_meetings: "As minhas reuniões" label_all_meetings: "Todas as reuniões" label_upcoming_meetings: "Próximas reuniões" @@ -173,12 +180,29 @@ pt-PT: Envie imediatamente um convite por e-mail aos participantes selecionados acima. Também pode fazê-lo manualmente em qualquer altura. send_invitation_emails_structured: "Envie imediatamente um convite por e-mail a todos os participantes. Também pode fazê-lo manualmente em qualquer altura." open_meeting_link: "Entrar na Reunião" + open_my_meetings_link: "Ir para As minhas reuniões" + series: + title: "[%{project_name}] Série de reuniões \"%{title}\"" + summary: "%{actor} configurou uma nova série de reuniões \"%{title}\"" + series_rescheduled: + title: "[%{project_name}] Série de reuniões \"%{title}\" remarcada" + summary: "%{actor} alterou o calendário da série de reuniões \"%{title}\"" + old_schedule: "Calendário antigo" + new_schedule: "Novo calendário" invited: - summary: "%{actor} enviou-lhe um convite para a reunião %{title}" + summary: "%{actor} enviou-lhe um convite para a reunião \"%{title}\"" + cancelled: + header: "Cancelada: Reunião \"%{title}\"" + header_occurrence: "Cancelada: ocorrência de reunião \"%{title}\"" + header_series: "Cancelada: série de reuniões \"%{title}\"" + summary_occurrence: "Uma ocorrência de \"%{title}\" foi cancelada por %{actor}." + summary_series: "A série de reuniões \"%{title}\" foi cancelada por %{actor}." + summary: "\"%{title}\" foi cancelada por %{actor}." + date_time: "Data/hora programada" rescheduled: - header: "A reunião %{title} foi remarcada" - summary: "Reunião %{title} foi remarcada por %{actor}" - body: "A reunião %{title} foi remarcada por %{actor}" + header: "A reunião \"%{title}\" foi remarcada" + summary: "A reunião \"%{title}\" foi remarcada por %{actor}" + body: "A reunião \"%{title}\" foi remarcada por %{actor}." old_date_time: "Data/hora antiga" new_date_time: "Nova data/hora" label_mail_all_participants: "Enviar e-mail a todos os participantes" @@ -192,12 +216,31 @@ pt-PT: structured_text: "Organize a sua reunião como uma lista dinâmica de itens da agenda, associando-os opcionalmente a um pacote de trabalho." structured_text_copy: "Atualmente, a cópia de uma reunião não copia os itens associados da agenda da reunião, apenas os detalhes" copied: "Copiado da reunião #%{id}" + delete_dialog: + one_time: + title: "Eliminar reunião" + heading: "Eliminar esta reunião?" + confirmation_message_html: > + Esta ação não pode ser anulada. Proceda com cuidado. + occurrence: + title: "Cancelar ocorrência de reunião" + heading: "Cancelar esta ocorrência de reunião?" + confirmation_message_html: > + Qualquer informação da reunião que não esteja no modelo será perdida. Pretende continuar? + confirm_button: "Cancelar ocorrência" + blankslate: + title: "Não há reuniões a apresentar" + desc: "Não existem reuniões que cumpram os critérios do filtro ativo." meeting_section: untitled_title: "Secção sem título" delete_confirmation: "A eliminação da secção também irá eliminar os seus pontos da ordem de trabalhos. Tem a certeza de que pretende fazê-lo?" placeholder_title: "Nova secção" empty_text: "Arraste itens para aqui ou crie um novo" recurring_meeting: + ended_blankslate: + title: "A série de reuniões terminou" + message: "Esta série de reuniões chegou ao fim. Não existem mais reuniões. " + action: "Ainda pode ver ocorrências anteriores ou editar a série de reuniões para a prolongar." occurrence: infoline: "Esta reunião faz parte de uma série de reuniões recorrentes." error_no_next: "Esta reunião não tem data prevista para a sua próxima ocorrência." @@ -205,7 +248,7 @@ pt-PT: first_created: > A primeira reunião foi criada com êxito a partir do modelo. Todas as reuniões futuras serão criadas automaticamente na altura da ocorrência anterior. template: - button_finalize: "Terminar modelo" + button_finalize: "Abrir primeira reunião" blank_title: "O seu modelo da série de reuniões está vazio" description: > Este modelo será utilizado sempre que forem criadas novas reuniões na série. Pode adicionar itens da agenda, participantes e anexos a este modelo. @@ -221,8 +264,9 @@ pt-PT: working_days: "Todos os dias úteis" weekly: "Semanal" end_after: - specific_date: "uma data específica" - iterations: "um certo número de ocorrências" + never: "nunca" + specific_date: "após uma data específica" + iterations: "após um certo número de ocorrências" starts: "Começa" in_words: daily_interval: "A cada %{interval} dias" @@ -231,6 +275,41 @@ pt-PT: weekly_interval: "A cada %{interval} semanas à/ao %{weekday}" frequency: "%{base} às %{time}" full: "%{base} às %{time}, termina a %{end_date}" + full_past: "%{base} às %{time}, terminou a %{end_date}" + never_ending: "%{base} às %{time}" + open: + title: "Abrir" + subtitle: > + As reuniões abertas têm agendas que podem ser editadas e aparecem na secção "As minhas reuniões" dos utilizadores individuais. As alterações ao modelo da série de reuniões não afetam as ocorrências de reuniões já abertas. + blankslate: + title: "De momento, não há reuniões abertas" + desc: "Pode abrir manualmente uma reunião planeada ao clicar no botão \"Abrir\" abaixo" + planned: + title: "Planeada" + subtitle: > + As seguintes reuniões estão planeadas na agenda de reuniões recorrentes, mas ainda não estão abertas. Sempre que uma reunião planeada começa, a seguinte será automaticamente aberta para si. Também pode abrir reuniões planeadas manualmente para importar o modelo e começar a editar a agenda. + blankslate: + title: "Não há mais reuniões planeadas" + desc: > + Não existem reuniões adicionais planeadas nesta série. Para agendar reuniões adicionais ou prolongar a série, aceda ao modelo e edite os detalhes da reunião para alterar a data de fim, a frequência ou o intervalo. + delete_dialog: + title: "Eliminar série de reuniões" + heading: "Eliminar permanentemente esta série de reuniões?" + confirmation_message_html: + zero: > + A série de reuniões %{title} não tem quaisquer ocorrências de reunião. A série será eliminada para todos. Proceda com cuidado. + one: > + A eliminação de %{title} também irá eliminar uma ocorrência nesta série. Esta ação não é reversível. Proceda com cuidado. + other: > + A eliminação de %{title} irá eliminar as %{count} ocorrências nesta série. Esta ação não é reversível. Proceda com cuidado. + scheduled_delete_dialog: + title: "Cancelar ocorrência de reunião" + heading: "Cancelar esta ocorrência de reunião?" + confirmation_message_html: > + Qualquer informação da reunião que não esteja no modelo será perdida. Pretende continuar? + confirm_button: "Cancelar ocorrência" + end_series_dialog: + title: "Terminar série de reuniões" notice_successful_notification: "Notificação enviada com sucesso" notice_timezone_missing: Sem fuso horário definido, presume-se %{zone}. Para escolher o seu fuso horário, por favor clique aqui. notice_meeting_updated: "Esta página foi atualizada por outra pessoa. Recarregue para ver as alterações." @@ -252,6 +331,8 @@ pt-PT: text_duration_in_hours: "Duração em horas" text_in_hours: "em horas" text_meeting_agenda_for_meeting: 'agenda para a reunião "%{meeting}"' + text_meeting_series_end_early_heading: "Eliminar ocorrências futuras?" + text_meeting_series_end_early: "Ao terminar a série, elimina todas as ocorrências de reuniões futuras abertas ou agendadas" text_meeting_closing_are_you_sure: "Tem a certeza de que deseja fechar a agenda da reunião?" text_meeting_agenda_open_are_you_sure: "Isto irá gravar por cima de todas as alterações nos minutos! Pretende continuar?" text_meeting_minutes_for_meeting: 'minutos para a reunião "%{meeting}"' @@ -266,6 +347,10 @@ pt-PT: label_meeting_created_by: "Criado por" label_meeting_last_updated: "Ultima atualização" label_meeting_reload: "Recarregar" + label_meeting_index_today: "Hoje" + label_meeting_index_tomorrow: "Amanhã" + label_meeting_index_this_week: "Mais tarde nesta semana" + label_meeting_index_later: "Na próxima semana e mais tarde" label_agenda_items: "Pontos da ordem de trabalhos" label_agenda_items_reordered: "reordenados" label_agenda_item_remove: "Remover da ordem de trabalhos" @@ -291,7 +376,7 @@ pt-PT: label_meeting_state_closed: "Fechado" label_meeting_state_closed_html: "Fechada" label_meeting_state_agenda_created: "Agenda criada" - label_meeting_state_scheduled: "Agendada" + label_meeting_state_planned: "Planeada" label_meeting_state_cancelled: "Cancelada" label_meeting_state_skipped: "Ignorada" label_meeting_reopen_action: "Reabrir reunião" diff --git a/modules/meeting/config/locales/crowdin/ro.seeders.yml b/modules/meeting/config/locales/crowdin/ro.seeders.yml index 9a9cc5d9b1fb..f4572ee0690c 100644 --- a/modules/meeting/config/locales/crowdin/ro.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ro.seeders.yml @@ -7,7 +7,7 @@ ro: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/ro.yml b/modules/meeting/config/locales/crowdin/ro.yml index 2ad6b9568b2d..d43e40d76210 100644 --- a/modules/meeting/config/locales/crowdin/ro.yml +++ b/modules/meeting/config/locales/crowdin/ro.yml @@ -55,7 +55,9 @@ ro: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -117,22 +119,28 @@ ro: label_recurring_meeting_plural: "Recurring meetings" label_template: "Șablon" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + few: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -174,12 +182,29 @@ ro: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -193,12 +218,31 @@ ro: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copiat de la Întâlnire #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -206,7 +250,7 @@ ro: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -222,8 +266,9 @@ ro: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -232,6 +277,41 @@ ro: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notificare trimisă cu succes" notice_timezone_missing: Nu este setat niciun fus orar și se presupune %{zone}. Pentru a vă alege fusul orar, vă rugăm să faceți clic aici. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -253,6 +333,8 @@ ro: text_duration_in_hours: "Durata în ore" text_in_hours: "Ore" text_meeting_agenda_for_meeting: 'ordinea de zi a reuniunii "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "Acest lucru va suprascrie toate modificările din procesul-verbal! Doriți să continuați?" text_meeting_minutes_for_meeting: 'procesul-verbal al reuniunii "%{meeting}"' @@ -267,6 +349,10 @@ ro: label_meeting_created_by: "Creat de" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -292,7 +378,7 @@ ro: label_meeting_state_closed: "Închisă" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/ru.seeders.yml b/modules/meeting/config/locales/crowdin/ru.seeders.yml index e1d5455f201d..8d50213bc77a 100644 --- a/modules/meeting/config/locales/crowdin/ru.seeders.yml +++ b/modules/meeting/config/locales/crowdin/ru.seeders.yml @@ -7,7 +7,7 @@ ru: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Еженедельно meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/ru.yml b/modules/meeting/config/locales/crowdin/ru.yml index 186f2e0cc73c..c69d9927a66f 100644 --- a/modules/meeting/config/locales/crowdin/ru.yml +++ b/modules/meeting/config/locales/crowdin/ru.yml @@ -56,7 +56,9 @@ ru: frequency: "Периодичность" interval: "Промежуток" start_date: "Начинается" - end_after: "Завершение серии после" + start_time: "Время начала" + start_time_hour: "Время начала" + end_after: "Серия совещаний заканчивается" iterations: "События" errors: messages: @@ -118,22 +120,29 @@ ru: label_recurring_meeting_plural: "Повторяющиеся совещания" label_template: "Шаблон" label_recurring_meeting_view: "Посмотреть серию совещаний" - label_recurring_meeting_create: "Создать из шаблона" + label_recurring_meeting_create: "Открыть" label_recurring_meeting_copy: "Копировать как одноразовое" label_recurring_meeting_cancel: "Отменить это событие" label_recurring_meeting_delete: "Удалить событие" - label_recurring_meeting_delete_confirmation: > - Это совещание является частью серии под названием %{name}. Это приведет к удалению только этого конкретного совещания, а не всей серии. Вы хотите продолжить? - label_recurring_occurrence_delete_confirmation: > - Любая информация о совещании, не включенная в шаблон, будет потеряна. Вы хотите продолжить? label_recurring_meeting_restore: "Восстановить это событие" + label_recurring_meeting_schedule: "Расписание" + label_recurring_meeting_next_occurrence: "Следующее событие" label_recurring_meeting_more: "Есть еще %{count} запланированных совещаний (%{schedule})." + label_recurring_meeting_no_end_date: "Есть и другие запланированные совещания (%{schedule})." label_recurring_meeting_more_singular: "Есть еще %{count} запланированное совещание (%{schedule})." label_recurring_meeting_more_past: "Есть еще %{count} прошедших совещаний." label_recurring_meeting_more_past_singular: "Есть еще %{count} прошедшее совещание." label_recurring_meeting_show_more: "Показать еще" + label_recurring_meeting_series_create: "Создать серию совещаний" label_recurring_meeting_series_edit: "Изменить серию совещаний" label_recurring_meeting_series_delete: "Удалить серию совещаний" + label_recurring_meeting_series_end: "Завершить серию совещаний" + label_recurring_meeting_series_end_now: "Завершите серию сейчас" + label_meeting_more: + one: "Есть еще одно совещание." + few: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "Есть еще %{count} совещаний." label_my_meetings: "Мои совещания" label_all_meetings: "Все совещания" label_upcoming_meetings: "Предстоящие встречи" @@ -175,12 +184,29 @@ ru: Немедленно отправьте приглашение по электронной почте участникам, выбранным выше. Вы также можете сделать это вручную в любое время позже. send_invitation_emails_structured: "Отправить приглашение по электронной почте сразу всем участникам. Вы также можете сделать это вручную в любое время." open_meeting_link: "Открыть совещание" + open_my_meetings_link: "Перейти к списку моих совещаний" + series: + title: "[%{project_name}] Серия совещаний '%{title}'" + summary: "%{actor} создал новую серию совещаний '%{title}'" + series_rescheduled: + title: "[%{project_name}] Серия совещаний '%{title}' перенесена" + summary: "%{actor} изменил расписание серии совещаний '%{title}'" + old_schedule: "Старое расписание" + new_schedule: "Новое расписание" invited: - summary: "%{actor} отправил вам приглашение на совещание %{title}" + summary: "%{actor} отправил вам приглашение на совещание '%{title}'" + cancelled: + header: "Отменено: совещание '%{title}'" + header_occurrence: "Отменено: событие совещания '%{title}'" + header_series: "Отменено: серия совещаний '%{title}'" + summary_occurrence: "Событие '%{title}' было отменено %{actor}." + summary_series: "Серия совещаний '%{title}' была отменена %{actor}." + summary: "'%{title}' было отменено %{actor}." + date_time: "Запланированная дата/время" rescheduled: - header: "Встреча %{title} была перенесена" - summary: "Совещание %{title} перенесено %{actor}" - body: "Совещание %{title} было перенесено пользователем %{actor}." + header: "Совещание '%{title}' было перенесено" + summary: "Совещание '%{title}' было перенесено %{actor}" + body: "Совещание '%{title}' было перенесено %{actor}." old_date_time: "Старые дата/время" new_date_time: "Новые дата/время" label_mail_all_participants: "Отправить письмо всем участникам" @@ -194,12 +220,31 @@ ru: structured_text: "Организуйте своё совещание в виде списка пунктов повестки, при необходимости связав их с пакетом работ." structured_text_copy: "При копировании совещания в настоящее время не скопируются связанные с ним пункты повестки, будут скопированы только детали" copied: "Скопировано со встречи #%{id}" + delete_dialog: + one_time: + title: "Удалить совещание" + heading: "Удалить это совещание?" + confirmation_message_html: > + Это действие не обратимо. Пожалуйста, действуйте с осторожностью. + occurrence: + title: "Отменить это событие" + heading: "Отменить это событие?" + confirmation_message_html: > + Любая информация о совещании, не включенная в шаблон, будет потеряна. Вы хотите продолжить? + confirm_button: "Отменить событие" + blankslate: + title: "Нет совещаний для отображения" + desc: "Нет совещаний, удовлетворяющих критериям активного фильтра." meeting_section: untitled_title: "Раздел без названия" delete_confirmation: "Удаление раздела также удалит все пункты его повестки дня. Вы уверены, что хотите это сделать?" placeholder_title: "Новый раздел" empty_text: "Перенесите элементы сюда или создайте новые" recurring_meeting: + ended_blankslate: + title: "Серия совещаний закончена" + message: "Эта серия совещаний подошла к концу. Предстоящих совещаний не будет. " + action: "Вы по-прежнему можете просматривать прошедшие совещания или редактировать серию совещаний, чтобы расширить ее." occurrence: infoline: "Это совещание является частью повторяющейся серии совещаний." error_no_next: "Следующее событие для этого совещания не состоится." @@ -207,7 +252,7 @@ ru: first_created: > Первое совещание было успешно создано из шаблона. Все последующие совещания будут создаваться автоматически в момент предыдущего. template: - button_finalize: "Завершить шаблон" + button_finalize: "Открыть первое совещание" blank_title: "Ваш шаблон серии совещаний пуст" description: > Этот шаблон будет использоваться каждый раз, когда будут создаваться новые совещания в серии. Вы можете добавить в этот шаблон пункты повестки дня, участников и вложения. @@ -223,8 +268,9 @@ ru: working_days: "Каждый рабочий день" weekly: "Еженедельно" end_after: - specific_date: "конкретная дата" - iterations: "количество событий" + never: "никогда" + specific_date: "после конкретной даты" + iterations: "после нескольких событий" starts: "Начало" in_words: daily_interval: "Каждые %{interval} дней" @@ -233,6 +279,41 @@ ru: weekly_interval: "Каждые %{interval} недель в %{weekday}" frequency: "%{base} в %{time}" full: "%{base} в %{time}, заканчивается %{end_date}" + full_past: "%{base} в %{time}, закончился %{end_date}" + never_ending: "%{base} в %{time}" + open: + title: "Открыть" + subtitle: > + Открытые совещания имеют повестки дня, которые могут быть отредактированы и показаны в разделе «Мои совещания». Изменения в шаблоне серии совещаний не влияют на уже открытые совещания. + blankslate: + title: "В данный момент открытых совещаний нет" + desc: "Вы можете вручную открыть запланированное совещание, нажав на кнопку Открыть" + planned: + title: "Запланировано" + subtitle: > + Следующие совещания запланированы в расписании повторяющихся совещаний, но пока не открыты. Каждый раз, когда начинается запланированное совещание, для вас автоматически откроется следующее совещание. Вы также можете вручную открыть запланированные совещания, чтобы импортировать шаблон и начать редактировать повестку дня. + blankslate: + title: "Больше нет запланированных совещаний" + desc: > + В этой серии дополнительных совещаний не запланировано. Чтобы запланировать дополнительные совещания или продлить серию, перейдите к шаблону и отредактируйте детали, чтобы изменить дату окончания, частоту или интервал. + delete_dialog: + title: "Удалить серию совещаний" + heading: "Удалить эту серию совещаний навсегда?" + confirmation_message_html: + zero: > + Серия совещаний %{title} не содержит ни одного совещания. Серия будет удалена для всех. Пожалуйста, действуйте с осторожностью. + one: > + Удаление %{title} также удалит одно вхождение в эту серию. Это действие необратимо. Пожалуйста, действуйте с осторожностью. + other: > + Удаление %{title} удалит все %{count} вхождений в эту серию. Это действие необратимо. Пожалуйста, действуйте с осторожностью. + scheduled_delete_dialog: + title: "Отменить это событие" + heading: "Отменить это событие?" + confirmation_message_html: > + Любая информация о совещании, не включенная в шаблон, будет потеряна. Вы хотите продолжить? + confirm_button: "Отменить событие" + end_series_dialog: + title: "Завершить серию совещаний" notice_successful_notification: "Уведомление успешно отправленно" notice_timezone_missing: Не установлен часовой пояс и применена %{zone}. Чтобы выбрать часовой пояс, пожалуйста, нажмите сюда. notice_meeting_updated: "Эта страница была обновлена кем-то другим. Перезагрузите страницу, чтобы просмотреть изменения." @@ -254,6 +335,8 @@ ru: text_duration_in_hours: "Длительность в часах" text_in_hours: "в часах" text_meeting_agenda_for_meeting: 'Повестка дня встречи «%{meeting}»' + text_meeting_series_end_early_heading: "Удалить будущие события?" + text_meeting_series_end_early: "Завершение серии удалит любые будущие открытые или запланированные события совещания" text_meeting_closing_are_you_sure: "Вы уверены, что хотите закрыть повестку дня собрания?" text_meeting_agenda_open_are_you_sure: "Все изменения в протоколах будут перезаписаны! Продолжить?" text_meeting_minutes_for_meeting: 'Протокол совещания «%{meeting}»' @@ -268,6 +351,10 @@ ru: label_meeting_created_by: "Автор" label_meeting_last_updated: "Последнее обновление" label_meeting_reload: "Перезагрузить" + label_meeting_index_today: "Сегодня" + label_meeting_index_tomorrow: "Завтра" + label_meeting_index_this_week: "Позже на этой неделе" + label_meeting_index_later: "На следующей неделе и позже" label_agenda_items: "Пункты повестки" label_agenda_items_reordered: "переупорядочено" label_agenda_item_remove: "Удалить из повестки" @@ -293,7 +380,7 @@ ru: label_meeting_state_closed: "Закрыть" label_meeting_state_closed_html: "Закрытый" label_meeting_state_agenda_created: "Повестка дня создана" - label_meeting_state_scheduled: "Запланировано" + label_meeting_state_planned: "Запланированно" label_meeting_state_cancelled: "Отменено" label_meeting_state_skipped: "Пропущено" label_meeting_reopen_action: "Открыть совещание заново" diff --git a/modules/meeting/config/locales/crowdin/rw.seeders.yml b/modules/meeting/config/locales/crowdin/rw.seeders.yml index e15b6d933998..0b6ea3768146 100644 --- a/modules/meeting/config/locales/crowdin/rw.seeders.yml +++ b/modules/meeting/config/locales/crowdin/rw.seeders.yml @@ -7,7 +7,7 @@ rw: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/rw.yml b/modules/meeting/config/locales/crowdin/rw.yml index 8e8e96b30ddb..1c7e48a5e188 100644 --- a/modules/meeting/config/locales/crowdin/rw.yml +++ b/modules/meeting/config/locales/crowdin/rw.yml @@ -54,7 +54,9 @@ rw: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ rw: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ rw: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ rw: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ rw: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ rw: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ rw: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ rw: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ rw: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ rw: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/si.seeders.yml b/modules/meeting/config/locales/crowdin/si.seeders.yml index 73ecfd8b44db..d056b99f1d01 100644 --- a/modules/meeting/config/locales/crowdin/si.seeders.yml +++ b/modules/meeting/config/locales/crowdin/si.seeders.yml @@ -7,7 +7,7 @@ si: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/si.yml b/modules/meeting/config/locales/crowdin/si.yml index 02fd65d33bae..81e950d6b9e2 100644 --- a/modules/meeting/config/locales/crowdin/si.yml +++ b/modules/meeting/config/locales/crowdin/si.yml @@ -54,7 +54,9 @@ si: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ si: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ si: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ si: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ si: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ si: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ si: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ si: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ si: label_meeting_created_by: "විසින් නිර්මාණය" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ si: label_meeting_state_closed: "වසා" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/sk.seeders.yml b/modules/meeting/config/locales/crowdin/sk.seeders.yml index 1ad8687fd01c..14f8e54d560c 100644 --- a/modules/meeting/config/locales/crowdin/sk.seeders.yml +++ b/modules/meeting/config/locales/crowdin/sk.seeders.yml @@ -7,7 +7,7 @@ sk: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/sk.yml b/modules/meeting/config/locales/crowdin/sk.yml index 37bfeebcffb4..15c13161d507 100644 --- a/modules/meeting/config/locales/crowdin/sk.yml +++ b/modules/meeting/config/locales/crowdin/sk.yml @@ -56,7 +56,9 @@ sk: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -118,22 +120,29 @@ sk: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + few: "There are %{count} more meetings." + many: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -175,12 +184,29 @@ sk: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -194,12 +220,31 @@ sk: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -207,7 +252,7 @@ sk: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -223,8 +268,9 @@ sk: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -233,6 +279,41 @@ sk: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notifikácia úspešne odoslaná" notice_timezone_missing: Časové pásmo nebolo špecificky nastavené, použilo sa teda %{zone}. Ak chcete vybrať iné časové pásmo, kliknite prosím tu. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -254,6 +335,8 @@ sk: text_duration_in_hours: "Doba trvania v hodinách" text_in_hours: "v hodinách" text_meeting_agenda_for_meeting: 'agenda stretnutia "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'zápisnica zo stretnutia "%{meeting}"' @@ -268,6 +351,10 @@ sk: label_meeting_created_by: "Vytvoril(a)" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -293,7 +380,7 @@ sk: label_meeting_state_closed: "Zatvorený" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/sl.seeders.yml b/modules/meeting/config/locales/crowdin/sl.seeders.yml index fe5175125a07..76a449b4ee10 100644 --- a/modules/meeting/config/locales/crowdin/sl.seeders.yml +++ b/modules/meeting/config/locales/crowdin/sl.seeders.yml @@ -7,7 +7,7 @@ sl: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/sl.yml b/modules/meeting/config/locales/crowdin/sl.yml index afb2eceb1cdf..1c139adeface 100644 --- a/modules/meeting/config/locales/crowdin/sl.yml +++ b/modules/meeting/config/locales/crowdin/sl.yml @@ -56,7 +56,9 @@ sl: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -118,22 +120,29 @@ sl: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + two: "There are %{count} more meetings." + few: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -175,12 +184,29 @@ sl: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -194,12 +220,31 @@ sl: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Kopirano iz sestanka #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -207,7 +252,7 @@ sl: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -223,8 +268,9 @@ sl: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -233,6 +279,41 @@ sl: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Obvestila uspešno poslana" notice_timezone_missing: Časovni pas ni določen, %{zone} je izbran avtomatsko. Za določitev časovnega pasu kliknite tukaj. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -254,6 +335,8 @@ sl: text_duration_in_hours: "Trajanje v urah" text_in_hours: "v urah" text_meeting_agenda_for_meeting: 'dnevni red za sestanek "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "To bo prepisalo vse spremembe v zapisniku! Ali želite nadaljevati?" text_meeting_minutes_for_meeting: 'zapisnik za sestanek "%{meeting}"' @@ -268,6 +351,10 @@ sl: label_meeting_created_by: "Ustvaril" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -293,7 +380,7 @@ sl: label_meeting_state_closed: "Zaprto" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/sr.seeders.yml b/modules/meeting/config/locales/crowdin/sr.seeders.yml index e9d0c9610b0c..0b6af21063b1 100644 --- a/modules/meeting/config/locales/crowdin/sr.seeders.yml +++ b/modules/meeting/config/locales/crowdin/sr.seeders.yml @@ -7,7 +7,7 @@ sr: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/sr.yml b/modules/meeting/config/locales/crowdin/sr.yml index a762a2585550..1e6da70b1276 100644 --- a/modules/meeting/config/locales/crowdin/sr.yml +++ b/modules/meeting/config/locales/crowdin/sr.yml @@ -55,7 +55,9 @@ sr: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -117,22 +119,28 @@ sr: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + few: "There are %{count} more meetings." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -174,12 +182,29 @@ sr: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -193,12 +218,31 @@ sr: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -206,7 +250,7 @@ sr: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -222,8 +266,9 @@ sr: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -232,6 +277,41 @@ sr: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -253,6 +333,8 @@ sr: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -267,6 +349,10 @@ sr: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -292,7 +378,7 @@ sr: label_meeting_state_closed: "Zatvoreno" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/sv.seeders.yml b/modules/meeting/config/locales/crowdin/sv.seeders.yml index 70eb1710c233..28568854dec7 100644 --- a/modules/meeting/config/locales/crowdin/sv.seeders.yml +++ b/modules/meeting/config/locales/crowdin/sv.seeders.yml @@ -7,7 +7,7 @@ sv: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/sv.yml b/modules/meeting/config/locales/crowdin/sv.yml index 796945aac755..eb184252a85e 100644 --- a/modules/meeting/config/locales/crowdin/sv.yml +++ b/modules/meeting/config/locales/crowdin/sv.yml @@ -54,7 +54,9 @@ sv: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ sv: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Kommande möten" @@ -173,12 +180,29 @@ sv: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ sv: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Kopierat från möte #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ sv: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ sv: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ sv: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Underrättelse skickades" notice_timezone_missing: Ingen tidszon angiven och %{zone} antas. För att välja din tidszon, vänligen klicka här. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ sv: text_duration_in_hours: "Varaktighet i timmar" text_in_hours: "i timmar" text_meeting_agenda_for_meeting: 'agenda för mötet "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Är du säker på att du vill stänga möteskalendern?" text_meeting_agenda_open_are_you_sure: "Detta kommer att skriva över alla ändringar i anteckningarna! Vill du fortsätta?" text_meeting_minutes_for_meeting: 'protokollet för mötet "%{meeting}"' @@ -266,6 +347,10 @@ sv: label_meeting_created_by: "Skapad av" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ sv: label_meeting_state_closed: "Stängt" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/th.seeders.yml b/modules/meeting/config/locales/crowdin/th.seeders.yml index 34e747637bd7..7b05d8ad2a74 100644 --- a/modules/meeting/config/locales/crowdin/th.seeders.yml +++ b/modules/meeting/config/locales/crowdin/th.seeders.yml @@ -7,7 +7,7 @@ th: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/th.yml b/modules/meeting/config/locales/crowdin/th.yml index 1aab4c8b87a4..40d73c32259b 100644 --- a/modules/meeting/config/locales/crowdin/th.yml +++ b/modules/meeting/config/locales/crowdin/th.yml @@ -53,7 +53,9 @@ th: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -115,22 +117,26 @@ th: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -172,12 +178,29 @@ th: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -191,12 +214,31 @@ th: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -204,7 +246,7 @@ th: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -220,8 +262,9 @@ th: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -230,6 +273,41 @@ th: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -251,6 +329,8 @@ th: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -265,6 +345,10 @@ th: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -290,7 +374,7 @@ th: label_meeting_state_closed: "ปิดไปแล้ว" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/tr.seeders.yml b/modules/meeting/config/locales/crowdin/tr.seeders.yml index 7ea7bc6d60b0..a3175a5dd66a 100644 --- a/modules/meeting/config/locales/crowdin/tr.seeders.yml +++ b/modules/meeting/config/locales/crowdin/tr.seeders.yml @@ -7,23 +7,23 @@ tr: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Haftalık meeting_agenda_items: item_0: title: Güzel haberlerimiz var! item_1: - title: Geliştirme ekibinden ilerlemeler + title: Geliştirme ekibinden gelişmeler item_2: - title: Üretim ekibinden ilerlemeler + title: Üretim ekibinden gelişmeler item_3: - title: Pazarlama ekibinden ilerlemeler + title: Pazarlama ekibinden gelişmeler item_5: - title: Satış ekibinden ilerlemeler + title: Satış ekibinden gelişmeler item_6: - title: Çeyrek bazlı hedefleri gözden geçir + title: Çeyrek bazlı hedefleri gözden geçirilmesi item_7: - title: Core values feedback + title: Temel değerler geri bildirimi item_8: title: Genel başlıklar diff --git a/modules/meeting/config/locales/crowdin/tr.yml b/modules/meeting/config/locales/crowdin/tr.yml index 68814d129d18..872863fdaaf1 100644 --- a/modules/meeting/config/locales/crowdin/tr.yml +++ b/modules/meeting/config/locales/crowdin/tr.yml @@ -54,7 +54,9 @@ tr: frequency: "Sıklık" interval: "Zaman aralığı" start_date: "Başlama zamanı" - end_after: "Sonrasında seriyi sonlandırın" + start_time: "Başlangıç zamanı" + start_time_hour: "Başlangıç zamanı" + end_after: "Toplantı serisi bitişi" iterations: "Yineleme sayısı" errors: messages: @@ -62,8 +64,8 @@ tr: models: recurring_meeting: "Yinelenen toplantı" structured_meeting: "Tek seferlik toplantı" - meeting_agenda_item: "Ajanda öğesi" - meeting_agenda: "Ajanda" + meeting_agenda_item: "Gündem maddesi" + meeting_agenda: "Gündem" meeting_minutes: "Dakika" meeting_section: "Bölüm" activity: @@ -100,7 +102,7 @@ tr: label_meeting_create: "Toplantı oluştur" label_meeting_copy: "Toplantıyı kopyala" label_meeting_edit: "Toplantıyı Düzenle" - label_meeting_agenda: "Ajanda" + label_meeting_agenda: "Gündem" label_meeting_minutes: "Dakika" label_meeting_close: "Kapat" label_meeting_open: "Aç" @@ -116,22 +118,27 @@ tr: label_recurring_meeting_plural: "Yinelenen toplantı" label_template: "Şablon" label_recurring_meeting_view: "Toplantı serisini görüntüle" - label_recurring_meeting_create: "Şablondan oluştur" + label_recurring_meeting_create: "Açık" label_recurring_meeting_copy: "Tek seferlik olarak kopyalayın" label_recurring_meeting_cancel: "Bu etklinliği iptal et" label_recurring_meeting_delete: "İptal et" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" - label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_schedule: "Planla" + label_recurring_meeting_next_occurrence: "Sonraki gerçekleşme" + label_recurring_meeting_more: "%{count} ek planlanmış toplantı bulunmaktadır (%{schedule})." + label_recurring_meeting_no_end_date: "Daha fazla planlanmış toplantı var (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Daha fazlasını göster" + label_recurring_meeting_series_create: "Toplantı serisi oluştur" label_recurring_meeting_series_edit: "Toplantı serisini düzenle" label_recurring_meeting_series_delete: "Toplantı serisini sil" + label_recurring_meeting_series_end: "Toplantı serisinin sonu" + label_recurring_meeting_series_end_now: "Seriyi şimdi sonlandırın" + label_meeting_more: + one: "Bir toplantı daha var." + other: "%{count} toplantı daha var." label_my_meetings: "Toplantılarım" label_all_meetings: "Tüm toplantılar" label_upcoming_meetings: "Yaklaşan toplantılar" @@ -155,7 +162,7 @@ tr: label_start_date: "Başlama tarihi" meeting: participants: - template: "These participants will be invited automatically to all future meetings as they are created." + template: "Oluşturuldukça bu katılımcılar, gelecekteki tüm toplantılara otomatik olarak davet edilecektir." attachments: template: "These attached files will be included in all future meetings in the series." text: "Eklenen dosyalar tüm katılımcıların paylaşımına açıktır. Bu dosyaları ajandanıza sürükleyip bırakabilirsiniz." @@ -173,15 +180,32 @@ tr: Yukarıda seçilen katılımcıların hepsine e-posta davetiyesi gönder. Bu işi daha sonra herhangi bir zamanda elle de gerçekleştirebilirsiniz. send_invitation_emails_structured: "Tüm katılımcılara e-posta ile davetiye gönder. Bu işlemi daha sonra herhangi bir zamanda elle de gerçekleştirebilirsiniz." open_meeting_link: "Açık toplantı" + open_my_meetings_link: "Toplantılarıma git" + series: + title: "[%{project_name}] Toplantı serisi '%{title}'" + summary: "%{actor} yeni bir toplantı serisi başlattı '%{title}'" + series_rescheduled: + title: "[%{project_name}] Toplantı serisi '%{title}' yeniden planlandı" + summary: "%{actor} toplantı serisinin programını değiştirdi '%{title}'" + old_schedule: "Eski plan" + new_schedule: "Yeni plan" invited: - summary: "%{actor} size toplantı için bir davetiye gönderdi %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "İptal edildi: Toplantı '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' %{actor} tarafından iptal edilmiştir." + date_time: "Planlanan tarih/saat" rescheduled: - header: "%{title} toplantısı yeniden planlandı" - summary: "%{title} toplantısı %{actor} tarafından yeniden planlanmıştır." - body: "%{title} toplantısı %{actor} tarafından yeniden planlanmıştır." + header: "'%{title}' toplantısı yeniden planlandı" + summary: "'%{title}' toplantısı %{actor} tarafından yeniden planlandı" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Eski tarih/saat" new_date_time: "Yeni tarih/saat" - label_mail_all_participants: "Tüm katılımcılara e-posta gönderin" + label_mail_all_participants: "Tüm katılımcılara e-posta gönder" types: classic: "Klasik" classic_text: "Toplantınızı biçimlendirilebilir bir metin gündemi ve protokolüyle düzenleyin." @@ -192,20 +216,39 @@ tr: structured_text: "Toplantınızı dinamik bir gündem maddeleri listesi olarak düzenleyin ve isteğe bağlı olarak bunları bir iş paketine bağlayın." structured_text_copy: "Toplantıyı kopyalamak toplantıyla ilgili ajanda maddelerini kopyalamayacaktır, sadece detaylar kopyalanacak" copied: "#%{id} numaralı toplantıdan kopyalandı" + delete_dialog: + one_time: + title: "Toplantıyı sil" + heading: "Bu toplantı silinsin mi?" + confirmation_message_html: > + Bu işlem geri döndürülemez. Lütfen dikkatli olun. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Bu etklinliği iptal et" + blankslate: + title: "Gösterilecek toplantı yok" + desc: "Aktif filtre kriterlerini karşılayan herhangi bir toplantı bulunmamaktadır." meeting_section: untitled_title: "İsimsiz bölüm" delete_confirmation: "Bölümün silinmesi tüm gündem maddelerini de silecektir. Bunu yapmak istediğinizden emin misiniz?" placeholder_title: "Yeni bölüm" empty_text: "Maddeleri buraya sürükleyin ya da yeni bir tane oluşturun" recurring_meeting: + ended_blankslate: + title: "Toplantı serisi sona erdi" + message: "Bu toplantı serisi sona ermiştir. Gelecek toplantı yoktur. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." - error_no_next: "There is no next occurrence for this meeting." + error_no_next: "Bu seri için bir toplantı yoktur." first_already_exists: "The first occurrence of this meeting series is already instantiated." first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Bitiş şablonu" + button_finalize: "İlk toplantıyı aç" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ tr: working_days: "Her iş günü" weekly: "Haftalık" end_after: - specific_date: "belirli bir tarih" - iterations: "a number of occurrences" + never: "hiçbir zaman" + specific_date: "belirli bir tarihten sonra" + iterations: "birkaç terkrardan sonra" starts: "Starts" in_words: daily_interval: "Her %{interval} günde" @@ -231,6 +275,41 @@ tr: weekly_interval: "Her %{interval} haftada bir %{weekday} günleri" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Açık" + subtitle: > + Açık toplantıların düzenlenebilen gündemleri vardır ve bireysel kullanıcıların 'Toplantılarım' bölümünde gösterilir. Toplantı serisi şablonunda yapılan değişiklikler halihazırda açık olan toplantıları etkilemez. + blankslate: + title: "Şu anda açık toplantı yok" + desc: "Aşağıdaki 'Aç' düğmesine tıklayarak planlanmış bir toplantıyı elle açabilirsiniz" + planned: + title: "Planlandı" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "Artık planlı toplantı yok" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Toplantı serisini sil" + heading: "Bu toplantı serisi kalıcı olarak silinsin mi?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Bu toplantıyı iptal et" + heading: "Sadece bu toplantı mı iptal edilsin?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Bu toplantıyı iptal et" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Bildirim başarıyla gönderildi" notice_timezone_missing: Saat dilimi ayarlanmadı ve %{zone} kabul edildi. Saat dilimini seçmek için lütfen buraya tıklayın. notice_meeting_updated: "Bu sayfa başka biri tarafından güncellendi. Değişiklikleri görmek için yeniden yükleyin." @@ -250,14 +329,16 @@ tr: permission_send_meeting_agendas_icalendar: "Toplantı gündemini takvim girişi olarak gönderme" project_module_meetings: "Toplantılar" text_duration_in_hours: "Saat süresi" - text_in_hours: "saatlerde" + text_in_hours: "saat olarak" text_meeting_agenda_for_meeting: 'toplantı gündemi "%{meeting}"' + text_meeting_series_end_early_heading: "Gelecekteki toplantılar silinsin mi?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Toplantı ajandasını kapatmak istediğinizden emin misiniz?" text_meeting_agenda_open_are_you_sure: "Bu, dakikalardaki tüm değişikliklerin üzerine yazacaktır! Devam etmek istiyor musun?" text_meeting_minutes_for_meeting: 'toplantı için dakikalar "%{meeting}"' text_notificiation_invited: "Bu posta, aşağıdaki toplantı için bir ics girişi içermektedir:" text_meeting_empty_heading: "Toplantınız boş" - text_meeting_empty_description_1: "Ajanda maddelerini aşağıya ekleyerek başlayın. Her bir madde sadece başlık içerecek kadar basit olabilir ama toplantı süresi ve notları gibi ek detaylar da ekleyebilirsiniz." + text_meeting_empty_description_1: "Gündem maddelerini aşağıya ekleyerek başlayın. Her bir madde sadece başlık içerecek kadar basit olabilir ama toplantı süresi ve notları gibi ek detaylar da ekleyebilirsiniz." text_meeting_empty_description_2: 'Ayrıca mevcut iş parçalarına referans ekleyebilirsiniz. Bu takdirde, ilişkili notlar iş parçacığının "Toplantılar" sekmesine eklenecektir.' label_meeting_empty_action: "Gündem maddesi ekle" label_meeting_actions: "Toplantı eylemleri" @@ -266,19 +347,23 @@ tr: label_meeting_created_by: "Oluşturan" label_meeting_last_updated: "Son güncelleme" label_meeting_reload: "Yeniden yükle" + label_meeting_index_today: "Bugün" + label_meeting_index_tomorrow: "Yarın" + label_meeting_index_this_week: "Bu hafta içinde" + label_meeting_index_later: "Gelecek hafta ve daha sonra" label_agenda_items: "Gündem maddeleri" label_agenda_items_reordered: "yeniden sıralandı" - label_agenda_item_remove: "Ajandadan kaldır" + label_agenda_item_remove: "Gündemden çıkarıldı" label_agenda_item_undisclosed_wp: "#%{id} numaralı iş parçası görünmez" label_agenda_item_deleted_wp: "Silinmiş iş parçsına referans" - label_agenda_item_actions: "Ajanda maddeleri için eylemler" + label_agenda_item_actions: "Gündem maddeleri için eylemler" label_agenda_item_move_to_top: "En üste taşı" label_agenda_item_move_to_bottom: "En aşağı taşı" label_agenda_item_move_up: "Yukarı taşı" label_agenda_item_move_down: "Aşağı taşı" label_agenda_item_add_notes: "Not eklemek" - label_agenda_item_work_package: "Ajanda maddesinin iş parçası" - text_agenda_item_title: 'Ajanda maddesi %{title}"' + label_agenda_item_work_package: "Gündem maddesinin iş parçası" + text_agenda_item_title: 'Gündem maddesi %{title}"' text_agenda_work_package_deleted: 'Silinen iş parçası için ajanda maddesi' text_deleted_agenda_item: 'Silinen ajanda maddesi' label_initial_meeting_details: "Toplantı" @@ -291,7 +376,7 @@ tr: label_meeting_state_closed: "Kapalı" label_meeting_state_closed_html: "Kapalı" label_meeting_state_agenda_created: "Gündem oluşturuldu" - label_meeting_state_scheduled: "Zamanlandı" + label_meeting_state_planned: "Planlanmış" label_meeting_state_cancelled: "İptal edildi" label_meeting_state_skipped: "Atlandı" label_meeting_reopen_action: "Toplantıyı tekrar aç" diff --git a/modules/meeting/config/locales/crowdin/uk.seeders.yml b/modules/meeting/config/locales/crowdin/uk.seeders.yml index 4abc915c2e96..3c0ab3da5dff 100644 --- a/modules/meeting/config/locales/crowdin/uk.seeders.yml +++ b/modules/meeting/config/locales/crowdin/uk.seeders.yml @@ -7,7 +7,7 @@ uk: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Щотижня meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/uk.yml b/modules/meeting/config/locales/crowdin/uk.yml index f43294493c8b..0a640d67605f 100644 --- a/modules/meeting/config/locales/crowdin/uk.yml +++ b/modules/meeting/config/locales/crowdin/uk.yml @@ -56,7 +56,9 @@ uk: frequency: "Частота" interval: "Інтервал" start_date: "Починається" - end_after: "Завершення серії після" + start_time: "Час початку" + start_time_hour: "Час початку" + end_after: "Серія нарад завершується" iterations: "Повторення" errors: messages: @@ -118,22 +120,29 @@ uk: label_recurring_meeting_plural: "Повторювані наради" label_template: "Шаблон" label_recurring_meeting_view: "Переглянути серію нарад" - label_recurring_meeting_create: "Створити на основі шаблона" + label_recurring_meeting_create: "Відкрити" label_recurring_meeting_copy: "Копіювати як одноразову" label_recurring_meeting_cancel: "Скасувати це повторення" label_recurring_meeting_delete: "Видалити повторення" - label_recurring_meeting_delete_confirmation: > - Ця нарада належить до серії з назвою %{name}. Буде видалено лише це повторення, а не всю серію. Продовжити? - label_recurring_occurrence_delete_confirmation: > - Будь-яку інформацію про нараду, відсутню в шаблоні, буде втрачено. Продовжити? label_recurring_meeting_restore: "Відновити це повторення" + label_recurring_meeting_schedule: "Розклад" + label_recurring_meeting_next_occurrence: "Наступна нарада серії" label_recurring_meeting_more: "Є інші (%{count}) заплановані наради (%{schedule})." + label_recurring_meeting_no_end_date: "Є інші заплановані наради (%{schedule})." label_recurring_meeting_more_singular: "Є ще %{count} запланована нарада (%{schedule})." label_recurring_meeting_more_past: "Є інші (%{count}) завершені наради." label_recurring_meeting_more_past_singular: "Є ще %{count} завершена нарада." label_recurring_meeting_show_more: "Показати більше" + label_recurring_meeting_series_create: "Створити серію нарад" label_recurring_meeting_series_edit: "Редагувати серію нарад" label_recurring_meeting_series_delete: "Видалити серію нарад" + label_recurring_meeting_series_end: "Завершити серію нарад" + label_recurring_meeting_series_end_now: "Завершити серію зараз" + label_meeting_more: + one: "Є ще одна нарада." + few: "Є ще %{count} наради." + many: "Є ще %{count} нарад." + other: "Є ще %{count} наради." label_my_meetings: "Мої наради" label_all_meetings: "Усі наради" label_upcoming_meetings: "Майбутні заходи" @@ -175,12 +184,29 @@ uk: Надішліть запрошення електронною поштою вибраним вище учасникам. Це можна будь-коли зробити вручну. send_invitation_emails_structured: "Надішліть запрошення електронною поштою одразу всім учасникам. Це можна будь-коли зробити вручну." open_meeting_link: "Відкрити зустріч" + open_my_meetings_link: "Перейдіть до Моїх нарад" + series: + title: "[%{project_name}] – серія нарад «%{title}»" + summary: "%{actor} створив(-ла) нову серію нарад «%{title}»" + series_rescheduled: + title: "[%{project_name}] – запланований час серії нарад «%{title}» змінено" + summary: "%{actor} змінив(-ла) запланований час серії нарад «%{title}»" + old_schedule: "Старий розклад" + new_schedule: "Новий розклад" invited: - summary: "%{actor} надіслав запрошення на зустріч %{title}" + summary: "%{actor} надіслав(-ла) вам запрошення на нараду «%{title}»" + cancelled: + header: "Скасовано: нарада «%{title}»" + header_occurrence: "Скасовано: нарада серії «%{title}»" + header_series: "Скасовано: серія нарад «%{title}»" + summary_occurrence: "Нараду серії %{title} скасував(-ла) %{actor}." + summary_series: "Серію нарад «%{title}» скасував(-ла) %{actor}." + summary: "«%{title}» скасував(-ла) %{actor}." + date_time: "Заплановані дата/час" rescheduled: - header: "Запланований час наради %{title} змінено" - summary: "Зустріч %{title} перепланована %{actor}" - body: "Зустріч %{title} перепланована %{actor}" + header: "Запланований час наради «%{title}» змінено" + summary: "Запланований час наради «%{title}» змінив(-ла) %{actor}" + body: "Запланований час наради «%{title}» змінив(-ла) %{actor}." old_date_time: "Стара дата/час" new_date_time: "Нова дата/час" label_mail_all_participants: "Надіслати лист усім учасникам" @@ -194,12 +220,31 @@ uk: structured_text: "Упорядкуйте нараду у вигляді динамічного переліку пунктів порядку денного, за бажанням пов’язавши їх із пакетом робіт." structured_text_copy: "Зараз копіювання наради стосується лише докладних даних про неї, але не пов’язаних пунктів її порядку денного" copied: "Скопійовано з наради #%{id} " + delete_dialog: + one_time: + title: "Видалити нараду" + heading: "Видалити цю нараду?" + confirmation_message_html: > + Зверніть увагу: цю дію не можна відмінити. + occurrence: + title: "Скасувати нараду серії" + heading: "Скасувати цю нараду серії?" + confirmation_message_html: > + Будь-яку інформацію про нараду, відсутню в шаблоні, буде втрачено. Продовжити? + confirm_button: "Скасувати нараду" + blankslate: + title: "Немає нарад" + desc: "Немає нарад, які відповідають критеріям активного фільтра." meeting_section: untitled_title: "Розділ без назви" delete_confirmation: "Видалення цього розділу також призведе до видалення його елементів порядку денного. Ви впевнені?" placeholder_title: "Новий розділ" empty_text: "Перетягніть елементи сюди або створіть новий" recurring_meeting: + ended_blankslate: + title: "Серія нарад завершилася" + message: "Ця серія нарад завершилася. Запланованих нарад немає. " + action: "Ви все одно можете переглянути завершені наради або відредагувати серію нарад, щоб продовжити її." occurrence: infoline: "Ця нарада належить до серії повторюваних нарад." error_no_next: "Це одноразова нарада." @@ -207,7 +252,7 @@ uk: first_created: > Першу нараду створено на основі шаблона. Усі наступні наради створюватимуться автоматично в момент початку попередніх. template: - button_finalize: "Завершити шаблон" + button_finalize: "Відкрити першу нараду" blank_title: "Ваш шаблон серії нарад порожній" description: > Цей шаблон використовуватиметься щоразу, коли створюватимуться нові наради в серії. Ви можете додавати до нього пункти порядку денного, учасників і вкладення. @@ -223,8 +268,9 @@ uk: working_days: "Кожен робочий день" weekly: "Щотижня" end_after: - specific_date: "конкретна дата" - iterations: "кількість повторень" + never: "ніколи" + specific_date: "після конкретної дати" + iterations: "після певної кількості подій" starts: "Починається" in_words: daily_interval: "Через %{interval} дн." @@ -233,6 +279,41 @@ uk: weekly_interval: "Через %{interval} тижн. у %{weekday}" frequency: "%{base} о %{time}" full: "%{base} о %{time}, закінчується %{end_date}" + full_past: "%{base} о %{time}, завершено %{end_date}" + never_ending: "%{base} о %{time}" + open: + title: "Відкриті" + subtitle: > + Відкриті наради мають порядок денний, який можна редагувати і який відображається в розділі «Мої наради» для окремих користувачів. Зміни в шаблоні серії нарад не впливають на вже відкриті наради. + blankslate: + title: "Зараз немає відкритих нарад" + desc: "Ви можете вручну відкрити заплановану нараду, натиснувши кнопку «Відкрити» нижче" + planned: + title: "Заплановані" + subtitle: > + Наступні наради в серії повторюваної наради заплановані, але не відкриті. Щоразу, коли починається запланована нарада, автоматично відкривається наступна. Ви також можете відкрити заплановані наради вручну, щоб імпортувати шаблон і почати редагування порядку денного. + blankslate: + title: "Запланованих нарад більше немає" + desc: > + У цій серії більше немає запланованих нарад. Щоб запланувати додаткові наради або продовжити серію, відкрийте шаблон і відредагуйте деталі наради, змінивши її дату завершення, частоту або інтервал. + delete_dialog: + title: "Видалити серію нарад" + heading: "Назавжди видалити цю серію нарад?" + confirmation_message_html: + zero: > + Серія нарад %{title} не містить жодних нарад. Зверніть увагу: її буде видалено для всіх. + one: > + Якщо видалити %{title}, буде також видалено одну нараду в цій серії. Зверніть увагу: цю дію не можна відмінити. + other: > + Якщо видалити %{title}, буде видалено всі наради (%{count}) у цій серії. Зверніть увагу: цю дію не можна відмінити. + scheduled_delete_dialog: + title: "Скасувати нараду серії" + heading: "Скасувати цю нараду серії?" + confirmation_message_html: > + Будь-яку інформацію про нараду, відсутню в шаблоні, буде втрачено. Продовжити? + confirm_button: "Скасувати нараду" + end_series_dialog: + title: "Завершити серію нарад" notice_successful_notification: "Повідомлення успішно надіслано" notice_timezone_missing: Часовий пояс не встановлено і %{zone} передбачається. Щоб вибрати часовий пояс, натисніть тут. notice_meeting_updated: "Цю сторінку оновив інший користувач. Перезавантажте її, щоб побачити зміни." @@ -254,6 +335,8 @@ uk: text_duration_in_hours: "Тривалість у годинах" text_in_hours: "у годинах" text_meeting_agenda_for_meeting: 'порядку денного засідання %{meeting}' + text_meeting_series_end_early_heading: "Видалити майбутні наради серії?" + text_meeting_series_end_early: "Завершення серії призведе до видалення всіх наступних відкритих або запланованих нарад" text_meeting_closing_are_you_sure: "Справді закрити порядок денний заходу?" text_meeting_agenda_open_are_you_sure: "Це вмить призведе до виправлення усіх змін! Бажаєте продовжити?" text_meeting_minutes_for_meeting: 'протокол засідання %{meeting}' @@ -268,6 +351,10 @@ uk: label_meeting_created_by: "Створено " label_meeting_last_updated: "Востаннє оновлено" label_meeting_reload: "Перезавантажити" + label_meeting_index_today: "Сьогодні" + label_meeting_index_tomorrow: "Завтра" + label_meeting_index_this_week: "Пізніше цього тижня" + label_meeting_index_later: "Наступного тижня й пізніше" label_agenda_items: "Пункти порядку денного" label_agenda_items_reordered: "перевпорядковано" label_agenda_item_remove: "Зняти з порядку денного" @@ -293,7 +380,7 @@ uk: label_meeting_state_closed: "Закрито" label_meeting_state_closed_html: "Закрита" label_meeting_state_agenda_created: "Порядок денний створено" - label_meeting_state_scheduled: "Заплановано" + label_meeting_state_planned: "Заплановані" label_meeting_state_cancelled: "Скасовано" label_meeting_state_skipped: "Пропущено" label_meeting_reopen_action: "Відкрити зустріч знову" diff --git a/modules/meeting/config/locales/crowdin/uz.seeders.yml b/modules/meeting/config/locales/crowdin/uz.seeders.yml index 5169c0db3c75..1f5c24910fe1 100644 --- a/modules/meeting/config/locales/crowdin/uz.seeders.yml +++ b/modules/meeting/config/locales/crowdin/uz.seeders.yml @@ -7,7 +7,7 @@ uz: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: Weekly meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/uz.yml b/modules/meeting/config/locales/crowdin/uz.yml index 69b52a3c49e0..2b60f1e3ac7e 100644 --- a/modules/meeting/config/locales/crowdin/uz.yml +++ b/modules/meeting/config/locales/crowdin/uz.yml @@ -54,7 +54,9 @@ uz: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -116,22 +118,27 @@ uz: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. This will only delete this particular occurrence and not the entire series. Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -173,12 +180,29 @@ uz: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -192,12 +216,31 @@ uz: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" delete_confirmation: "Deleting the section will also delete all of its agenda items. Are you sure you want to do this?" placeholder_title: "New section" empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -205,7 +248,7 @@ uz: first_created: > The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. You can add agenda items, participants, and attachments to this template. @@ -221,8 +264,9 @@ uz: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -231,6 +275,41 @@ uz: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. notice_meeting_updated: "This page has been updated by someone else. Reload to view changes." @@ -252,6 +331,8 @@ uz: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -266,6 +347,10 @@ uz: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" label_agenda_item_remove: "Remove from agenda" @@ -291,7 +376,7 @@ uz: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/locales/crowdin/vi.seeders.yml b/modules/meeting/config/locales/crowdin/vi.seeders.yml index 8863f3d74bc9..d17b556c4eaa 100644 --- a/modules/meeting/config/locales/crowdin/vi.seeders.yml +++ b/modules/meeting/config/locales/crowdin/vi.seeders.yml @@ -7,9 +7,9 @@ vi: standard: projects: demo-project: - meetings: + meeting_series: item_0: - title: Hàng tuần + title: Weekly meeting_agenda_items: item_0: title: Tin tốt diff --git a/modules/meeting/config/locales/crowdin/vi.yml b/modules/meeting/config/locales/crowdin/vi.yml index e91cf79d2b29..6f9cab8378c9 100644 --- a/modules/meeting/config/locales/crowdin/vi.yml +++ b/modules/meeting/config/locales/crowdin/vi.yml @@ -53,7 +53,9 @@ vi: frequency: "Tần suất" interval: "Khoảng thời gian" start_date: "Bắt đầu vào" - end_after: "Kết thúc chuỗi sau" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Kết thúc chuỗi họp" iterations: "Số lần xuất hiện" errors: messages: @@ -115,22 +117,26 @@ vi: label_recurring_meeting_plural: "Họp định kỳ" label_template: "Mẫu" label_recurring_meeting_view: "Xem chuỗi các cuộc họp" - label_recurring_meeting_create: "Tạo từ mẫu" - label_recurring_meeting_copy: "Sao một lần" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Hủy lần này" label_recurring_meeting_delete: "Xóa lần họp" - label_recurring_meeting_delete_confirmation: > - Cuộc họp này là một phần của chuỗi có tên %{name}. Ở đây chỉ xóa lần họp này chứ không phải cả chuỗi. Bạn có muốn tiếp tục? - label_recurring_occurrence_delete_confirmation: > - Bất cứ thông tin cuộc họp nào không có trong mẫu đều bị mất. Bạn có muốn tiếp tục không? label_recurring_meeting_restore: "Khôi phục lại lần họp này" + label_recurring_meeting_schedule: "Lên lịch" + label_recurring_meeting_next_occurrence: "Lần họp tới" label_recurring_meeting_more: "Còn %{count} cuộc họp được lên lịch nữa (%{schedule})." + label_recurring_meeting_no_end_date: "Còn nhiều lịch họp (%{schedule})." label_recurring_meeting_more_singular: "Còn %{count} cuộc họp được lên lịch nữa (%{schedule})." label_recurring_meeting_more_past: "Còn %{count} cuộc họp trước đó." label_recurring_meeting_more_past_singular: "Còn %{count} cuộc họp trước đó." label_recurring_meeting_show_more: "Xem thêm" + label_recurring_meeting_series_create: "Tạo chuỗi các cuộc họp" label_recurring_meeting_series_edit: "Sửa chuỗi các cuộc họp" label_recurring_meeting_series_delete: "Xóa chuỗi các cuộc họp" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + other: "There are %{count} more meetings." label_my_meetings: "Cuộc họp của tôi" label_all_meetings: "Tất cả các cuộc họp" label_upcoming_meetings: "Các cuộc họp sắp tới" @@ -172,12 +178,29 @@ vi: Gửi lời mời qua email ngay lập tức đến những người tham gia được chọn ở trên. Bạn cũng có thể thực hiện thủ công bất kỳ lúc nào sau đó. send_invitation_emails_structured: "Gửi lời mời qua email ngay lập tức đến tất cả người tham gia. Bạn cũng có thể thực hiện thủ công bất kỳ lúc nào sau đó." open_meeting_link: "Mở cuộc họp" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} đã gửi cho bạn một lời mời tham gia cuộc họp %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Cuộc họp %{title} đã được lên lại lịch" - summary: "Cuộc họp %{title} đã được lên lại lịch bởi %{actor}" - body: "Cuộc họp %{title} đã được lên lại lịch bởi %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Ngày/giờ cũ" new_date_time: "Ngày/giờ mới" label_mail_all_participants: "Gửi email đến tất cả người tham gia" @@ -191,12 +214,31 @@ vi: structured_text: "Tổ chức cuộc họp của bạn dưới dạng danh sách động các mục chương trình nghị sự, có thể liên kết chúng với một gói công việc." structured_text_copy: "Sao chép một cuộc họp hiện tại sẽ không sao chép các mục chương trình nghị sự liên quan, chỉ sao chép các chi tiết" copied: "Sao chép từ Cuộc họp #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Phần không tiêu đề" delete_confirmation: "Xóa phần này cũng sẽ xóa tất cả các mục chương trình nghị sự của nó. Bạn có chắc chắn muốn làm điều này không?" placeholder_title: "Phần mới" empty_text: "Kéo các mục vào đây hoặc tạo một cái mới" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "Cuộc họp này là một phần của chuỗi họp định kỳ." error_no_next: "Không có lần tới cho cuộc họp này." @@ -204,7 +246,7 @@ vi: first_created: > Cuộc họp đầu tiên đã được tạo thành công từ mẫu. Tất cả các cuộc họp trong tương lai sẽ được tạo tự động tại thời điểm xảy ra trước đó. template: - button_finalize: "Hoàn thành mẫu" + button_finalize: "Open first meeting" blank_title: "Mẫu chuỗi họp của bạn đang trống" description: > Mẫu này sẽ được sử dụng bất cứ khi nào các cuộc họp mới trong chuỗi được tạo. Bạn có thể thêm các mục chương trình làm việc, người tham gia và tệp đính kèm vào mẫu này. @@ -220,8 +262,9 @@ vi: working_days: "Mỗi ngày làm việc" weekly: "Mỗi tuần" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "không bao giờ" + specific_date: "sau ngày cụ thể" + iterations: "sau số lần họp" starts: "Bắt đầu" in_words: daily_interval: "Mỗi %{interval} ngày" @@ -230,6 +273,41 @@ vi: weekly_interval: "Mỗi %{interval} tuần vào %{weekday}" frequency: "%{base} vào %{time}" full: "%{base} vào %{time}, kết thúc vào %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} vào %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. Every time a planned meeting starts, the next one will automatically be opened for you. You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. To schedule additional meetings or extend the series, go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. This action is not reversible. Please proceed with caution. + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Đã gửi thông báo thành công" notice_timezone_missing: Chưa đặt múi giờ và %{zone} đã được chọn. Để chọn múi giowf của bạn, nhấn vào đây. notice_meeting_updated: "Trang này đã được người khác cập nhật. Tải lại để xem thay đổi." @@ -251,6 +329,8 @@ vi: text_duration_in_hours: "Thời lượng tính bằng giờ" text_in_hours: "bằng giờ" text_meeting_agenda_for_meeting: 'Các ý chính cho cuộc họp "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Bạn có chắc chắn muốn đóng chương trình nghị sự cuộc họp không?" text_meeting_agenda_open_are_you_sure: "Điều này sẽ ghi đè tất cả các thay đổi trong biên bản! Bạn có muốn tiếp tục không?" text_meeting_minutes_for_meeting: 'biên bản cuộc họp "%{meeting}"' @@ -265,6 +345,10 @@ vi: label_meeting_created_by: "Được tạo bởi" label_meeting_last_updated: "Cập nhật lần cuối" label_meeting_reload: "Tải lại" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Các mục chương trình nghị sự" label_agenda_items_reordered: "đã sắp xếp lại" label_agenda_item_remove: "Gỡ bỏ khỏi chương trình nghị sự" @@ -290,7 +374,7 @@ vi: label_meeting_state_closed: "Đã đóng" label_meeting_state_closed_html: "Đã đóng" label_meeting_state_agenda_created: "Agenda đã tạo" - label_meeting_state_scheduled: "Đã lên lịch" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Đã hủy" label_meeting_state_skipped: "Đã bỏ qua" label_meeting_reopen_action: "Mở lại cuộc họp" diff --git a/modules/meeting/config/locales/crowdin/zh-CN.seeders.yml b/modules/meeting/config/locales/crowdin/zh-CN.seeders.yml index c05b8cebd1ea..deb9a15735e7 100644 --- a/modules/meeting/config/locales/crowdin/zh-CN.seeders.yml +++ b/modules/meeting/config/locales/crowdin/zh-CN.seeders.yml @@ -7,7 +7,7 @@ zh-CN: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: 每周 meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/zh-CN.yml b/modules/meeting/config/locales/crowdin/zh-CN.yml index f55885f0d972..e3084f4fad64 100644 --- a/modules/meeting/config/locales/crowdin/zh-CN.yml +++ b/modules/meeting/config/locales/crowdin/zh-CN.yml @@ -50,10 +50,12 @@ zh-CN: meeting_section: title: "标题" recurring_meeting: - frequency: "频率" - interval: "周期" + frequency: "周期" + interval: "间隔" start_date: "开始日期：" - end_after: "结束定期会议于" + start_time: "开始时间" + start_time_hour: "开始时间" + end_after: "会议系列结束" iterations: "事件" errors: messages: @@ -115,22 +117,26 @@ zh-CN: label_recurring_meeting_plural: "定期会议" label_template: "模板" label_recurring_meeting_view: "查看会议系列" - label_recurring_meeting_create: "使用模板创建" + label_recurring_meeting_create: "打开" label_recurring_meeting_copy: "一次性复制" label_recurring_meeting_cancel: "取消此事件" label_recurring_meeting_delete: "删除事件" - label_recurring_meeting_delete_confirmation: > - 本次会议是名为 %{name} 的会议系列的一部分。只会删除本次会议，而不会删除整个系列。要继续吗？ - label_recurring_occurrence_delete_confirmation: > - 任何不在模板中的会议信息都将丢失。要继续吗？ label_recurring_meeting_restore: "恢复此事件" + label_recurring_meeting_schedule: "日程" + label_recurring_meeting_next_occurrence: "下一个事件" label_recurring_meeting_more: "还有至少 %{count} 个预定会议 (%{schedule})。" + label_recurring_meeting_no_end_date: "还有更多预定会议 (%{schedule})。" label_recurring_meeting_more_singular: "还有至少 %{count} 个预定会议 (%{schedule})。" label_recurring_meeting_more_past: "有至少 %{count} 个过往会议。" label_recurring_meeting_more_past_singular: "有至少 %{count} 个过往会议。" label_recurring_meeting_show_more: "显示更多" + label_recurring_meeting_series_create: "创建会议系列" label_recurring_meeting_series_edit: "编辑会议系列" label_recurring_meeting_series_delete: "删除会议系列" + label_recurring_meeting_series_end: "结束会议系列" + label_recurring_meeting_series_end_now: "立即结束系列" + label_meeting_more: + other: "还有至少 %{count} 个会议。" label_my_meetings: "我的会议" label_all_meetings: "所有会议" label_upcoming_meetings: "即将进行的会议" @@ -172,12 +178,29 @@ zh-CN: 立即向上面选定的参加者发送电子邮件邀请。您也可以在之后随时手动发送。 send_invitation_emails_structured: "立即向所有与会者发送电子邮件邀请。您也可以在之后随时手动发送。" open_meeting_link: "打开会议" + open_my_meetings_link: "转到我的会议" + series: + title: "[%{project_name}] 会议系列 '%{title}'" + summary: "%{actor} 设置了一个新的会议系列 '%{title}'" + series_rescheduled: + title: "[%{project_name}] 会议系列 '%{title}' 已重新安排" + summary: "%{actor} 已更改会议系列 '%{title}' 的时间表" + old_schedule: "旧时间表" + new_schedule: "新时间表" invited: - summary: "%{actor} 已经向您发送了一个 %{title} 会议邀请" + summary: "%{actor} 向您发送了会议 '%{title}' 的邀请" + cancelled: + header: "已取消：会议 '%{title}'" + header_occurrence: "已取消：会议事件 '%{title}'" + header_series: "已取消：会议系列 '%{title}'" + summary_occurrence: "%{actor} 已取消 '%{title}' 的事件。" + summary_series: "%{actor} 已取消会议系列 '%{title}'。" + summary: "%{actor} 已取消 '%{title}'。" + date_time: "预定日期/时间" rescheduled: - header: " %{title} 会议已经被重新安排" - summary: "会议 %{title} 已经被 %{actor} 重新安排" - body: "此会议 %{title} 已经被 %{actor} 重新安排。" + header: "会议 '%{title}' 已经重新安排" + summary: "会议 '%{title}' 已经由 %{actor} 重新安排" + body: "会议 '%{title}' 已经由 %{actor} 重新安排。" old_date_time: "旧日期/时间" new_date_time: "新日期/时间" label_mail_all_participants: "发送电子邮件给所有参与者" @@ -191,12 +214,31 @@ zh-CN: structured_text: "将您的会议组织成一个动态的议程项目列表，并可选地将它们链接到一个工作包。" structured_text_copy: "目前复制会议不会复制相关会议的议程项目，只会复制会议的详细信息。" copied: "从会议 #%{id} 复制" + delete_dialog: + one_time: + title: "删除会议" + heading: "删除这个会议？" + confirmation_message_html: > + 此操作不可逆。请谨慎处理。 + occurrence: + title: "取消会议事件" + heading: "取消此会议事件？" + confirmation_message_html: > + 任何不在模板中的会议信息都将丢失。 您想要继续吗？ + confirm_button: "取消事件" + blankslate: + title: "无会议显示" + desc: "没有符合主动筛选条件的会议。" meeting_section: untitled_title: "无标题章节" delete_confirmation: "删除该属性也会删除其在所有项目中的值。您确定要这样做吗？" placeholder_title: "新建章节" empty_text: "拖动项目到此处或创建一个新项目" recurring_meeting: + ended_blankslate: + title: "结束" + message: "本系列会议已经结束，没有即将举行的会议。 " + action: "您仍可以查看过去的事件或编辑会议系列来扩展它。" occurrence: infoline: "本次会议是定期会议系列的一部分。" error_no_next: "此会议没有下一个发生时间。" @@ -204,7 +246,7 @@ zh-CN: first_created: > 第一次会议已成功从模板创建。所有未来的会议将会在上一次发生的时间自动创建。 template: - button_finalize: "完成模板" + button_finalize: "打开首次会议" blank_title: "您的会议系列模板为空" description: > 此模板将在系列中创建新会议时使用。您可以在此模板中添加议程项目、参与者和附件。 @@ -220,8 +262,9 @@ zh-CN: working_days: "每个工作日" weekly: "每周" end_after: - specific_date: "具体日期" - iterations: "具体事件" + never: "从不" + specific_date: "在指定日期之后" + iterations: "在数次事件之后" starts: "开始" in_words: daily_interval: "每 %{interval} 天" @@ -230,6 +273,41 @@ zh-CN: weekly_interval: "每 %{interval} 周在 %{weekday}" frequency: "%{base} 在 %{time}" full: "%{base} 在 %{time}，在 %{end_date} 结束" + full_past: "%{base} 在 %{time}，于 %{end_date}结束" + never_ending: "%{base} 在 %{time}" + open: + title: "打开" + subtitle: > + 公开会议的议程可以编辑，并显示在个人用户的 "我的会议 "部分。更改会议系列模板不会影响已经发生的会议事件。 + blankslate: + title: "目前没有召开的会议" + desc: "您可以点击下面的 \"打开 \"按钮，手动召开计划中的会议" + planned: + title: "已计划" + subtitle: > + 以下会议按经常性会议时间表安排，但尚未开放。 每次计划的会议开始时，下一次会议将自动为您打开。 您也可以手动打开计划的会议来导入模板并开始编辑议程。 + blankslate: + title: "没有更多的会议计划" + desc: > + 本系列没有其他会议计划。 如需添加更多会议或延长会议系列，请转至模板并编辑会议详细信息以更改结束日期、频率或间隔。 + delete_dialog: + title: "删除会议系列" + heading: "永久删除此会议系列？" + confirmation_message_html: + zero: > + 会议系列 %{title} 没有任何会议事件。将为所有人删除该系列。请谨慎操作。 + one: > + 删除 %{title} 也会删除此系列中的一次事件。此操作不可逆转。请谨慎操作。 + other: > + 删除 %{title} 将删除此系列中的全部 %{count} 个事件。此操作不可逆转。请谨慎操作。 + scheduled_delete_dialog: + title: "取消会议事件" + heading: "取消此会议事件？" + confirmation_message_html: > + 任何不在模板中的会议信息都将丢失。 您想要继续吗？ + confirm_button: "取消事件" + end_series_dialog: + title: "结束会议系列" notice_successful_notification: "通知发送成功" notice_timezone_missing: 没有设定时区，预设时区为 %{zone}。要选择您的时区，请单击此处。 notice_meeting_updated: "此页面已被其他人更新。重新加载以查看更改。" @@ -251,6 +329,8 @@ zh-CN: text_duration_in_hours: "持续时间（单位：小时）" text_in_hours: "小时" text_meeting_agenda_for_meeting: '“%{meeting}”会议议程' + text_meeting_series_end_early_heading: "删除未来发生的事件？" + text_meeting_series_end_early: "结束系列将删除任何将来的公开会议或预定会议的事件" text_meeting_closing_are_you_sure: "确定要关闭该会议议程吗？" text_meeting_agenda_open_are_you_sure: "这将在几分钟内覆盖所有更改！要继续吗？" text_meeting_minutes_for_meeting: '“%{meeting}“会议记录' @@ -265,6 +345,10 @@ zh-CN: label_meeting_created_by: "创建者:" label_meeting_last_updated: "最后更新" label_meeting_reload: "重新加载" + label_meeting_index_today: "今天" + label_meeting_index_tomorrow: "明天" + label_meeting_index_this_week: "本周晚些时候" + label_meeting_index_later: "下周及以后" label_agenda_items: "议程项目" label_agenda_items_reordered: "重新排序" label_agenda_item_remove: "从议程中移除" @@ -290,7 +374,7 @@ zh-CN: label_meeting_state_closed: "已关闭" label_meeting_state_closed_html: "关闭" label_meeting_state_agenda_created: "议程已创建" - label_meeting_state_scheduled: "已加入日程" + label_meeting_state_planned: "已计划" label_meeting_state_cancelled: "已取消" label_meeting_state_skipped: "已跳过" label_meeting_reopen_action: "重新开放会议" diff --git a/modules/meeting/config/locales/crowdin/zh-TW.seeders.yml b/modules/meeting/config/locales/crowdin/zh-TW.seeders.yml index 93e0abbdec64..d57b4b2428ab 100644 --- a/modules/meeting/config/locales/crowdin/zh-TW.seeders.yml +++ b/modules/meeting/config/locales/crowdin/zh-TW.seeders.yml @@ -7,7 +7,7 @@ zh-TW: standard: projects: demo-project: - meetings: + meeting_series: item_0: title: 每週 meeting_agenda_items: diff --git a/modules/meeting/config/locales/crowdin/zh-TW.yml b/modules/meeting/config/locales/crowdin/zh-TW.yml index 5895a381e11f..c47293475b68 100644 --- a/modules/meeting/config/locales/crowdin/zh-TW.yml +++ b/modules/meeting/config/locales/crowdin/zh-TW.yml @@ -53,7 +53,9 @@ zh-TW: frequency: "頻率" interval: "間隔" start_date: "開始於" - end_after: "系列結束後" + start_time: "開始時間" + start_time_hour: "開始時間" + end_after: "系列會議結束" iterations: "出現次數" errors: messages: @@ -115,22 +117,26 @@ zh-TW: label_recurring_meeting_plural: "重複性會議" label_template: "模板" label_recurring_meeting_view: "檢視會議系列" - label_recurring_meeting_create: "從模板建立" - label_recurring_meeting_copy: "複製為一次性" + label_recurring_meeting_create: "開啟" + label_recurring_meeting_copy: "一次性複製" label_recurring_meeting_cancel: "取消此事件" label_recurring_meeting_delete: "刪除此事件" - label_recurring_meeting_delete_confirmation: > - 此會議是 %{name}系列的一部分。這只會刪除此特定事件，而不會刪除整個系列。您要繼續嗎？ - label_recurring_occurrence_delete_confirmation: > - 任何不在範本中的會議資訊將會遺失。要繼續嗎？ label_recurring_meeting_restore: "恢復此事件" + label_recurring_meeting_schedule: "排程" + label_recurring_meeting_next_occurrence: "下一次會議" label_recurring_meeting_more: "還有 %{count} 預定會議 (%{schedule})。" + label_recurring_meeting_no_end_date: "有更多排定的會議 (%{schedule})。" label_recurring_meeting_more_singular: "還有 %{count} 預定會議 (%{schedule})。" label_recurring_meeting_more_past: "還有 %{count} 更多過去的會議。" label_recurring_meeting_more_past_singular: "還有 %{count} 更多過去的會議。" label_recurring_meeting_show_more: "顯示更多" + label_recurring_meeting_series_create: "建立會議系列" label_recurring_meeting_series_edit: "編輯系列會議" label_recurring_meeting_series_delete: "刪除系列會議" + label_recurring_meeting_series_end: "編輯系列會議" + label_recurring_meeting_series_end_now: "立即結束系列" + label_meeting_more: + other: "還有 %{count} 更多的會議。" label_my_meetings: "我的會議" label_all_meetings: "所有會議" label_upcoming_meetings: "即將到來的會議" @@ -172,12 +178,29 @@ zh-TW: 立即發送電子郵件邀請函給上述選定的與會者。您也可以稍後隨時手動執行。 send_invitation_emails_structured: "立即向所有參與者傳送電子郵件邀請函。您也可以稍後隨時手動執行。" open_meeting_link: "打開會議連結" + open_my_meetings_link: "前往我的會議" + series: + title: "[%{project_name}] 會議系列 '%{title}'" + summary: "%{actor} 已設立新的會議系列 '%{title}'" + series_rescheduled: + title: "[%{project_name}] 會議系列 '%{title}' 已改時程" + summary: "%{actor} 已變更會議系列的時間表 '%{title}'" + old_schedule: "舊排程" + new_schedule: "新增排程" invited: - summary: "%{actor} 已經向您發送了一個 %{title} 會議邀請" + summary: "%{actor} 已向您發出會議邀請 '%{title}'" + cancelled: + header: "取消：會議 '%{title}'" + header_occurrence: "取消：會議發起 '%{title}'" + header_series: "取消：系列會議 '%{title}'" + summary_occurrence: "%{title}' 已被 %{actor}取消。" + summary_series: "'%{title}' 系列會議已被 %{actor}取消。" + summary: "%{title}' 已被 %{actor}取消。" + date_time: "排定日期/時間" rescheduled: header: "會議 %{title} 已經重新安排" summary: "會議 %{title} 已經被 %{actor} 重新安排" - body: "此會議 %{title} 已經被 %{actor} 重新安排。" + body: "會議 %{title} 已經被 %{actor} 重新安排。" old_date_time: "舊日期/時間" new_date_time: "新日期/時間" label_mail_all_participants: "發送電子郵件給所有參與者" @@ -191,12 +214,31 @@ zh-TW: structured_text: "將會議組織為動態的議程項目清單，可選擇將其連結到工作項目。" structured_text_copy: "目前複製會議不會複製相關會議的議程項目，只會複製會議的詳細信息。" copied: "從會議紀錄 #%{id} 中複製" + delete_dialog: + one_time: + title: "刪除會議" + heading: "刪除這次會議？" + confirmation_message_html: > + 此動作無法還原。請小心操作。 + occurrence: + title: "取消會議事件" + heading: "取消此會議事件？" + confirmation_message_html: > + 任何不在範本中的會議資訊將會遺失。 要繼續嗎？ + confirm_button: "取消事件" + blankslate: + title: "沒有可顯示的會議" + desc: "沒有符合篩選條件的會議。" meeting_section: untitled_title: "無標題章節" delete_confirmation: "刪除該章節也會刪除其所有的議程項目。您確定要這麼做？" placeholder_title: "新增章節" empty_text: "將項目拖曳至此處或建立新項目" recurring_meeting: + ended_blankslate: + title: "系列會議結束" + message: "本系列會議已結束。沒有接下來的會議。 " + action: "您仍然可以檢視過去發生的事件，或編輯會議系列以延伸它。" occurrence: infoline: "此會議為定期舉行的系列會議之一。" error_no_next: "本次會議無下次會議。" @@ -204,7 +246,7 @@ zh-TW: first_created: > 第一次會議已從範本成功建立。以後所有的會議都會在前一次發生時自動建立。 template: - button_finalize: "完成範本" + button_finalize: "開放首次會議" blank_title: "您的會議範本是空的" description: > 每當在系列中建立新會議時，都會使用此範本。您可以在此範本中加入議程項目、與會者和附件。 @@ -220,8 +262,9 @@ zh-TW: working_days: "每個工作天" weekly: "每週" end_after: - specific_date: "特定日期" - iterations: "出現數" + never: "永不" + specific_date: "特定日期之後" + iterations: "經過多次發生" starts: "開始" in_words: daily_interval: "每 %{interval} 天" @@ -230,6 +273,41 @@ zh-TW: weekly_interval: "每 %{interval} 週 %{weekday}" frequency: "%{base} 在 %{time}" full: "%{base} 於 %{time}, 結束於 %{end_date}" + full_past: "%{base} 於 %{time}, 結束於 %{end_date}" + never_ending: "%{base} 在 %{time}" + open: + title: "開始" + subtitle: > + 公開會議的議程可以編輯，並顯示在個別使用者的「我的會議」區段中。變更會議系列範本不會影響已開放的會議。 + blankslate: + title: "目前沒有公開會議" + desc: "您可以按一下下面的「開啟」按鈕，手動開啟已規劃的會議" + planned: + title: "已規劃" + subtitle: > + 下列會議已規劃在重複性會議排程中，但尚未開啟。每次計劃的會議開始時，下一個會議就會自動為您開啟。您也可以手動開啟已規劃的會議，匯入範本並開始編輯議程。 + blankslate: + title: "沒有計劃的會議" + desc: > + 此系列中沒有計劃其他會議。若要排定其他會議或延長系列會議，請移至範本並編輯會議詳細資訊，以變更結束日期、頻率或間隔。 + delete_dialog: + title: "刪除系列會議" + heading: "永久刪除此會議系列？" + confirmation_message_html: + zero: > + 會議系列 %{title}沒有會議發起。所有人會議系列會被刪除。請謹慎處理。 + one: > + 刪除 %{title}也會刪除此系列中已發之會議。此動作不可還原。請小心操作。 + other: > + 刪除 %{title}將刪除此系列中的所有 %{count} 個已發起會議。此動作不可還原。請小心操作。 + scheduled_delete_dialog: + title: "取消會議事件？" + heading: "取消此會議事件？" + confirmation_message_html: > + 任何不在範本中的會議資訊將會遺失。 要繼續嗎？ + confirm_button: "取消事件" + end_series_dialog: + title: "結束系列會議" notice_successful_notification: "通知傳送成功" notice_timezone_missing: 沒有設定時區，預設時區為 %{zone} 。請按這裡選擇您的時區。 notice_meeting_updated: "本頁已由他人更新。重新載入以查看變更。" @@ -251,6 +329,8 @@ zh-TW: text_duration_in_hours: "持續時間 (小時)" text_in_hours: "小時數" text_meeting_agenda_for_meeting: '%{meeting} 的會議大綱' + text_meeting_series_end_early_heading: "刪除未來會議？" + text_meeting_series_end_early: "結束該系列會刪除任何未來開放或排程的會議事件" text_meeting_closing_are_you_sure: "確實要關閉議程嗎？" text_meeting_agenda_open_are_you_sure: "將會覆蓋所有會議紀錄中的變動！您希望繼續嗎？" text_meeting_minutes_for_meeting: '%{meeting} 的會議記錄' @@ -265,6 +345,10 @@ zh-TW: label_meeting_created_by: "建立者" label_meeting_last_updated: "最後更新於" label_meeting_reload: "重新載入" + label_meeting_index_today: "今天" + label_meeting_index_tomorrow: "明天" + label_meeting_index_this_week: "本週以後" + label_meeting_index_later: "下週及其後" label_agenda_items: "議程" label_agenda_items_reordered: "重新排列" label_agenda_item_remove: "從議程中刪除" @@ -290,7 +374,7 @@ zh-TW: label_meeting_state_closed: "關閉" label_meeting_state_closed_html: "關閉" label_meeting_state_agenda_created: "議程已建立" - label_meeting_state_scheduled: "已排程" + label_meeting_state_planned: "已規劃" label_meeting_state_cancelled: "已取消" label_meeting_state_skipped: "已略過" label_meeting_reopen_action: "重新開啟會議" diff --git a/modules/meeting/config/locales/en.yml b/modules/meeting/config/locales/en.yml index 70a70868a327..c5c4cbda57af 100644 --- a/modules/meeting/config/locales/en.yml +++ b/modules/meeting/config/locales/en.yml @@ -65,7 +65,9 @@ en: frequency: "Frequency" interval: "Interval" start_date: "Starts on" - end_after: "End series after" + start_time: "Start time" + start_time_hour: "Start time" + end_after: "Meeting series ends" iterations: "Occurrences" errors: messages: @@ -132,25 +134,27 @@ en: label_recurring_meeting_plural: "Recurring meetings" label_template: "Template" label_recurring_meeting_view: "View meeting series" - label_recurring_meeting_create: "Create from template" - label_recurring_meeting_copy: "Copy as one-off" + label_recurring_meeting_create: "Open" + label_recurring_meeting_copy: "Copy as one-time" label_recurring_meeting_cancel: "Cancel this occurrence" label_recurring_meeting_delete: "Delete occurrence" - label_recurring_meeting_delete_confirmation: > - This meeting is part of a series called %{name}. - This will only delete this particular occurrence and not the entire series. - Do you want to continue? - label_recurring_occurrence_delete_confirmation: > - Any meeting information not in the template will be lost. - Do you want to continue? label_recurring_meeting_restore: "Restore this occurrence" + label_recurring_meeting_schedule: "Schedule" + label_recurring_meeting_next_occurrence: "Next occurrence" label_recurring_meeting_more: "There are %{count} more scheduled meetings (%{schedule})." + label_recurring_meeting_no_end_date: "There are more scheduled meetings (%{schedule})." label_recurring_meeting_more_singular: "There is %{count} more scheduled meeting (%{schedule})." label_recurring_meeting_more_past: "There are %{count} more past meetings." label_recurring_meeting_more_past_singular: "There is %{count} more past meeting." label_recurring_meeting_show_more: "Show more" + label_recurring_meeting_series_create: "Create meeting series" label_recurring_meeting_series_edit: "Edit meeting series" label_recurring_meeting_series_delete: "Delete meeting series" + label_recurring_meeting_series_end: "End meeting series" + label_recurring_meeting_series_end_now: "End series now" + label_meeting_more: + one: "There is one more meeting." + other: "There are %{count} more meetings." label_my_meetings: "My meetings" label_all_meetings: "All meetings" label_upcoming_meetings: "Upcoming meetings" @@ -194,12 +198,29 @@ en: Send an email invitation immediately to the participants selected above. You can also do this manually at any time later. send_invitation_emails_structured: "Send an email invitation immediately to all participants. You can also do this manually at any time later." open_meeting_link: "Open meeting" + open_my_meetings_link: "Go to My meetings" + series: + title: "[%{project_name}] Meeting series '%{title}'" + summary: "%{actor} has set up a new meeting series '%{title}'" + series_rescheduled: + title: "[%{project_name}] Meeting series '%{title}' rescheduled" + summary: "%{actor} has changed the schedule for meeting series '%{title}'" + old_schedule: "Old schedule" + new_schedule: "New schedule" invited: - summary: "%{actor} has sent you an invitation for the meeting %{title}" + summary: "%{actor} has sent you an invitation for the meeting '%{title}'" + cancelled: + header: "Cancelled: Meeting '%{title}'" + header_occurrence: "Cancelled: Meeting occurrence '%{title}'" + header_series: "Cancelled: Meeting series '%{title}'" + summary_occurrence: "An occurrence of '%{title}' has been cancelled by %{actor}." + summary_series: "Meeting series '%{title}' has been cancelled by %{actor}." + summary: "'%{title}' has been cancelled by %{actor}." + date_time: "Scheduled date/time" rescheduled: - header: "Meeting %{title} has been rescheduled" - summary: "Meeting %{title} has been rescheduled by %{actor}" - body: "The meeting %{title} has been rescheduled by %{actor}." + header: "Meeting '%{title}' has been rescheduled" + summary: "Meeting '%{title}' has been rescheduled by %{actor}" + body: "The meeting '%{title}' has been rescheduled by %{actor}." old_date_time: "Old date/time" new_date_time: "New date/time" label_mail_all_participants: "Send email to all participants" @@ -213,6 +234,23 @@ en: structured_text: "Organize your meeting as a dynamic list of agenda items, optionally linking them to a work package." structured_text_copy: "Copying a meeting will currently not copy the associated meeting agenda items, just the details" copied: "Copied from Meeting #%{id}" + delete_dialog: + one_time: + title: "Delete meeting" + heading: "Delete this meeting?" + confirmation_message_html: > + This action is not reversible. Please proceed with caution. + occurrence: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. + + Do you want to continue? + confirm_button: "Cancel occurrence" + blankslate: + title: "No meetings to display" + desc: "There are no meetings that meet the active filter criteria." meeting_section: untitled_title: "Untitled section" @@ -221,6 +259,10 @@ en: empty_text: "Drag items here or create a new one" recurring_meeting: + ended_blankslate: + title: "Meeting series ended" + message: "This meeting series has come to an end. There are no upcoming meetings. " + action: "You can still view past occurrences or edit the meeting series to extend it." occurrence: infoline: "This meeting is part of a recurring meeting series." error_no_next: "There is no next occurrence for this meeting." @@ -229,7 +271,7 @@ en: The first meeting has been successfuly created from template. All future meetings will be created automatically at the time of the previous occurrence. template: - button_finalize: "Finish template" + button_finalize: "Open first meeting" blank_title: "Your meeting series template is empty" description: > This template will be used whenever new meetings in the series get created. @@ -249,8 +291,9 @@ en: working_days: "Every working day" weekly: "Weekly" end_after: - specific_date: "a specific date" - iterations: "a number of occurrences" + never: "never" + specific_date: "after a specific date" + iterations: "after a number of occurrences" starts: "Starts" in_words: daily_interval: "Every %{interval} days" @@ -259,6 +302,52 @@ en: weekly_interval: "Every %{interval} weeks on %{weekday}" frequency: "%{base} at %{time}" full: "%{base} at %{time}, ends on %{end_date}" + full_past: "%{base} at %{time}, ended on %{end_date}" + never_ending: "%{base} at %{time}" + open: + title: "Open" + subtitle: > + Open meetings have agendas that can be edited and show up in individual users’ ‘My meetings’ section. + Changes to the meeting series template do not affect already-open meeting occurrences. + blankslate: + title: "No open meetings at the moment" + desc: "You can manually open a planned meeting by clicking on the 'Open' button below" + planned: + title: "Planned" + subtitle: > + The following meetings are planned in the recurring meeting schedule but are not open yet. + Every time a planned meeting starts, the next one will automatically be opened for you. + You can also open planned meetings manually to import the template and start editing the agenda. + blankslate: + title: "No more planned meetings" + desc: > + There are no additional meetings planned in this series. + To schedule additional meetings or extend the series, + go to the template and edit meeting details to change the end date, frequency or interval. + delete_dialog: + title: "Delete meeting series" + heading: "Permanently delete this meeting series?" + confirmation_message_html: + zero: > + The meeting series %{title} does not have any meeting occurrences. + The series will be deleted for everyone. Please proceed with caution. + one: > + Deleting %{title} will also delete one occurrence in this series. + This action is not reversible. Please proceed with caution. + other: > + Deleting %{title} will delete all %{count} occurrences in this series. + This action is not reversible. Please proceed with caution. + + scheduled_delete_dialog: + title: "Cancel meeting occurrence" + heading: "Cancel this meeting occurrence?" + confirmation_message_html: > + Any meeting information not in the template will be lost. + + Do you want to continue? + confirm_button: "Cancel occurrence" + end_series_dialog: + title: "End meeting series" notice_successful_notification: "Notification sent successfully" notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here. @@ -284,6 +373,8 @@ en: text_duration_in_hours: "Duration in hours" text_in_hours: "in hours" text_meeting_agenda_for_meeting: 'agenda for the meeting "%{meeting}"' + text_meeting_series_end_early_heading: "Delete future occurrences?" + text_meeting_series_end_early: "Ending the series will delete any future open or scheduled meeting occurrences" text_meeting_closing_are_you_sure: "Are you sure you want to close the meeting agenda?" text_meeting_agenda_open_are_you_sure: "This will overwrite all changes in the minutes! Do you want to continue?" text_meeting_minutes_for_meeting: 'minutes for the meeting "%{meeting}"' @@ -300,6 +391,10 @@ en: label_meeting_created_by: "Created by" label_meeting_last_updated: "Last updated" label_meeting_reload: "Reload" + label_meeting_index_today: "Today" + label_meeting_index_tomorrow: "Tomorrow" + label_meeting_index_this_week: "Later this week" + label_meeting_index_later: "Next week and later" label_agenda_items: "Agenda items" label_agenda_items_reordered: "reordered" @@ -330,7 +425,7 @@ en: label_meeting_state_closed: "Closed" label_meeting_state_closed_html: "Closed" label_meeting_state_agenda_created: "Agenda created" - label_meeting_state_scheduled: "Scheduled" + label_meeting_state_planned: "Planned" label_meeting_state_cancelled: "Cancelled" label_meeting_state_skipped: "Skipped" label_meeting_reopen_action: "Reopen meeting" diff --git a/modules/meeting/config/routes.rb b/modules/meeting/config/routes.rb index 4d6b4b845704..6c19e01ba94a 100644 --- a/modules/meeting/config/routes.rb +++ b/modules/meeting/config/routes.rb @@ -28,12 +28,43 @@ Rails.application.routes.draw do resources :projects, only: %i[] do - resources :meetings, only: %i[index new create show] do + resources :meetings do collection do + get :new_dialog get "menu" => "meetings/menus#show" end + + member do + get :copy + get :check_for_updates + get :cancel_edit + get :download_ics + put :update_title + get :details_dialog + put :update_details + get :participants_dialog + put :update_participants + put :change_state + post :notify + get :history + get :delete_dialog + end + end + + resources :recurring_meetings do + member do + get :details_dialog + get :download_ics + get :delete_dialog + get :delete_scheduled_dialog + post :init + delete :destroy_scheduled + post :template_completed + post :notify + post :end_series + get :end_series_dialog + end end - resources :recurring_meetings, only: %i[index new create show destroy] end resources :work_packages, only: %i[] do @@ -52,38 +83,18 @@ end end - namespace :meetings do - resource :menu, only: %[show] - end - - resources :recurring_meetings do - member do - get :details_dialog - get :download_ics - post :init - post :delete_scheduled - post :template_completed - end + resources :recurring_meetings, only: %i[index show new create] do collection do get :humanize_schedule, controller: "recurring_meetings/schedule", action: :humanize_schedule end end - resources :meetings do - get :new_dialog, on: :collection - member do - get :check_for_updates - get :cancel_edit - get :download_ics - put :update_title - get :details_dialog - put :update_details - get :participants_dialog - put :update_participants - put :change_state - post :notify - get :history + resources :meetings, only: %i[index show new create] do + collection do + get :new_dialog + get "menu" => "meetings/menus#show" end + resources :agenda_items, controller: "meeting_agenda_items" do collection do get :new, action: :new, as: :new @@ -139,7 +150,6 @@ end member do - get :copy match "/:tab" => "meetings#show", :constraints => { tab: /(agenda|minutes)/ }, :via => :get, :as => "tab" diff --git a/modules/meeting/lib/open_project/meeting/engine.rb b/modules/meeting/lib/open_project/meeting/engine.rb index 4668c82dc4cf..9ae7b81e7d4d 100644 --- a/modules/meeting/lib/open_project/meeting/engine.rb +++ b/modules/meeting/lib/open_project/meeting/engine.rb @@ -62,15 +62,16 @@ class Engine < ::Rails::Engine permission :edit_meetings, { meetings: %i[edit cancel_edit update update_title details_dialog update_details update_participants], - recurring_meetings: %i[edit cancel_edit update update_title details_dialog update_details], + recurring_meetings: %i[edit cancel_edit update update_title details_dialog update_details + notify end_series end_series_dialog], work_package_meetings_tab: %i[add_work_package_to_meeting_dialog add_work_package_to_meeting] }, permissible_on: :project, require: :member permission :delete_meetings, { - meetings: [:destroy], - recurring_meetings: %i[destroy delete_scheduled] + meetings: %i[delete_dialog destroy], + recurring_meetings: %i[delete_dialog destroy delete_scheduled_dialog destroy_scheduled] }, permissible_on: :project, require: :member diff --git a/modules/meeting/spec/components/meetings/delete_dialog_component_spec.rb b/modules/meeting/spec/components/meetings/delete_dialog_component_spec.rb new file mode 100644 index 000000000000..dd74e691069e --- /dev/null +++ b/modules/meeting/spec/components/meetings/delete_dialog_component_spec.rb @@ -0,0 +1,82 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "rails_helper" + +RSpec.describe Meetings::DeleteDialogComponent, type: :component do + include Rails.application.routes.url_helpers + + let(:project) { build_stubbed(:project) } + let(:user) { build_stubbed(:user) } + + subject do + render_inline(described_class.new(meeting:)) + page + end + + before do + login_as(user) + end + + describe "dialog form" do + let(:meeting) { build_stubbed(:meeting, project:) } + + let(:project) { build_stubbed(:project) } + + it "renders the correct form action" do + expect(subject).to have_element "form", action: project_meeting_path(project, meeting) + end + end + + describe "with a one-time meeting" do + let(:meeting) { build_stubbed(:meeting, project:) } + + it "shows a heading" do + expect(subject).to have_text "Delete this meeting?" + end + + it "shows a simple confirmation message" do + expect(subject).to have_text "This action is not reversible. Please proceed with caution." + end + end + + context "with an associated recurring/templated meeting" do + let(:series) { build_stubbed(:recurring_meeting) } + let(:meeting) { build_stubbed(:structured_meeting_template, recurring_meeting: series) } + + it "shows a heading" do + expect(subject).to have_text "Cancel this meeting occurrence?" + end + + it "shows a warning about potential information loss" do + expect(subject).to have_text "Any meeting information not in the template will be lost." + end + end +end diff --git a/modules/meeting/spec/components/meetings/header_component_spec.rb b/modules/meeting/spec/components/meetings/header_component_spec.rb index 973f5dcd2cae..5ae748094917 100644 --- a/modules/meeting/spec/components/meetings/header_component_spec.rb +++ b/modules/meeting/spec/components/meetings/header_component_spec.rb @@ -36,7 +36,7 @@ let(:user) { build_stubbed(:user) } subject do - render_inline(described_class.new(meeting:, project:)) + render_inline(described_class.new(meeting:)) page end diff --git a/modules/meeting/spec/components/meetings/row_component_spec.rb b/modules/meeting/spec/components/meetings/row_component_spec.rb new file mode 100644 index 000000000000..5fb0fd9088c6 --- /dev/null +++ b/modules/meeting/spec/components/meetings/row_component_spec.rb @@ -0,0 +1,138 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "rails_helper" + +RSpec.describe Meetings::RowComponent, type: :component do + include Rails.application.routes.url_helpers + + let(:project) { build_stubbed(:project) } + let(:table) do + instance_double(Meetings::TableComponent, columns: [], grid_class: "test", has_actions?: true, current_project:) + end + let(:current_project) { nil } + let(:user) { build_stubbed(:user) } + + subject do + render_inline(described_class.new(row: meeting, table:)) + page + end + + before do + login_as(user) + end + + describe "actions" do + context "with default permissions" do + context "with a one-time meeting" do + let(:meeting) { build_stubbed(:meeting, project:) } + + it "shows default menu items" do + expect(subject).to have_link "Download iCalendar event" + end + end + + context "with an associated recurring/templated meeting" do + let(:series) { build_stubbed(:recurring_meeting, project:) } + let(:meeting) { build_stubbed(:structured_meeting_template, recurring_meeting: series, project:) } + + it "shows default menu items" do + expect(subject).to have_link "View meeting series" + expect(subject).to have_link "Download iCalendar event" + end + end + end + + context "with project delete meetings permissions" do + before do + mock_permissions_for(user) do |mock| + mock.allow_in_project(:delete_meetings, project:) + end + end + + context "with a one-time meeting" do + let(:meeting) { build_stubbed(:meeting, project:) } + + context "without a current project" do + it "shows delete menu item with a back url" do + back_url = meetings_path + expect(subject).to have_link "Delete meeting", + href: delete_dialog_project_meeting_path(project, meeting, back_url:) + end + end + + context "with a current project" do + let(:current_project) { project } + + it "shows delete menu item" do + expect(subject).to have_link "Delete meeting", href: delete_dialog_project_meeting_path(project, meeting) + end + end + end + + context "with an associated recurring/templated meeting" do + let(:series) { build_stubbed(:recurring_meeting, project:) } + let(:meeting) { build_stubbed(:structured_meeting_template, recurring_meeting: series, project:) } + + context "without a current project" do + it "shows delete menu item with a back url" do + back_url = meetings_path + expect(subject).to have_link "Delete occurrence", + href: delete_dialog_project_meeting_path(project, meeting, back_url:) + end + end + + context "with a current project" do + let(:current_project) { project } + + it "shows delete menu item" do + expect(subject).to have_link "Delete occurrence", href: delete_dialog_project_meeting_path(project, meeting) + end + end + end + end + + context "with project create meetings permissions" do + before do + mock_permissions_for(user) do |mock| + mock.allow_in_project(:create_meetings, project:) + end + end + + context "with a one-time meeting" do + let(:meeting) { build_stubbed(:meeting, project:) } + + it "shows copy menu item" do + expect(subject).to have_link "Copy meeting" + end + end + end + end +end diff --git a/modules/meeting/spec/components/recurring_meetings/delete_dialog_component_spec.rb b/modules/meeting/spec/components/recurring_meetings/delete_dialog_component_spec.rb new file mode 100644 index 000000000000..20614f6c2622 --- /dev/null +++ b/modules/meeting/spec/components/recurring_meetings/delete_dialog_component_spec.rb @@ -0,0 +1,76 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "rails_helper" + +RSpec.describe RecurringMeetings::DeleteDialogComponent, type: :component do + include Rails.application.routes.url_helpers + + let(:project) { build_stubbed(:project) } + let(:recurring_meeting) { build_stubbed(:recurring_meeting, project:, end_after: :iterations, iterations: 6) } + let(:meeting) { build_stubbed(:structured_meeting_template, recurring_meeting:) } + let(:user) { build_stubbed(:user) } + + subject do + render_inline(described_class.new(recurring_meeting:)) + page + end + + before do + login_as(user) + end + + describe "dialog form" do + context "with a current project" do + let(:project) { build_stubbed(:project) } + + it "renders the correct form action" do + expect(subject).to have_element "form", action: project_recurring_meeting_path(project, recurring_meeting) + end + end + end + + it "shows a heading" do + expect(subject).to have_text "Permanently delete this meeting series?" + end + + context "with a meeting series that ends - with several remaining meetings" do + it "shows a confirmation message with a count of the remaining meetings" do + expect(subject).to have_text "does not have any meeting occurrences" + end + end + + context "with a meeting series that has an occurrence" do + it "shows a confirmation message mentioning one remaining meeting" do + allow(recurring_meeting).to receive(:instantiated_meetings).and_return([meeting]) + expect(subject).to have_text "will also delete one occurrence in this series" + end + end +end diff --git a/modules/meeting/spec/components/recurring_meetings/delete_scheduled_dialog_component_spec.rb b/modules/meeting/spec/components/recurring_meetings/delete_scheduled_dialog_component_spec.rb new file mode 100644 index 000000000000..1f47a657909a --- /dev/null +++ b/modules/meeting/spec/components/recurring_meetings/delete_scheduled_dialog_component_spec.rb @@ -0,0 +1,69 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "rails_helper" + +RSpec.describe RecurringMeetings::DeleteScheduledDialogComponent, type: :component do + include Rails.application.routes.url_helpers + + let(:project) { build_stubbed(:project) } + let(:recurring_meeting) { build_stubbed(:recurring_meeting, project:, end_after: :iterations, iterations: 6) } + let(:start_time) { 1.day.from_now } + let(:scheduled_meeting) { recurring_meeting.scheduled_meetings.find_or_initialize_by(start_time: start_time) } + let(:meeting) { build_stubbed(:structured_meeting_template, recurring_meeting:) } + let(:user) { build_stubbed(:user) } + + subject do + render_inline(described_class.new(scheduled_meeting:)) + page + end + + before do + login_as(user) + end + + describe "dialog form" do + let(:project) { build_stubbed(:project) } + + it "renders the correct form action" do + expect(subject).to have_element "form", action: destroy_scheduled_project_recurring_meeting_path( + project, recurring_meeting, start_time: start_time.iso8601 + ) + end + end + + it "shows a heading" do + expect(subject).to have_text "Cancel this meeting occurrence?" + end + + it "shows a warning about potential information loss" do + expect(subject).to have_text "Any meeting information not in the template will be lost." + end +end diff --git a/modules/meeting/spec/components/recurring_meetings/row_component_spec.rb b/modules/meeting/spec/components/recurring_meetings/row_component_spec.rb new file mode 100644 index 000000000000..8df9b808249a --- /dev/null +++ b/modules/meeting/spec/components/recurring_meetings/row_component_spec.rb @@ -0,0 +1,124 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "rails_helper" + +RSpec.describe RecurringMeetings::RowComponent, type: :component do + include Rails.application.routes.url_helpers + + let(:project) { build_stubbed(:project) } + let(:table) do + instance_double(RecurringMeetings::TableComponent, + columns: [], grid_class: "test", has_actions?: true, current_project:) + end + let(:recurring_meeting) { build_stubbed(:recurring_meeting, project:) } + let(:current_project) { nil } + let(:user) { build_stubbed(:user) } + + subject do + render_inline(described_class.new(row: scheduled_meeting, table:)) + page + end + + before do + login_as(user) + end + + describe "download ics file" do + let(:meeting) { build_stubbed(:meeting, id: 1234, project:, recurring_meeting:) } + let(:scheduled_meeting) { build_stubbed(:scheduled_meeting, id: 999, meeting:, recurring_meeting:) } + + it "links to the correct meeting (Regression #61462)" do + expect(subject).to have_link "Download iCalendar event", + href: download_ics_project_recurring_meeting_path( + project, + recurring_meeting, + occurrence_id: meeting.id + ) + end + end + + describe "cancel occurrence" do + context "with project delete meetings permissions" do + before do + mock_permissions_for(user) do |mock| + mock.allow_in_project(:delete_meetings, project:) + end + end + + context "with a scheduled meeting" do + let(:scheduled_meeting) { build_stubbed(:scheduled_meeting, :scheduled, recurring_meeting:) } + + context "without a current project" do + it "shows cancel menu item" do + expect(subject).to have_link "Cancel this occurrence", + href: delete_scheduled_dialog_project_recurring_meeting_path( + project, + recurring_meeting, + start_time: scheduled_meeting.start_time.iso8601 + ) + end + end + + context "with a current project" do + let(:current_project) { project } + + it "shows cancel menu item" do + expect(subject).to have_link "Cancel this occurrence", + href: delete_scheduled_dialog_project_recurring_meeting_path( + project, recurring_meeting, start_time: scheduled_meeting.start_time.iso8601 + ) + end + end + end + + context "with an instantiated meeting" do + let(:scheduled_meeting) { build_stubbed(:scheduled_meeting, recurring_meeting:, meeting:) } + let(:meeting) { build_stubbed(:meeting) } + + context "without a current project" do + it "shows cancel menu item" do + expect(subject).to have_link "Cancel this occurrence", + href: delete_dialog_project_meeting_path(project, scheduled_meeting.meeting) + end + end + + context "with a current project" do + let(:current_project) { project } + + it "shows cancel menu item" do + expect(subject).to have_link "Cancel this occurrence", + href: delete_dialog_project_meeting_path(project, scheduled_meeting.meeting) + end + end + end + end + end +end diff --git a/modules/meeting/spec/controllers/meetings_controller_spec.rb b/modules/meeting/spec/controllers/meetings_controller_spec.rb index ede030d0bc67..abc55e4735ca 100644 --- a/modules/meeting/spec/controllers/meetings_controller_spec.rb +++ b/modules/meeting/spec/controllers/meetings_controller_spec.rb @@ -44,26 +44,6 @@ create(:meeting, author: user, project: other_project) ] end - - describe "html" do - context "when requesting meetings globally" do - before do - get "index" - end - - it { expect(response).to be_successful } - it { expect(assigns(:meetings)).to match_array meetings[1..2] } - end - - context "when requesting meetings scoped to a project ID" do - before do - get "index", params: { project_id: project.id } - end - - it { expect(response).to be_successful } - it { expect(assigns(:meetings)).to match_array meetings[1] } - end - end end describe "show" do @@ -74,7 +54,7 @@ get "show", params: { id: meeting.id } end - it { expect(response).to be_successful } + it { expect(response).to redirect_to(project_meeting_path(project, meeting)) } it { expect(assigns(:meeting)).to eql meeting } end end @@ -120,7 +100,7 @@ describe "html" do before do - get "edit", params: { id: meeting.id } + get "edit", params: { project_id: meeting.project_id, id: meeting.id } end it { expect(response).to be_successful } @@ -215,7 +195,7 @@ let!(:participant) { create(:meeting_participant, meeting:, attended: true) } it "produces a background job for notification" do - post :notify, params: { id: meeting.id } + post :notify, params: { project_id: meeting.project_id, id: meeting.id } perform_enqueued_jobs expect(ActionMailer::Base.deliveries.count).to eq(1) @@ -227,7 +207,7 @@ end it "produces a flash message containing the mail addresses raising the error" do - expect { post :notify, params: { id: meeting.id } }.not_to raise_error + expect { post :notify, params: { project_id: meeting.project_id, id: meeting.id } }.not_to raise_error meeting.participants.each do |participant| expect(flash[:error]).to include(participant.name) end diff --git a/modules/meeting/spec/factories/meeting_factory.rb b/modules/meeting/spec/factories/meeting_factory.rb index 3ec2041df7d2..7d8821325aea 100644 --- a/modules/meeting/spec/factories/meeting_factory.rb +++ b/modules/meeting/spec/factories/meeting_factory.rb @@ -31,6 +31,7 @@ author factory: :user project start_time { Date.tomorrow + 10.hours } + recurring_meeting { nil } duration { 1.0 } location { "https://some-url.com" } m.sequence(:title) { |n| "Meeting #{n}" } diff --git a/modules/meeting/spec/features/meetings_attachments_spec.rb b/modules/meeting/spec/features/meetings_attachments_spec.rb index dda82d448119..2f5ef62be83c 100644 --- a/modules/meeting/spec/features/meetings_attachments_spec.rb +++ b/modules/meeting/spec/features/meetings_attachments_spec.rb @@ -1,7 +1,7 @@ require "spec_helper" require "features/page_objects/notification" -RSpec.describe "Add an attachment to a meeting (agenda)", :js, with_cuprite: false do +RSpec.describe "Add an attachment to a meeting (agenda)", :js, :selenium do let(:role) do create(:project_role, permissions: %i[view_meetings edit_meetings create_meeting_agendas]) end diff --git a/modules/meeting/spec/features/meetings_close_spec.rb b/modules/meeting/spec/features/meetings_close_spec.rb index 46b1351e5e7c..5c4992fd40f6 100644 --- a/modules/meeting/spec/features/meetings_close_spec.rb +++ b/modules/meeting/spec/features/meetings_close_spec.rb @@ -47,12 +47,11 @@ end context "with permission to close meetings", - :js, - :with_cuprite do + :js do let(:permissions) { %i[view_meetings close_meeting_agendas] } it "can delete own and other`s meetings" do - visit meetings_path(project) + visit project_meetings_path(project) click_on meeting.title @@ -88,7 +87,7 @@ let(:permissions) { %i[view_meetings] } it "cannot delete own and other`s meetings" do - visit meetings_path(project) + visit project_meetings_path(project) expect(page) .to have_no_link "Close" diff --git a/modules/meeting/spec/features/meetings_copy_spec.rb b/modules/meeting/spec/features/meetings_copy_spec.rb index d91af8c150c5..a9432727d418 100644 --- a/modules/meeting/spec/features/meetings_copy_spec.rb +++ b/modules/meeting/spec/features/meetings_copy_spec.rb @@ -28,7 +28,7 @@ require "spec_helper" -RSpec.describe "Meetings copy", :js, :with_cuprite do +RSpec.describe "Meetings copy", :js do shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } shared_let(:permissions) { %i[view_meetings create_meetings] } shared_let(:user) do diff --git a/modules/meeting/spec/features/meetings_delete_spec.rb b/modules/meeting/spec/features/meetings_delete_spec.rb index c0374406df3d..fc6901c10fb8 100644 --- a/modules/meeting/spec/features/meetings_delete_spec.rb +++ b/modules/meeting/spec/features/meetings_delete_spec.rb @@ -73,7 +73,7 @@ end expect(page) - .to have_content(I18n.t(".no_results_title_text", cascade: true)) + .to have_content(I18n.t("meeting.blankslate.title")) expect(page) .to have_current_path index_path diff --git a/modules/meeting/spec/features/meetings_global_menu_item_spec.rb b/modules/meeting/spec/features/meetings_global_menu_item_spec.rb index 85af3945cc1e..91ce440c7ff1 100644 --- a/modules/meeting/spec/features/meetings_global_menu_item_spec.rb +++ b/modules/meeting/spec/features/meetings_global_menu_item_spec.rb @@ -33,8 +33,7 @@ require_relative "../support/pages/meetings/index" RSpec.describe "Meetings global menu item", - :js, - :with_cuprite do + :js do shared_let(:user_without_permissions) { create(:user) } shared_let(:admin) { create(:admin) } shared_let(:project) { create(:project) } diff --git a/modules/meeting/spec/features/meetings_index_spec.rb b/modules/meeting/spec/features/meetings_index_spec.rb index c585368a9d5c..2b1b5145b0e9 100644 --- a/modules/meeting/spec/features/meetings_index_spec.rb +++ b/modules/meeting/spec/features/meetings_index_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/meetings/index" -RSpec.describe "Meetings", "Index", :js, :with_cuprite do +RSpec.describe "Meetings", "Index", :js do # The order the Projects are created in is important. By naming `project` alphanumerically # after `other_project`, we can ensure that subsequent specs that assert sorting is # correct for the right reasons (sorting by Project name and not id) @@ -96,7 +96,8 @@ def setup_meeting_involvement invite_to_meeting(tomorrows_meeting) invite_to_meeting(yesterdays_meeting) - create(:meeting_participant, :attendee, user:, meeting:) + create(:meeting_participant, :attendee, user:, meeting: yesterdays_meeting) + create(:meeting_participant, :attendee, user:, meeting: tomorrows_meeting) meeting.update!(author: user) end @@ -112,7 +113,7 @@ def invite_to_meeting(meeting) context "when showing all meetings without invitations" do it "does not show under My meetings, but in All meetings" do meetings_page.visit! - expect(page).to have_content "There is currently nothing to display." + meetings_page.expect_no_meetings_listed meetings_page.set_sidebar_filter "All meetings" @@ -159,8 +160,8 @@ def invite_to_meeting(meeting) end it "show all past meetings" do - meetings_page.expect_meetings_listed(yesterdays_meeting) - meetings_page.expect_meetings_not_listed(meeting, tomorrows_meeting) + meetings_page.expect_meetings_listed_in_table(yesterdays_meeting, meeting, ongoing_meeting) + meetings_page.expect_meetings_not_listed(tomorrows_meeting) end end @@ -170,14 +171,14 @@ def invite_to_meeting(meeting) end it "shows all meetings I've been marked as invited to with a quick filter" do - meetings_page.expect_meetings_listed(tomorrows_meeting) + meetings_page.expect_meeting_listed_in_group(tomorrows_meeting, key: :tomorrow) meetings_page.expect_meetings_not_listed(yesterdays_meeting, meeting, ongoing_meeting) meetings_page.set_quick_filter upcoming: false - meetings_page.expect_meetings_listed(yesterdays_meeting) + meetings_page.expect_meetings_listed_in_table(yesterdays_meeting) meetings_page.expect_meetings_not_listed(meeting, tomorrows_meeting) end @@ -188,11 +189,19 @@ def invite_to_meeting(meeting) meetings_page.set_sidebar_filter "Attended" end - it "shows all meetings I've been marked as attending to" do - meetings_page.expect_meetings_listed(meeting) - meetings_page.expect_meetings_not_listed(yesterdays_meeting, + it "shows all past meetings I've been marked as attending to" do + meetings_page.expect_meetings_listed(yesterdays_meeting) + meetings_page.expect_meetings_not_listed(meeting, ongoing_meeting, tomorrows_meeting) + + # Switch to upcoming + meetings_page.set_quick_filter upcoming: true + + meetings_page.expect_meetings_listed(tomorrows_meeting) + meetings_page.expect_meetings_not_listed(yesterdays_meeting, + meeting, + ongoing_meeting) end end @@ -220,7 +229,8 @@ def invite_to_meeting(meeting) invite_to_meeting(other_project_meeting) meetings_page.visit! - meetings_page.expect_meetings_listed(meeting, other_project_meeting) + meetings_page.expect_meeting_listed_in_group(meeting, key: :today) + meetings_page.expect_meeting_listed_in_group(other_project_meeting) meetings_page.expect_meetings_not_listed(yesterdays_meeting) end @@ -280,7 +290,7 @@ def invite_to_meeting(meeting) meetings_page.expect_create_new_button end - it "allows creation of both types of meetings", with_flag: { recurring_meetings: true } do + it "allows creation of both types of meetings" do meetings_page.visit! meetings_page.expect_create_new_types @@ -359,4 +369,57 @@ def invite_to_meeting(meeting) meetings_page.expect_no_meeting_location(meeting_with_no_location) end end + + describe "top level menu items and breadcrumbs (Regression #61343)" do + let(:meetings_page) { Pages::Meetings::Index.new(project: nil) } + + context "when the user is logged in and specific filters are selected" do + it "shows the correct selected menu item and breadcrumb each time" do + meetings_page.visit! + + expect(page).to have_css(".op-submenu--item-action.selected", text: "My meetings") + expect(page).to have_css("li.breadcrumb-item-selected", text: "My meetings") + + meetings_page.set_sidebar_filter("Recurring meetings") + + expect(page).to have_css(".op-submenu--item-action.selected", text: "Recurring meetings") + expect(page).to have_css("li.breadcrumb-item-selected", text: "Recurring meetings") + + meetings_page.set_sidebar_filter("All meetings") + + expect(page).to have_css(".op-submenu--item-action.selected", text: "All meetings") + expect(page).to have_css("li.breadcrumb-item-selected", text: "All meetings") + end + end + end + + describe "top level menu items and breadcrumbs anonymously (Regression #61343)" do + let(:user) do + create(:anonymous_role, permissions: %i[view_project view_meetings]) + User.anonymous + end + let(:project) { create(:public_project, enabled_module_names: %i[meetings]) } + let(:meetings_page) { Pages::Meetings::Index.new(project:) } + + context "when the user is logged out and specific filters are selected", with_settings: { login_required?: false } do + it "shows the correct selected menu item and breadcrumb each time" do + meetings_page.visit! + + # with no filter + expect(page).to have_css(".op-submenu--item-action.selected", text: "All meetings") + expect(page).to have_css("li.breadcrumb-item-selected", text: "All meetings") + + meetings_page.set_sidebar_filter("Recurring meetings") + + expect(page).to have_css(".op-submenu--item-action.selected", text: "Recurring meetings") + expect(page).to have_css("li.breadcrumb-item-selected", text: "Recurring meetings") + + # with an explicitly selected filter + meetings_page.set_sidebar_filter("All meetings") + + expect(page).to have_css(".op-submenu--item-action.selected", text: "All meetings") + expect(page).to have_css("li.breadcrumb-item-selected", text: "All meetings") + end + end + end end diff --git a/modules/meeting/spec/features/meetings_locking_spec.rb b/modules/meeting/spec/features/meetings_locking_spec.rb index daa8c15b584f..623c7f4f268d 100644 --- a/modules/meeting/spec/features/meetings_locking_spec.rb +++ b/modules/meeting/spec/features/meetings_locking_spec.rb @@ -31,7 +31,7 @@ RSpec.describe "Meetings locking", :js do let(:project) { create(:project, enabled_module_names: %w[meetings]) } let(:user) { create(:admin) } - let!(:meeting) { create(:meeting) } + let!(:meeting) { create(:meeting, project:) } let!(:agenda) { create(:meeting_agenda, meeting:) } let(:agenda_field) do TextEditorField.new(page, diff --git a/modules/meeting/spec/features/meetings_new_spec.rb b/modules/meeting/spec/features/meetings_new_spec.rb index e43c4f02b1e9..ed33b784b925 100644 --- a/modules/meeting/spec/features/meetings_new_spec.rb +++ b/modules/meeting/spec/features/meetings_new_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/meetings/index" -RSpec.describe "Meetings new", :js, :with_cuprite do +RSpec.describe "Meetings new", :js do shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } shared_let(:admin) { create(:admin) } let(:time_zone) { "Etc/UTC" } @@ -65,12 +65,12 @@ let(:new_page) { Pages::Meetings::New.new(nil) } context "with permission to create meetings" do - it "does not render menus", :with_cuprite do + it "does not render menus" do new_page.visit! new_page.expect_no_main_menu end - describe "clicking on the create new meeting button", :with_cuprite do + describe "clicking on the create new meeting button" do it "navigates to the global create form" do index_page.visit! index_page.click_create_new @@ -149,7 +149,7 @@ end end - context "without permission to create meetings", :with_cuprite do + context "without permission to create meetings" do let(:permissions) { %i[view_meetings] } it "shows no edit link" do @@ -159,7 +159,7 @@ end end - context "as an admin", :with_cuprite do + context "as an admin" do let(:current_user) { admin } it "allows creating meeting in a project without members" do @@ -226,7 +226,7 @@ other_user end - describe "clicking on the create new meeting button", :with_cuprite do + describe "clicking on the create new meeting button" do it "navigates to the project-specific create form" do index_page.visit! index_page.click_create_new @@ -276,7 +276,7 @@ end end - context "without permission to create meetings", :with_cuprite do + context "without permission to create meetings" do let(:permissions) { %i[view_meetings] } it "shows no edit link" do @@ -286,7 +286,7 @@ end end - context "as an admin", :with_cuprite do + context "as an admin" do let(:current_user) { admin } let(:field) do TextEditorField.new(page, diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb index 72629e50242c..f307cdf1b06d 100644 --- a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb +++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_create_spec.rb @@ -34,9 +34,7 @@ require_relative "../../support/pages/meetings/index" RSpec.describe "Recurring meetings creation", - :js, - :with_cuprite, - with_flag: { recurring_meetings: true } do + :js do include Components::Autocompleter::NgSelectAutocompleteHelpers shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } @@ -62,6 +60,7 @@ let(:current_user) { user } let(:meeting) { RecurringMeeting.last } let(:show_page) { Pages::RecurringMeeting::Show.new(meeting) } + let(:template_page) { Pages::StructuredMeeting::Show.new(meeting.template) } let(:meetings_page) { Pages::Meetings::Index.new(project:) } before do @@ -86,8 +85,10 @@ meetings_page.set_starts_on "2024-12-31" meetings_page.set_start_time "13:30" meetings_page.set_duration "1.5" + meetings_page.set_end_after "a specific date" meetings_page.set_end_date "2025-01-15" + sleep 0.5 # quick fix as wait_for_network_idle isn't working all the time expect(page).to have_text "Every week on Tuesday at 01:30 PM" click_on "Create meeting" @@ -97,20 +98,43 @@ # Use is redirected to the template expect(page).to have_current_path(project_meeting_path(project, meeting.template)) expect(page).to have_content(I18n.t("recurring_meeting.template.description")) - expect(page).to have_link("Finish template") - click_link_or_button "Finish template" + # Add participants + template_page.open_participant_form + template_page.in_participant_form do + template_page.expect_participant_invited(user, invited: true) + template_page.expect_participant_invited(other_user, invited: false) + template_page.expect_available_participants(count: 2) + expect(page).to have_button("Save") - # Does not send invitation mails by default - perform_enqueued_jobs - expect(ActionMailer::Base.deliveries.size).to eq 0 + template_page.invite_participant(other_user) + + template_page.expect_participant_invited(user, invited: true) + template_page.expect_participant_invited(other_user, invited: true) + + click_on("Save") + end + wait_for_network_idle + + expect(page).to have_css("#meetings-side-panel-participants-component", text: 2) + expect(page).to have_link("Open first meeting") + + click_link_or_button "Open first meeting" + wait_for_network_idle + + # Sends out an invitation to the series show_page.visit! expect(page).to have_css(".start_time", count: 3) show_page.expect_open_meeting date: "12/31/2024 01:30 PM" - show_page.expect_scheduled_meeting date: "01/07/2025 01:30 PM" - show_page.expect_scheduled_meeting date: "01/14/2025 01:30 PM" + show_page.expect_planned_meeting date: "01/07/2025 01:30 PM" + show_page.expect_planned_meeting date: "01/14/2025 01:30 PM" + + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries.size).to eq 2 + title = ActionMailer::Base.deliveries.map(&:subject).uniq.first + expect(title).to eq "[#{project.name}] Meeting series 'Some title'" end end diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb index 0b8cb85128df..67a7f3b9e59e 100644 --- a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb +++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_crud_spec.rb @@ -34,9 +34,7 @@ require_relative "../../support/pages/meetings/index" RSpec.describe "Recurring meetings CRUD", - :js, - :with_cuprite, - with_flag: { recurring_meetings: true } do + :js do include Components::Autocompleter::NgSelectAutocompleteHelpers before_all do @@ -89,54 +87,75 @@ it "can delete a recurring meeting from the show page and return to the index page" do show_page.visit! - click_on "recurring-meeting-action-menu" - - accept_confirm(I18n.t("text_are_you_sure")) do - click_on "Delete meeting series" + show_page.delete_meeting_series + retry_block do + show_page.within_modal "Delete meeting series" do + check "I understand that this deletion cannot be reversed", allow_label_click: true + click_on "Delete permanently" + end end - expect(page).to have_current_path meetings_path # check path + expect(page).to have_current_path project_meetings_path(project) + + expect_flash(type: :success, message: "Successful deletion.") + show_page.expect_no_meeting date: "12/31/2024 01:30 PM" end - it "can use the 'Create from template' button" do + it "can use the 'Open' button" do show_page.visit! - show_page.create_from_template date: "01/07/2025 01:30 PM" + show_page.open date: "01/07/2025 01:30 PM" wait_for_reload expect(page).to have_current_path project_meeting_path(project, Meeting.last) show_page.visit! - show_page.expect_no_scheduled_meeting date: "01/07/2025 01:30 PM" + show_page.expect_no_planned_meeting date: "01/07/2025 01:30 PM" show_page.expect_open_meeting date: "01/07/2025 01:30 PM" end - it "can cancel an occurrence" do + it "can cancel an occurrence from the show page" do show_page.visit! - accept_confirm(I18n.t(:label_recurring_occurrence_delete_confirmation)) do - show_page.cancel_occurrence date: "12/31/2024 01:30 PM" + show_page.cancel_occurrence date: "12/31/2024 01:30 PM" + show_page.within_modal "Cancel meeting occurrence" do + click_on "Cancel occurrence" end expect_flash(type: :success, message: "Successful cancellation.") - expect(page).to have_current_path(show_page.project_path) + expect(page).to have_current_path(show_page.path) show_page.expect_no_open_meeting date: "12/31/2024 01:30 PM" show_page.expect_cancelled_meeting date: "12/31/2024 01:30 PM" end + it "can cancel a planned occurrence from the show page" do + show_page.visit! + + show_page.cancel_occurrence date: "01/07/2025 01:30 PM" + show_page.within_modal "Cancel meeting occurrence" do + click_on "Cancel occurrence" + end + + expect_flash(type: :success, message: "Successful cancellation.") + + expect(page).to have_current_path(show_page.path) + + show_page.expect_cancelled_meeting date: "01/07/2025 01:30 PM" + end + it "can edit the details of a recurring meeting" do show_page.visit! show_page.expect_subtitle text: "Every week on Tuesday at 01:30 PM, ends on 01/14/2025" show_page.edit_meeting_series - show_page.in_edit_dialog do + show_page.within_modal "Edit Meeting" do page.select("Daily", from: "Frequency") meetings_page.set_start_time "11:00" - page.select("a number of occurrences", from: "End series after") + page.select("a number of occurrences", from: "Meeting series ends") page.fill_in("Occurrences", with: "8") sleep 0.5 @@ -152,14 +171,18 @@ show_page.expect_open_meeting date: "12/31/2024 01:30 PM" show_page.expect_open_actions date: "12/31/2024 01:30 PM" - show_page.expect_scheduled_meeting date: "01/07/2025 01:30 PM" - show_page.expect_scheduled_actions date: "01/07/2025 01:30 PM" + show_page.expect_planned_meeting date: "01/07/2025 01:30 PM" + show_page.expect_planned_actions date: "01/07/2025 01:30 PM" - accept_confirm(I18n.t(:label_recurring_occurrence_delete_confirmation)) do - show_page.cancel_occurrence date: "12/31/2024 01:30 PM" + show_page.cancel_occurrence date: "12/31/2024 01:30 PM" + show_page.within_modal "Cancel meeting occurrence" do + click_on "Cancel occurrence" end - wait_for_network_idle + expect_flash(type: :success, message: "Successful cancellation.") + + expect(page).to have_current_path(show_page.path) + show_page.expect_cancelled_meeting date: "12/31/2024 01:30 PM" show_page.expect_cancelled_actions date: "12/31/2024 01:30 PM" end @@ -170,7 +193,7 @@ it "does not allow to act on the recurring meeting" do show_page.visit! - expect(page).to have_no_content "Create from template" + expect(page).to have_no_button "Open" show_page.expect_open_meeting date: "12/31/2024 01:30 PM" within("li", text: "12/31/2024 01:30 PM") do @@ -183,8 +206,8 @@ click_on "more-button" end - show_page.expect_scheduled_meeting date: "01/07/2025 01:30 PM" - show_page.expect_scheduled_meeting date: "01/14/2025 01:30 PM" + show_page.expect_planned_meeting date: "01/07/2025 01:30 PM" + show_page.expect_planned_meeting date: "01/14/2025 01:30 PM" expect(page).not_to have_test_selector "recurring-meeting-action-menu" end diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_end_series_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_end_series_spec.rb new file mode 100644 index 000000000000..a54d08eb525f --- /dev/null +++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_end_series_spec.rb @@ -0,0 +1,117 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +require_relative "../../support/pages/meetings/new" +require_relative "../../support/pages/structured_meeting/show" +require_relative "../../support/pages/recurring_meeting/show" +require_relative "../../support/pages/meetings/index" + +RSpec.describe "Recurring meetings end series", :js do + include Components::Autocompleter::NgSelectAutocompleteHelpers + + shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } + shared_let(:user) do + create :user, + lastname: "First", + preferences: { time_zone: "Etc/UTC" }, + member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings] } + end + shared_let(:meeting) do + create :recurring_meeting, + project:, + start_time: DateTime.parse("2025-01-28T10:30:00Z"), + duration: 1, + frequency: "weekly", + end_after: "never", + author: user + end + + let(:current_user) { user } + let(:show_page) { Pages::RecurringMeeting::Show.new(meeting) } + let(:meetings_page) { Pages::Meetings::Index.new(project:) } + + before do + travel_to(Time.zone.local(2025, 1, 29, 9, 30)) + + login_as current_user + + # Assuming the first init job has run + RecurringMeetings::InitNextOccurrenceJob.perform_now(meeting, meeting.first_occurrence.to_time) + end + + after do + travel_back + end + + it "can end the meeting early" do + show_page.visit! + + show_page.end_meeting_series + show_page.within_modal "End meeting series" do + expect(page).to have_text("Ending the series will delete any future open or scheduled meeting occurrences") + + retry_block do + check "I understand that this deletion cannot be reversed", allow_label_click: true + expect(page).to have_checked_field("I understand that this deletion cannot be reversed") + end + + click_on "End series now" + end + + expect(page).to have_current_path project_recurring_meeting_path(project, meeting) + expect(page).to have_text("Meeting series ended") + end + + context "when meeting start time is in the future" do + before do + meeting.update! start_time: DateTime.parse("2025-01-30T10:30:00Z") + end + + it "does not show this action" do + show_page.visit! + page.find_test_selector("recurring-meeting-action-menu").click + expect(page).to have_no_text "End meeting series" + end + end + + context "when meeting start time is today" do + before do + meeting.update! start_time: DateTime.parse("2025-01-29T20:30:00Z") + end + + it "does not show this action" do + show_page.visit! + page.find_test_selector("recurring-meeting-action-menu").click + expect(page).to have_no_text "End meeting series" + end + end +end diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_global_create_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_global_create_spec.rb new file mode 100644 index 000000000000..ab517d9980a9 --- /dev/null +++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_global_create_spec.rb @@ -0,0 +1,114 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +require_relative "../../support/pages/meetings/new" +require_relative "../../support/pages/structured_meeting/show" +require_relative "../../support/pages/recurring_meeting/show" +require_relative "../../support/pages/meetings/index" + +RSpec.describe "Recurring meetings global creation", + :js do + include Components::Autocompleter::NgSelectAutocompleteHelpers + + shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } + shared_let(:user) do + create(:user, + lastname: "First", + member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings] }).tap do |u| + u.pref[:time_zone] = "Etc/UTC" + + u.save! + end + end + + let(:meetings_page) { Pages::Meetings::Index.new(project: nil) } + + context "with a user with permissions" do + before do + login_as(user) + meetings_page.visit! + end + + it "keeps the current selected project when hitting a validation error (Regression #59972)" do + expect(page).to have_current_path(meetings_page.path) + meetings_page.click_on "add-meeting-button" + + page.within("action-list") do + meetings_page.click_on "Recurring" + end + + meetings_page.set_project project + meetings_page.click_create + wait_for_network_idle + + expect(page).to have_text "Title can't be blank." + + within("[data-test-selector='project_id']") do + expect(page).to have_text project.name + end + + meetings_page.set_title "Some title" + meetings_page.click_create + wait_for_network_idle + + expect(page).to have_css("h1", text: "Some title") + meeting = Meeting.last + expect(meeting.title).to eq "Some title" + expect(meeting.project).to eq project + end + + it "shows a project validation error when empty (Regression #61176)" do + expect(page).to have_current_path(meetings_page.path) + meetings_page.click_on "add-meeting-button" + + page.within("action-list") do + meetings_page.click_on "Recurring" + end + + meetings_page.set_title "Some title" + meetings_page.click_create + wait_for_network_idle + + expect(page).to have_text "Project can't be blank." + meetings_page.set_project project + + within("[data-test-selector='project_id']") do + expect(page).to have_text project.name + end + meetings_page.click_create + wait_for_network_idle + + expect(page).to have_css("h1", text: "Some title (Template)") + meeting = Meeting.last + expect(meeting.title).to eq "Some title" + expect(meeting.project).to eq project + end + end +end diff --git a/modules/meeting/spec/features/recurring_meetings/recurring_meeting_global_crud_spec.rb b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_global_crud_spec.rb new file mode 100644 index 000000000000..da7583bf956d --- /dev/null +++ b/modules/meeting/spec/features/recurring_meetings/recurring_meeting_global_crud_spec.rb @@ -0,0 +1,136 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +require_relative "../../support/pages/meetings/new" +require_relative "../../support/pages/structured_meeting/show" +require_relative "../../support/pages/recurring_meeting/show" +require_relative "../../support/pages/meetings/index" + +RSpec.describe "Recurring meetings global CRUD", :js do + include Components::Autocompleter::NgSelectAutocompleteHelpers + + before_all do + travel_to(Date.new(2024, 12, 1)) + end + + after(:all) do # rubocop:disable RSpec/BeforeAfterAll + travel_back + end + + shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } + shared_let(:user) do + create :user, + lastname: "First", + preferences: { time_zone: "Etc/UTC" }, + member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings] } + end + shared_let(:other_user) do + create(:user, + lastname: "Second", + member_with_permissions: { project => %i[view_meetings] }) + end + shared_let(:no_member_user) do + create(:user, + lastname: "Third") + end + shared_let(:meeting) do + create :recurring_meeting, + project:, + start_time: "2024-12-31T13:30:00Z", + duration: 1.5, + frequency: "weekly", + end_after: "specific_date", + end_date: "2025-01-15", + author: user + end + + let(:current_user) { user } + let(:show_page) { Pages::RecurringMeeting::Show.new(meeting) } + let(:meetings_page) { Pages::Meetings::Index.new(project: nil) } + + before do + travel_to(Date.new(2024, 12, 1)) + login_as current_user + + # Assuming the first init job has run + RecurringMeetings::InitNextOccurrenceJob.perform_now(meeting, meeting.first_occurrence.to_time) + end + + it "can delete a recurring meeting from the show page and return to the index page" do + show_page.visit! + + show_page.delete_meeting_series + + retry_block do + show_page.within_modal "Delete meeting series" do + check "I understand that this deletion cannot be reversed", allow_label_click: true + click_on "Delete permanently" + end + end + + expect(page).to have_current_path project_meetings_path(project) + + expect_flash(type: :success, message: "Successful deletion.") + show_page.expect_no_meeting date: "12/31/2024 01:30 PM" + end + + it "can cancel an occurrence from the show page" do + show_page.visit! + + show_page.cancel_occurrence date: "12/31/2024 01:30 PM" + show_page.within_modal "Cancel meeting occurrence" do + click_on "Cancel occurrence" + end + + expect_flash(type: :success, message: "Successful cancellation.") + + expect(page).to have_current_path(show_page.path) + + show_page.expect_no_open_meeting date: "12/31/2024 01:30 PM" + show_page.expect_cancelled_meeting date: "12/31/2024 01:30 PM" + end + + it "can cancel a planned occurrence from the show page" do + show_page.visit! + + show_page.cancel_occurrence date: "01/07/2025 01:30 PM" + show_page.within_modal "Cancel meeting occurrence" do + click_on "Cancel occurrence" + end + + expect_flash(type: :success, message: "Successful cancellation.") + + expect(page).to have_current_path(show_page.path) + + show_page.expect_cancelled_meeting date: "01/07/2025 01:30 PM" + end +end diff --git a/modules/meeting/spec/features/structured_meetings/history_spec.rb b/modules/meeting/spec/features/structured_meetings/history_spec.rb index cebda965037d..fd0eb074f46c 100644 --- a/modules/meeting/spec/features/structured_meetings/history_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/history_spec.rb @@ -33,13 +33,12 @@ require_relative "../../support/pages/structured_meeting/history" RSpec.describe "history", - :js, - :with_cuprite do + :js do include Components::Autocompleter::NgSelectAutocompleteHelpers include Redmine::I18n - shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } - shared_let(:other_project) { create(:project, enabled_module_names: %w[work_package_tracking]) } + shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking activities]) } + shared_let(:other_project) { create(:project, enabled_module_names: %w[work_package_tracking activites]) } shared_let(:user) do create(:user, lastname: "First", @@ -340,19 +339,23 @@ end history_page.open_history_modal - within("li.op-activity-list--item", match: :first) do - expect(page).to have_css("li", text: "Notes set") - click_link_or_button "Details" - end - expect(page).to have_current_path /\/journals\/\d+\/diff\/agenda_items_\d+_notes/ - expect(page).to have_css("ins.diffmod", text: "# Hello there") + retry_block do + within("li.op-activity-list--item", match: :first) do + expect(page).to have_css("li", text: "Notes set") + click_link_or_button "Details" + end + + wait_for_network_idle + expect(page).to have_current_path /\/journals\/\d+\/diff\/agenda_items_\d+_notes/ + expect(page).to have_css("ins.diffmod", text: "# Hello there") + end end it "for a user with no permissions, renders an error", with_settings: { journal_aggregation_time_minutes: 0 } do login_as no_member_user - visit history_meeting_path(meeting) + visit history_project_meeting_path(project, meeting) expected = "[Error 403] You are not authorized to access this page." expect_flash(type: :error, message: expected) diff --git a/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb b/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb index 6f90d085d158..2ab394e5b20c 100644 --- a/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/mobile_structure_meeting_spec.rb @@ -31,8 +31,7 @@ require_relative "../../support/pages/structured_meeting//mobile/show" RSpec.describe "Structured meetings CRUD", - :js, - :with_cuprite do + :js do include Components::Autocompleter::NgSelectAutocompleteHelpers shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb index c762251f9a59..feb2f810ca99 100644 --- a/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_crud_spec.rb @@ -33,9 +33,7 @@ require_relative "../../support/pages/meetings/index" RSpec.describe "Structured meetings CRUD", - :js, - :with_cuprite, - with_flag: { recurring_meetings: true } do + :js do include Components::Autocompleter::NgSelectAutocompleteHelpers shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } @@ -211,13 +209,16 @@ end it "can delete a meeting and get back to the index page" do - click_on("op-meetings-header-action-trigger") + show_page.trigger_dropdown_menu_item "Delete meeting" + show_page.expect_modal "Delete meeting" - accept_confirm(I18n.t("text_are_you_sure")) do - click_on "Delete meeting" + show_page.within_modal "Delete meeting" do + click_on "Delete" end expect(page).to have_current_path project_meetings_path(project) + + expect_flash(type: :success, message: "Successful deletion.") end context "when exporting as ICS" do @@ -292,9 +293,8 @@ end wait_for_network_idle - click_on("op-meetings-header-action-trigger") - retry_block do + click_on("op-meetings-header-action-trigger") click_on "Copy" # dynamically wait for the modal to be loaded expect(page).to have_text("Copy meeting") @@ -317,7 +317,7 @@ # check for copied participants with attended status reset page.find_test_selector("manage-participants-button").click - expect(page).to have_css("#edit-participants-dialog") + expect(page).to have_modal("Participants") expect(page).to have_field(id: "checkbox_invited_#{other_user.id}", checked: true) expect(page).to have_field(id: "checkbox_attended_#{other_user.id}", checked: false) diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_delete_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_delete_spec.rb new file mode 100644 index 000000000000..af4d4f426541 --- /dev/null +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_delete_spec.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +require_relative "../../support/pages/meetings/new" +require_relative "../../support/pages/structured_meeting/show" +require_relative "../../support/pages/meetings/index" + +RSpec.describe "Structured meetings deletion", + :js do + include Components::Autocompleter::NgSelectAutocompleteHelpers + + shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } + shared_let(:user) do + create(:user, + lastname: "First", + member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings] }).tap do |u| + u.pref[:time_zone] = "Etc/UTC" + + u.save! + end + end + + shared_let(:meeting) { create(:meeting, project:, author: user) } + + let(:current_user) { user } + let(:meetings_page) { Pages::Meetings::Index.new(project: nil) } + + before do + login_as current_user + meetings_page.visit! + end + + it "can delete globally, redirecting back to global" do + expect(page).to have_current_path(meetings_page.path) + expect(page).to have_text meeting.title + + within("li", text: meeting.title) do + click_on "more-button" + click_on "Delete meeting" + end + + within("#delete-meeting-dialog") do + expect(page).to have_text "Delete this meeting?" + click_on "Delete" + end + + expect(page).to have_current_path(meetings_page.path) + end +end diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_global_crud_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_global_crud_spec.rb new file mode 100644 index 000000000000..64cb70ac8e2f --- /dev/null +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_global_crud_spec.rb @@ -0,0 +1,120 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +require_relative "../../support/pages/meetings/new" +require_relative "../../support/pages/structured_meeting/show" +require_relative "../../support/pages/meetings/index" + +RSpec.describe "Structured meetings global CRUD", :js do + include Components::Autocompleter::NgSelectAutocompleteHelpers + + shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } + shared_let(:user) do + create(:user, + lastname: "First", + member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings delete_meetings manage_agendas + view_work_packages] }).tap do |u| + u.pref[:time_zone] = "Etc/UTC" + + u.save! + end + end + shared_let(:other_user) do + create(:user, + lastname: "Second", + member_with_permissions: { project => %i[view_meetings view_work_packages] }) + end + shared_let(:no_member_user) do + create(:user, + lastname: "Third") + end + shared_let(:work_package) do + create(:work_package, project:, subject: "Important task") + end + + let(:current_user) { user } + let(:new_page) { Pages::Meetings::New.new(project) } + let(:meeting) { StructuredMeeting.last } + let(:show_page) { Pages::StructuredMeeting::Show.new(meeting) } + let(:meetings_page) { Pages::Meetings::Index.new(project: nil) } + + before do + login_as current_user + meetings_page.visit! + expect(page).to have_current_path(meetings_page.path) # rubocop:disable RSpec/ExpectInHook + meetings_page.click_on "add-meeting-button" + meetings_page.click_on "One-time" + end + + it "can delete a meeting and get back to the index page" do + meetings_page.set_project project + + meetings_page.set_title "Some title" + + meetings_page.set_start_date "2013-03-28" + meetings_page.set_start_time "13:30" + meetings_page.set_duration "1.5" + meetings_page.click_create + + show_page.trigger_dropdown_menu_item "Delete meeting" + show_page.expect_modal "Delete meeting" + + show_page.within_modal "Delete meeting" do + click_on "Delete" + end + + expect(page).to have_current_path project_meetings_path(project) + + expect_flash(type: :success, message: "Successful deletion.") + end + + it "keeps the current selected project when hitting a validation error (Regression #59972)" do + meetings_page.set_project project + meetings_page.click_create + wait_for_network_idle + + expect(page).to have_text "Title can't be blank." + + within("[data-test-selector='project_id']") do + expect(page).to have_text project.name + end + + meetings_page.set_title "Some title" + meetings_page.click_create + wait_for_network_idle + + expect(page).to have_css("h1", text: "Some title") + meeting = Meeting.last + expect(meeting.title).to eq "Some title" + expect(meeting.project).to eq project + end +end diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb index 5eba946db7b5..2d10037a2710 100644 --- a/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_participant_spec.rb @@ -31,8 +31,7 @@ require_relative "../../support/pages/structured_meeting//mobile/show" RSpec.describe "Structured meetings participants", - :js, - :with_cuprite do + :js do include Components::Autocompleter::NgSelectAutocompleteHelpers shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } diff --git a/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb b/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb index 6d7e479a5aca..3ded9726a03b 100644 --- a/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/structured_meeting_update_flash_spec.rb @@ -33,7 +33,7 @@ RSpec.describe "Structured meetings CRUD", :js, - with_cuprite: false do + :selenium do include Components::Autocompleter::NgSelectAutocompleteHelpers shared_let(:project) { create(:project, enabled_module_names: %w[meetings work_package_tracking]) } @@ -112,6 +112,8 @@ end show_page.expect_section(title: "First section") + show_page.visit! + expect(page).to have_no_text I18n.t(:notice_meeting_updated) end # Expect notification in window1 @@ -151,6 +153,10 @@ ## Close meeting find_test_selector("close-meeting-button").click + expect(page).to have_text "This meeting is closed." + + show_page.visit! + expect(page).to have_text "This meeting is closed." end # Expect notification in window1 diff --git a/modules/meeting/spec/features/structured_meetings/turbo_links_spec.rb b/modules/meeting/spec/features/structured_meetings/turbo_links_spec.rb index 7eb01c1d3c9f..d4b98593cd59 100644 --- a/modules/meeting/spec/features/structured_meetings/turbo_links_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/turbo_links_spec.rb @@ -32,8 +32,7 @@ require_relative "../../support/pages/structured_meeting/show" RSpec.describe "Structured meetings links caught by turbo", - :js, - :with_cuprite do + :js do include Rails.application.routes.url_helpers shared_let(:project) { create(:project, enabled_module_names: %w[meetings]) } @@ -65,7 +64,7 @@ it "can link to the other meeting" do click_link_or_button "Meeting link" - expect(page).to have_current_path meeting_path(meeting2) + expect(page).to have_current_path project_meeting_path(project, meeting2) expect(page).to have_css("#content", text: "Other meeting", visible: :visible) end end diff --git a/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb b/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb index cef6c8721316..58c295a8d600 100644 --- a/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb +++ b/modules/meeting/spec/features/structured_meetings/work_package_meetings_tab_spec.rb @@ -31,8 +31,7 @@ require_relative "../../support/pages/structured_meeting/show" RSpec.describe "Open the Meetings tab", - :js, - :with_cuprite do + :js do shared_let(:project) { create(:project) } shared_let(:work_package) { create(:work_package, project:, subject: "A test work_package") } @@ -260,7 +259,7 @@ meeting_containers = page .all("[data-test-selector^='op-meeting-container-']") - .map { |container| container["data-test-selector"] } # rubocop:disable Rails/Pluck + .map { |container| container["data-test-selector"] } expect(meeting_containers).to contain_exactly("op-meeting-container-#{first_meeting.id}", "op-meeting-container-#{second_meeting.id}") end diff --git a/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb b/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb new file mode 100644 index 000000000000..2116ac5c633c --- /dev/null +++ b/modules/meeting/spec/mailers/meeting_series_mailer_spec.rb @@ -0,0 +1,158 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require_relative "../spec_helper" + +RSpec.describe MeetingSeriesMailer do + shared_let(:role) { create(:project_role, permissions: [:view_meetings]) } + shared_let(:project) { create(:project, name: "My project") } + shared_let(:author) do + create(:user, + member_with_roles: { project => role }, + preferences: { time_zone: "Europe/Berlin" }) + end + shared_let(:recipient) { create(:user, member_with_roles: { project => role }) } + + let(:series) do + create(:recurring_meeting, + title: "Recurring Standup", + project: project, + author: author) + end + let(:i18n) do + Class.new do + include Redmine::I18n + public :format_date, :format_time + end + end + + let(:tokyo_offset) { "UTC#{ActiveSupport::TimeZone['Asia/Tokyo'].now.formatted_offset}" } + let(:berlin_offset) { "UTC#{ActiveSupport::TimeZone['Europe/Berlin'].now.formatted_offset}" } + + before do + User.current = author + end + + describe "template_completed" do + let(:mail) { described_class.template_completed(series, recipient, author) } + + it "renders the headers" do + expect(mail.subject).to include(series.project.name) + expect(mail.subject).to include(series.title) + expect(mail.to).to contain_exactly(recipient.mail) + expect(mail.from).to eq([Setting.mail_from]) + end + + it "renders the text body" do + User.execute_as(recipient) do + check_series_mail_content(mail.text_part.body) + end + end + + it "renders the html body" do + User.execute_as(recipient) do + check_series_mail_content(mail.html_part.body) + end + end + + it "attaches an iCalendar file" do + expect(mail.attachments["meeting.ics"]).to be_present + end + end + + describe "rescheduled" do + let(:changes) { { old_schedule: "some old schedule" } } + let(:mail) { described_class.rescheduled(series, recipient, author, changes:) } + + it "renders the headers" do + expect(mail.subject).to include(series.project.name) + expect(mail.subject).to include(series.title) + expect(mail.to).to contain_exactly(recipient.mail) + expect(mail.from).to eq([Setting.mail_from]) + end + + it "renders the text body" do + User.execute_as(recipient) do + check_series_mail_content(mail.text_part.body) + expect(mail.text_part.body).to include("has changed the schedule") + expect(mail.text_part.body).to include("some old schedule") + expect(mail.text_part.body).to include(series.full_schedule_in_words) + end + end + + it "renders the html body" do + User.execute_as(recipient) do + check_series_mail_content(mail.html_part.body) + expect(mail.html_part.body).to include("has changed the schedule") + expect(mail.html_part.body).to include("some old schedule") + expect(mail.html_part.body).to include(series.full_schedule_in_words) + end + end + + it "attaches an iCalendar file" do + expect(mail.attachments["meeting.ics"]).to be_present + end + end + + describe "icalendar attachment" do + let(:mail) { described_class.template_completed(series, recipient, author) } + let(:ical) { mail.parts.detect { |x| !x.multipart? } } + let(:parsed) { Icalendar::Event.parse(ical.body.raw_source) } + let(:entry) { parsed.first } + + it "renders the calendar entry" do + expect(parsed).to be_a Array + expect(parsed.length).to eq 1 + + expect(entry.summary).to eq "[My project] Recurring Standup" + expect(entry.description).to eq "[My project] Meeting series: Recurring Standup" + expect(entry.location).to eq(series.template&.location.presence) + end + end + + context "with a recipient with another time zone" do + let!(:preference) { recipient.pref.update(time_zone: "Asia/Tokyo") } + let(:mail) { described_class.template_completed(series, recipient, author) } + + it "renders the mail with the correct locale" do + expect(mail.text_part.body).to include(tokyo_offset) + expect(mail.html_part.body).to include(tokyo_offset) + + expect(mail.to).to contain_exactly(recipient.mail) + end + end + + def check_series_mail_content(body) + expect(body).to include(series.project.name) + expect(body).to include(series.title) + expect(body).to include(series.full_schedule_in_words) + expect(body).to include(i18n.formatted_time_zone_offset) + end +end diff --git a/modules/meeting/spec/models/recurring_meeting_spec.rb b/modules/meeting/spec/models/recurring_meeting_spec.rb index 5497bace6a7a..c1a6acd09151 100644 --- a/modules/meeting/spec/models/recurring_meeting_spec.rb +++ b/modules/meeting/spec/models/recurring_meeting_spec.rb @@ -118,7 +118,7 @@ it "schedules daily", :aggregate_failures do expect(subject.first_occurrence).to eq Time.zone.tomorrow + 10.hours - expect(subject.last_occurrence).to eq Time.zone.tomorrow + 6.days + 10.hours + expect(subject.last_occurrence).to eq Time.zone.tomorrow + 7.days + 10.hours occurrence_in_two_days = Time.zone.today + 2.days + 10.hours Timecop.freeze(Time.zone.tomorrow + 11.hours) do @@ -186,7 +186,7 @@ it "schedules weekly", :aggregate_failures do expect(subject.first_occurrence).to eq Time.zone.tomorrow + 10.hours - expect(subject.last_occurrence).to eq Time.zone.tomorrow + 3.weeks + 10.hours + expect(subject.last_occurrence).to eq Time.zone.tomorrow + 4.weeks + 10.hours following_occurrence = Time.zone.tomorrow + 7.days + 10.hours Timecop.freeze(Time.zone.tomorrow + 11.hours) do @@ -198,7 +198,8 @@ Time.zone.tomorrow + 10.hours, Time.zone.tomorrow + 7.days + 10.hours, Time.zone.tomorrow + 14.days + 10.hours, - Time.zone.tomorrow + 21.days + 10.hours + Time.zone.tomorrow + 21.days + 10.hours, + Time.zone.tomorrow + 28.days + 10.hours ] Timecop.freeze(Time.zone.tomorrow + 5.weeks) do @@ -206,4 +207,31 @@ end end end + + describe "never ending meeting" do + subject do + build(:recurring_meeting, + start_time: Time.zone.tomorrow + 10.hours, + frequency: "daily", + end_after: "never") + end + + it "schedules daily", :aggregate_failures do + expect(subject.first_occurrence).to eq Time.zone.tomorrow + 10.hours + expect(subject.remaining_occurrences).to be_nil + expect(subject.last_occurrence).to be_nil + end + end + + describe "#upcoming_instantiated_meetings" do + let!(:recurring_meeting) { create(:recurring_meeting) } + let!(:ongoing_meeting) do + create(:scheduled_meeting, :persisted, start_time: 5.minutes.ago, recurring_meeting: recurring_meeting) + end + let!(:cancelled_meeting) { create(:scheduled_meeting, recurring_meeting: recurring_meeting, cancelled: true) } + + it "returns only upcoming and not cancelled meetings" do + expect(recurring_meeting.upcoming_instantiated_meetings).to eq [ongoing_meeting] + end + end end diff --git a/modules/meeting/spec/requests/meetings_delete_spec.rb b/modules/meeting/spec/requests/meetings_delete_spec.rb new file mode 100644 index 000000000000..6ba4d538b198 --- /dev/null +++ b/modules/meeting/spec/requests/meetings_delete_spec.rb @@ -0,0 +1,88 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +RSpec.describe "DELETE /meetings/:id", + :skip_csrf, + type: :rails_request do + include Redmine::I18n + + shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) } + shared_let(:user) do + create(:user, + firstname: "Bob", + lastname: "User", + member_with_permissions: { project => %i[view_meetings delete_meetings] }) + end + + shared_let(:meeting) do + create :meeting, + project:, + title: "My one-time meeting", + author: user, + start_time: Time.zone.today - 10.days + 10.hours + end + + let(:current_user) { user } + let(:request) { delete project_meeting_path(project, meeting) } + + subject do + request + response + end + + before do + login_as(current_user) + end + + context "when user has permissions to access" do + it "deletes the meeting" do + expect(subject).to have_http_status(:see_other) + + expect { meeting.reload }.to raise_error(ActiveRecord::RecordNotFound) + + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries.size).to eq(1) + mail = ActionMailer::Base.deliveries.first + expect(mail.body.parts.first.parts.first.body.to_s) + .to include "'My one-time meeting' has been cancelled by #{user.name}" + end + end + + context "when user has no permissions to access" do + let(:current_user) { create(:user) } + + it "does not delete project meeting" do + delete project_meeting_path(project, meeting) + expect(response).to have_http_status(:forbidden) + end + end +end diff --git a/modules/meeting/spec/requests/meetings_index_spec.rb b/modules/meeting/spec/requests/meetings_index_spec.rb new file mode 100644 index 000000000000..329d280a2883 --- /dev/null +++ b/modules/meeting/spec/requests/meetings_index_spec.rb @@ -0,0 +1,283 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +RSpec.describe "Meeting index", + :skip_csrf, + type: :rails_request do + shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) } + shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings] }) } + + shared_let(:past) do + create(:structured_meeting, + title: "an earlier meeting", + start_time: DateTime.parse("2025-01-29T06:00:00Z"), + project:, + author: user) + end + + shared_let(:today) do + create(:structured_meeting, + title: "meeting starting soon", + start_time: DateTime.parse("2025-01-29T10:00:00Z"), + project:, + author: user) + end + + shared_let(:tomorrow) do + create(:structured_meeting, + title: "meeting starting tomorrow", + start_time: DateTime.parse("2025-01-30T10:00:00Z"), + project:, + author: user) + end + + shared_let(:saturday) do + create(:structured_meeting, + title: "weekend meeting on saturday", + start_time: DateTime.parse("2025-02-01T10:00:00Z"), + project:, + author: user) + end + + shared_let(:sunday) do + create(:structured_meeting, + title: "weekend meeting on sunday", + start_time: DateTime.parse("2025-02-02T10:00:00Z"), + project:, + author: user) + end + + shared_let(:next_monday) do + create(:structured_meeting, + title: "meeting on next monday", + start_time: DateTime.parse("2025-02-03T10:00:00Z"), + project:, + author: user) + end + + shared_let(:next_friday) do + create(:structured_meeting, + title: "meeting on next friday", + start_time: DateTime.parse("2025-02-07T10:00:00Z"), + project:, + author: user) + end + + let(:request) { get "/projects/#{project.id}/meetings" } + let(:current_time) { "2025-01-29T8:00:00Z".to_datetime } + + subject do + Timecop.freeze(current_time) do + request + end + + response + end + + before do + login_as user + end + + describe "with start_of_week on monday", + with_settings: { start_of_week: 1 } do + it "sorts upcoming meetings into buckets" do + expect(subject).to have_http_status(:ok) + content = page.find_by_id("content") + expect(content).to have_text "Tomorrow" + expect(content).to have_text "Later this week" + expect(content).to have_text "Next week and later" + expect(content).to have_no_text "an earlier meeting" + + today = page.find("[data-test-selector='meetings-table-today']") + expect(today).to have_text "meeting starting soon" + + tomorrow = page.find("[data-test-selector='meetings-table-tomorrow']") + expect(tomorrow).to have_text "meeting starting tomorrow" + + this_week = page.find("[data-test-selector='meetings-table-this_week']") + expect(this_week).to have_text "weekend meeting on saturday" + expect(this_week).to have_text "weekend meeting on sunday" + + later = page.find("[data-test-selector='meetings-table-later']") + expect(later).to have_text "meeting on next monday" + expect(later).to have_text "meeting on next friday" + end + + context "when we request after 10am" do + let(:current_time) { "2025-01-29T14:00:00Z".to_datetime } + + it "does not include times for next monday in earlier groups (Regression #61486)" do + expect(subject).to have_http_status(:ok) + content = page.find_by_id("content") + expect(content).to have_text "Tomorrow" + expect(content).to have_text "Later this week" + expect(content).to have_text "Next week and later" + expect(content).to have_no_text "an earlier meeting" + + later = page.find("[data-test-selector='meetings-table-later']") + expect(later).to have_text "meeting on next monday" + end + end + + context "when some meeting groups are empty" do + before do + today.destroy! + end + + it "shows only the matching bucket" do + expect(subject).to have_http_status(:ok) + content = page.find_by_id("content") + expect(content).to have_text "Tomorrow" + expect(content).to have_text "Later this week" + expect(content).to have_text "Next week and later" + expect(content).to have_no_text "Today" + + expect(page).to have_no_css("#meetings-table-today") + + tomorrow = page.find("[data-test-selector='meetings-table-tomorrow']") + expect(tomorrow).to have_text "meeting starting tomorrow" + + this_week = page.find("[data-test-selector='meetings-table-this_week']") + expect(this_week).to have_text "weekend meeting on saturday" + expect(this_week).to have_text "weekend meeting on sunday" + + later = page.find("[data-test-selector='meetings-table-later']") + expect(later).to have_text "meeting on next monday" + expect(later).to have_text "meeting on next friday" + end + end + end + + describe "with start_of_week on sunday", + with_settings: { start_of_week: 0 } do + it "sorts upcoming meetings into buckets" do + expect(subject).to have_http_status(:ok) + + content = page.find_by_id("content") + expect(content).to have_text "Today" + expect(content).to have_text "Tomorrow" + expect(content).to have_text "Later this week" + expect(content).to have_text "Next week and later" + expect(content).to have_no_text "an earlier meeting" + + today = page.find("[data-test-selector='meetings-table-today']") + expect(today).to have_text "meeting starting soon" + + tomorrow = page.find("[data-test-selector='meetings-table-tomorrow']") + expect(tomorrow).to have_text "meeting starting tomorrow" + + this_week = page.find("[data-test-selector='meetings-table-this_week']") + expect(this_week).to have_text "weekend meeting on saturday" + expect(this_week).to have_text "weekend meeting on sunday" + + later = page.find("[data-test-selector='meetings-table-later']") + expect(later).to have_text "meeting on next monday" + expect(later).to have_text "meeting on next friday" + end + end + + describe "with start_of_week on saturday", + with_settings: { start_of_week: 6 } do + it "sorts upcoming meetings into buckets" do + expect(subject).to have_http_status(:ok) + + content = page.find_by_id("content") + expect(content).to have_text "Tomorrow" + expect(content).to have_text "Next week and later" + expect(content).to have_no_text "Later this week" + expect(content).to have_no_text "an earlier meeting" + + today = page.find("[data-test-selector='meetings-table-today']") + expect(today).to have_text "meeting starting soon" + + tomorrow = page.find("[data-test-selector='meetings-table-tomorrow']") + expect(tomorrow).to have_text "meeting starting tomorrow" + + expect(page).to have_no_css("[data-test-selector='meetings-table-this_week']") + + later = page.find("[data-test-selector='meetings-table-later']") + expect(later).to have_text "weekend meeting on saturday" + expect(later).to have_text "weekend meeting on sunday" + expect(later).to have_text "meeting on next monday" + expect(later).to have_text "meeting on next friday" + end + end + + context "when showing past meetings" do + let(:request) { get "/projects/#{project.id}/meetings?upcoming=false" } + + it "shows only one table" do + expect(subject).to have_http_status(:ok) + + content = page.find_by_id("content") + expect(content).to have_no_text "Today" + expect(content).to have_no_text "Tomorrow" + expect(content).to have_no_text "Later this week" + expect(content).to have_no_text "Next week and later" + + table = page.find("[data-test-selector='Meetings::TableComponent']") + expect(table).to have_text "an earlier meeting" + expect(table).to have_no_text "meeting starting soon" + expect(table).to have_no_text "meeting starting tomorrow" + expect(table).to have_no_text "weekend meeting on sunday" + expect(table).to have_no_text "meeting on next monday" + expect(table).to have_no_text "meeting on next friday" + end + end + + describe "paginating options" do + context "when requesting the first page with limit=1" do + let(:request) { get "/projects/#{project.id}/meetings?limit=1" } + + it "shows a pagination" do + expect(subject).to have_http_status(:ok) + + expect(page).to have_css("#meetings-table-footer-component") + expect(page).to have_text "There is one more meeting" + expect(page).to have_text "meeting on next monday" + expect(page).to have_no_text "meeting on next friday" + end + end + + context "when requesting the second page with limit=100" do + let(:request) { get "/projects/#{project.id}/meetings?limit=100" } + + it "shows a pagination" do + expect(subject).to have_http_status(:ok) + + expect(page).to have_no_css("#meetings-table-footer-component") + expect(page).to have_text "meeting on next monday" + expect(page).to have_text "meeting on next friday" + end + end + end +end diff --git a/modules/meeting/spec/requests/meetings_menu_spec.rb b/modules/meeting/spec/requests/meetings_menu_spec.rb new file mode 100644 index 000000000000..751f02fbdb40 --- /dev/null +++ b/modules/meeting/spec/requests/meetings_menu_spec.rb @@ -0,0 +1,91 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" + +RSpec.describe "Meeting index menu", + :skip_csrf, + type: :rails_request do + shared_let(:project) { create(:public_project, enabled_module_names: %i[meetings]) } + shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings] }) } + + let(:request) do + get "/projects/#{project.id}/meetings/menu", + params: { current_href: "/projects/#{project.identifier}/meetings" } + end + + subject do + request + response + end + + before do + login_as user + end + + describe "with normal user that can see meetings" do + it "shows all meetings and involvements" do + request + + expect(page).to have_css(".op-submenu--item-action.selected", text: "My meetings") + expect(page).to have_text "All meetings" + expect(page).to have_text "Involvement" + expect(page).to have_text "Invitations" + expect(page).to have_text "Created by me" + expect(page).to have_text "Attended" + end + end + + describe "with anonymous user that can see meetings" do + let(:user) do + create(:anonymous_role, permissions: %i[view_project view_meetings]) + User.anonymous + end + + context "when login required", with_settings: { login_required: true } do + it "redirects to login" do + expect(subject).to redirect_to(signin_path(back_url: menu_project_meetings_url(project.id))) + end + end + + context "when login not required", with_settings: { login_required: false } do + it "shows all meetings, but no involvements" do + request + + expect(page).to have_css(".op-submenu--item-action.selected", text: "All meetings") + expect(page).to have_no_text "My meetings" + expect(page).to have_no_text "Involvement" + expect(page).to have_no_text "Invitations" + expect(page).to have_no_text "Created by me" + expect(page).to have_no_text "Attended" + end + end + end +end diff --git a/modules/meeting/spec/requests/meetings_spec.rb b/modules/meeting/spec/requests/meetings_spec.rb index cd6b7af0b80e..3a1f0c67d3e0 100644 --- a/modules/meeting/spec/requests/meetings_spec.rb +++ b/modules/meeting/spec/requests/meetings_spec.rb @@ -74,7 +74,7 @@ let(:send_notifications) { "1" } it "sends an invitation mail to the invited users" do - patch(meeting_path(meeting), params:) + patch(project_meeting_path(project, meeting), params:) expect(subject.participants.count).to eq(2) @@ -88,7 +88,7 @@ let(:send_notifications) { "0" } it "sends an invitation mail to the invited users" do - patch(meeting_path(meeting), params:) + patch(project_meeting_path(project, meeting), params:) expect(subject.participants.count).to eq(2) diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_delete_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_delete_spec.rb new file mode 100644 index 000000000000..18d13c2f9521 --- /dev/null +++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_delete_spec.rb @@ -0,0 +1,110 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" +require_relative "../../support/pages/recurring_meeting/show" + +RSpec.describe "DELETE /recurring_meetings/:id", + :skip_csrf, + type: :rails_request do + include Redmine::I18n + + shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) } + shared_let(:user) do + create(:user, + firstname: "Bob", + lastname: "User", + member_with_permissions: { project => %i[view_meetings delete_meetings] }) + end + + shared_let(:recurring_meeting) do + create :recurring_meeting, + project:, + author: user, + start_time: Time.zone.today - 10.days + 10.hours, + frequency: "daily" + end + + let(:current_user) { user } + let(:show_page) { Pages::RecurringMeeting::Show.new(recurring_meeting).with_capybara_page(page) } + let(:request) { delete project_recurring_meeting_path(project, recurring_meeting) } + + subject do + request + response + end + + before do + login_as(current_user) + + # Assuming the first init job has run + RecurringMeetings::InitNextOccurrenceJob.perform_now(recurring_meeting, recurring_meeting.first_occurrence.to_time) + end + + context "when user has permissions to access" do + it "deletes the series" do + title = recurring_meeting.title + expect(subject).to have_http_status(:see_other) + + expect { recurring_meeting.reload }.to raise_error(ActiveRecord::RecordNotFound) + + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries.size).to eq(1) + mail = ActionMailer::Base.deliveries.first + expect(mail.body.parts.first.parts.first.body.to_s) + .to include "Meeting series '#{title}' has been cancelled by #{user.name}." + end + + context "when deleting an occurrence" do + let(:request) { delete project_meeting_path(project, recurring_meeting.meetings.not_templated.last) } + + it "deletes the occurrence" do + title = recurring_meeting.template.title + expect { subject }.to change(recurring_meeting.meetings, :count).by(-1) + expect(subject).to have_http_status(:see_other) + + expect(recurring_meeting.reload).to be_present + expect(ActionMailer::Base.deliveries.size).to eq(1) + mail = ActionMailer::Base.deliveries.first + expect(mail.body.parts.first.parts.first.body.to_s) + .to include "An occurrence of '#{title}' has been cancelled by #{user.name}." + end + end + end + + context "when user has no permissions to access" do + let(:current_user) { create(:user) } + + it "does not show project recurring meetings" do + delete project_recurring_meeting_path(project, recurring_meeting) + expect(response).to have_http_status(:forbidden) + end + end +end diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_end_series_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_end_series_spec.rb new file mode 100644 index 000000000000..206f0d2afe5d --- /dev/null +++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_end_series_spec.rb @@ -0,0 +1,195 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" +require_relative "../../support/pages/recurring_meeting/show" + +RSpec.describe "Recurring meetings complete template", + :skip_csrf, + type: :rails_request, + with_settings: { date_format: "%Y-%m-%d" } do + include Redmine::I18n + + shared_let(:project) { create(:project, enabled_module_names: %i[meetings]) } + shared_let(:user) { create(:user, member_with_permissions: { project => %i[view_meetings create_meetings edit_meetings] }) } + shared_let(:recurring_meeting) do + create :recurring_meeting, + project:, + author: user, + start_time: DateTime.parse("2024-12-05T10:00:00Z"), + frequency: "daily" + end + + let(:current_user) { user } + let(:show_page) { Pages::RecurringMeeting::Show.new(recurring_meeting).with_capybara_page(page) } + let(:request) do + post end_series_project_recurring_meeting_path(project, recurring_meeting) + end + + subject do + Timecop.freeze("2025-01-29T10:00:00Z".to_datetime) { request } + end + + before do + login_as(current_user) + end + + context "when past occurrence is already created" do + let!(:meeting) { create(:structured_meeting, recurring_meeting:, start_time: recurring_meeting.start_time) } + let!(:schedule) do + create :scheduled_meeting, + meeting:, + recurring_meeting:, + start_time: recurring_meeting.start_time + end + + it "does not delete that one" do + expect { subject }.not_to change(recurring_meeting.scheduled_meetings, :count) + expect(response).to be_redirect + + expect(recurring_meeting.scheduled_meetings.count).to eq(1) + first = recurring_meeting.scheduled_meetings.first.meeting + expect(first).to eq(meeting) + end + end + + context "when start_time < current time" do + let!(:meeting) { create(:structured_meeting, recurring_meeting:, start_time: recurring_meeting.start_time) } + let!(:schedule) do + create :scheduled_meeting, + meeting:, + recurring_meeting:, + start_time: recurring_meeting.start_time + end + + subject do + Timecop.freeze("2024-12-04T10:00:00Z".to_datetime) { request } + end + + it "returns an error" do + expect { subject }.not_to change { recurring_meeting.reload.updated_at } + expect(response).to be_redirect + expect(flash[:error]).to include "End date must be after 2024-12-05." + end + end + + context "when first occurrence is cancelled" do + let!(:schedule) do + create :scheduled_meeting, + :cancelled, + recurring_meeting:, + start_time: recurring_meeting.start_time + end + + it "does not delete this occurrence" do + expect { subject }.not_to change(recurring_meeting.scheduled_meetings, :count) + expect(response).to be_redirect + + recurring_meeting.reload + expect(recurring_meeting.end_date).to eq Date.parse("2025-01-29") + + expect(recurring_meeting.scheduled_meetings.count).to eq(1) + first = recurring_meeting.scheduled_meetings.first + expect(first).to be_cancelled + end + end + + context "when todays occurrence is present, but we're later" do + let!(:schedule) do + create :scheduled_meeting, + recurring_meeting:, + start_time: DateTime.parse("2024-12-05T10:00:00Z") + end + + subject do + Timecop.freeze("2024-12-05T10:01:00Z".to_datetime) { request } + end + + it "does not delete this occurrence" do + expect { subject }.not_to change(recurring_meeting.scheduled_meetings, :count) + expect(response).to be_redirect + + recurring_meeting.reload + expect(recurring_meeting.end_date).to eq Date.parse("2024-12-05") + expect(recurring_meeting.scheduled_meetings.count).to eq(1) + end + end + + context "when todays occurrence is present, but we're sooner" do + let!(:schedule) do + create :scheduled_meeting, + recurring_meeting:, + start_time: DateTime.parse("2024-12-05T10:00:00Z") + end + + subject do + Timecop.freeze("2024-12-05T09:59:00Z".to_datetime) { request } + end + + it "does delete this occurrence" do + expect { subject }.to change(recurring_meeting.scheduled_meetings, :count).by(-1) + expect(response).to be_redirect + + recurring_meeting.reload + expect(recurring_meeting.end_date).to eq Date.parse("2024-12-05") + end + end + + context "when next occurrence is present" do + let!(:schedule) do + create :scheduled_meeting, + recurring_meeting:, + start_time: DateTime.parse("2024-12-06T10:00:00Z") + end + + subject do + Timecop.freeze("2024-12-05T10:00:00Z".to_datetime) { request } + end + + it "does delete this occurrence" do + expect { subject }.to change(recurring_meeting.scheduled_meetings, :count).by(-1) + expect(response).to be_redirect + + recurring_meeting.reload + expect(recurring_meeting.end_date).to eq Date.parse("2024-12-05") + expect(recurring_meeting.scheduled_meetings.count).to eq(0) + expect { schedule.reload }.to raise_error(ActiveRecord::RecordNotFound) + end + end + + context "when user has no permissions to access" do + let(:current_user) { create(:user) } + + it "does not authorize" do + subject + expect(response).to have_http_status(:forbidden) + end + end +end diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb index 12ad0130c9df..10c351e0acb7 100644 --- a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb +++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_show_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -46,6 +48,7 @@ let(:current_user) { user } let(:show_page) { Pages::RecurringMeeting::Show.new(recurring_meeting).with_capybara_page(page) } + let(:request) { get project_recurring_meeting_path(project, recurring_meeting) } before do login_as(current_user) @@ -54,13 +57,40 @@ context "when user has permissions to access" do it "shows the recurring meetings" do get recurring_meeting_path(recurring_meeting) - expect(response).to have_http_status(:ok) + expect(response).to have_http_status(:see_other) + expect(response).to redirect_to(project_recurring_meeting_path(project, recurring_meeting)) end it "shows project recurring meetings" do get project_recurring_meeting_path(project, recurring_meeting) expect(response).to have_http_status(:ok) end + + context "when the meeting has and end_date < today" do + before do + recurring_meeting.update_columns(end_date: Time.zone.yesterday) + end + + it "shows the appropriate blankslate and text" do + request + expect(page).to have_text "Meeting series ended" + expect(page).to have_text "ended on #{format_date(Time.zone.yesterday)}" + end + end + + context "when the meeting has no end_date, but iterations" do + before do + recurring_meeting.update_columns(end_after: "iterations", + iterations: 2, + start_time: Time.zone.today - 3.days + 10.hours) + end + + it "shows the blankslate for two days ago" do + request + expect(page).to have_text "Meeting series ended" + expect(page).to have_text "ended on #{format_date(Time.zone.today - 2.days)}" + end + end end describe "past quick filter" do @@ -80,12 +110,101 @@ end it "does not show the cancelled meeting" do - get recurring_meeting_path(recurring_meeting, direction: "past") + get project_recurring_meeting_path(project, recurring_meeting, direction: "past") expect(page).to have_text format_time(past_instance.start_time) expect(page).to have_no_text format_time(past_schedule_cancelled.start_time) expect(page).to have_no_css("li", text: "Cancelled") end + + context "when meeting has ended and no upcoming meetings remain" do + before do + recurring_meeting.update_columns(end_date: Time.zone.yesterday) + end + + it "still shows the one past meeting (Regression #61280)" do + get project_recurring_meeting_path(project, recurring_meeting, direction: "past") + expect(page).to have_text format_time(past_instance.start_time) + end + end + end + + describe "upcoming tab" do + let!(:upcoming_open_meeting) do + create(:structured_meeting, recurring_meeting:, start_time: Time.zone.today + 1.day + 10.hours, state: :open) + end + let!(:open_meeting) do + create :scheduled_meeting, + meeting: upcoming_open_meeting, + recurring_meeting:, + start_time: Time.zone.today + 1.day + 10.hours + end + + let!(:cancelled_meeting) do + create :scheduled_meeting, + recurring_meeting:, + start_time: Time.zone.today + 2.days + 10.hours, + cancelled: true + end + + it "sorts meetings into two tables based on state" do + get project_recurring_meeting_path(project, recurring_meeting) + + content = page.find_by_id("content") + expect(content).to have_text "Open" + expect(content).to have_text "Planned" + + open_meeting_date = format_time(open_meeting.start_time) + cancelled_meeting_date = format_time(cancelled_meeting.start_time) + scheduled_meeting_date = format_time(Time.zone.today + 2.days + 10.hours) + + agenda_opened = page.find("[data-test-selector='agenda-opened-table']") + expect(agenda_opened).to have_text open_meeting_date + + planned = page.find("[data-test-selector='planned-table']") + expect(planned).to have_text cancelled_meeting_date + expect(planned).to have_text scheduled_meeting_date + end + end + + describe "upcoming meeting that is already closed" do + shared_let(:recurring_meeting) do + create :recurring_meeting, + project:, + author: user, + start_time: Time.zone.today + 10.hours, + end_after: "iterations", + iterations: 1, + frequency: "daily" + end + + let!(:ongoing_meeting) do + create(:structured_meeting, recurring_meeting:, start_time: Time.zone.today + 10.hours, state: :open) + end + let!(:ongoing_schedule) do + create :scheduled_meeting, + meeting: ongoing_meeting, + recurring_meeting:, + start_time: Time.zone.today + 10.hours + end + + it "does not show the meeting ended blankslate" do + travel_to(Time.zone.today + 9.hours) do + get project_recurring_meeting_path(project, recurring_meeting) + end + + expect(page).to have_text format_time(ongoing_meeting.start_time) + expect(page).to have_text "No more planned meetings" + expect(page).to have_no_text "Meeting series ended" + + travel_to(Time.zone.today + 10.hours + 5.minutes) do + get project_recurring_meeting_path(project, recurring_meeting) + end + + expect(page).to have_text format_time(ongoing_meeting.start_time) + expect(page).to have_text "No more planned meetings" + expect(page).to have_no_text "Meeting series ended" + end end describe "upcoming quick filter" do @@ -103,7 +222,7 @@ end it "shows rescheduled occurrences" do - get recurring_meeting_path(recurring_meeting) + get project_recurring_meeting_path(project, recurring_meeting) old_date = format_time(rescheduled.start_time) new_date = format_time(rescheduled_instance.start_time) @@ -112,6 +231,57 @@ end end + context "with an edited meeting series" do + let(:recurring_meeting) do + create :recurring_meeting, + project:, + author: user, + start_time: Time.zone.today + 2.days + 10.hours, + frequency: "daily", + end_after: "iterations", + iterations: 2 + end + let!(:first_instance) do + create :structured_meeting, + recurring_meeting:, + start_time: Time.zone.today + 2.days + 10.hours, + state: :open + end + let!(:first) do + create :scheduled_meeting, + meeting: first_instance, + recurring_meeting:, + start_time: Time.zone.today + 2.days + 10.hours + end + let!(:second_instance) do + create :structured_meeting, + recurring_meeting:, + start_time: Time.zone.today + 3.days + 10.hours, + state: :open + end + let!(:second) do + create :scheduled_meeting, + meeting: second_instance, + recurring_meeting:, + start_time: Time.zone.today + 3.days + 10.hours + end + + before do + recurring_meeting.update(iterations: 1) + end + + it "shows all open meetings in 'Open', even if they no longer match the schedule (Regression #61301)" do + get project_recurring_meeting_path(project, recurring_meeting) + + first_date = format_time(first.start_time) + second_date = format_time(second.start_time) + + open = page.find("[data-test-selector='agenda-opened-table']") + expect(open).to have_text first_date + expect(open).to have_text second_date + end + end + context "with a cancelled meeting" do let!(:rescheduled) do create :scheduled_meeting, @@ -121,7 +291,7 @@ end it "shows the cancelled occurrences" do - get recurring_meeting_path(recurring_meeting) + get project_recurring_meeting_path(project, recurring_meeting) expect(page).to have_css("li", text: format_time(rescheduled.start_time)) expect(page).to have_css("li", text: "Cancelled") @@ -132,7 +302,7 @@ it "shows the next five occurrences" do # Assuming we're past today's occurrence Timecop.freeze(Time.zone.today + 11.hours) do - get recurring_meeting_path(recurring_meeting) + get project_recurring_meeting_path(project, recurring_meeting) end (1..5).each do |date| @@ -142,24 +312,58 @@ end end + context "with an ongoing meeting" do + let(:recurring_meeting) do + create :recurring_meeting, + project:, + author: user, + start_time: Time.zone.today + 10.hours, + frequency: "daily", + end_after: "iterations", + iterations: 5 + end + let!(:ongoing_instance) do + create :structured_meeting, + recurring_meeting:, + start_time: Time.zone.today + 10.hours - 10.minutes + end + let!(:ongoing) do + create :scheduled_meeting, + recurring_meeting:, + meeting: ongoing_instance, + start_time: Time.zone.today + 10.hours - 10.minutes + end + + it "shows the correct number of next occurrences (Regression #61194)" do + # While today's meeting is ongoing, but no longer in remaining_occurrences + Timecop.freeze(Time.zone.today + 10.hours + 1.minute) do + get project_recurring_meeting_path(project, recurring_meeting) + end + + (1..4).each do |date| + expect(page).to have_text format_time(Time.zone.today + date.days + 10.hours) + end + end + end + context "when user has no permissions to access" do let(:current_user) { create(:user) } it "does not show the recurring meetings" do get recurring_meeting_path(recurring_meeting) - expect(response).to have_http_status(:not_found) + expect(response).to have_http_status(:forbidden) end it "does not show project recurring meetings" do get project_recurring_meeting_path(project, recurring_meeting) - expect(response).to have_http_status(:not_found) + expect(response).to have_http_status(:forbidden) end end describe "Show more" do context "when there are more than 5 scheduled instances" do it "shows the footer" do - get recurring_meeting_path(recurring_meeting) + get project_recurring_meeting_path(project, recurring_meeting) expect(page).to have_css("#recurring-meetings-footer-component") end @@ -177,10 +381,27 @@ end it "shows no footer" do - get recurring_meeting_path(recurring_meeting) + get project_recurring_meeting_path(project, recurring_meeting) expect(page).to have_no_css("#recurring-meetings-footer-component") end end + + context "when the meeting has no end date" do + let(:recurring_meeting) do + create :recurring_meeting, + project:, + author: user, + start_time: Time.zone.today + 1.day, + frequency: "daily", + end_after: "never" + end + + it "shows footer, but no counts" do + get project_recurring_meeting_path(project, recurring_meeting) + + expect(page).to have_text "There are more scheduled meetings" + end + end end end diff --git a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb index 0958931b0f9b..d1fedfde2d66 100644 --- a/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb +++ b/modules/meeting/spec/requests/recurring_meetings/recurring_meetings_template_completed_spec.rb @@ -48,7 +48,7 @@ let(:current_user) { user } let(:show_page) { Pages::RecurringMeeting::Show.new(recurring_meeting).with_capybara_page(page) } let(:request) do - post template_completed_recurring_meeting_path(recurring_meeting) + post template_completed_project_recurring_meeting_path(project, recurring_meeting) end subject do @@ -122,7 +122,7 @@ it "does not authorize" do subject - expect(response).to have_http_status(:not_found) + expect(response).to have_http_status(:forbidden) end end end diff --git a/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb b/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb index 055b87205178..28073e7c1f85 100644 --- a/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb +++ b/modules/meeting/spec/seeders/demo_data/project_seeder_spec.rb @@ -55,21 +55,21 @@ let(:project_data) do YAML.load <<~SEEDING_DATA_YAML name: 'Some project' - meetings: + meeting_series: - title: Weekly reference: :weekly_meeting duration: 30 - author: :openproject_user - - title: Implicit 1h duration + frequency: :weekly + interval: 1 author: :openproject_user meeting_agenda_items: - title: First topic - meeting: :weekly_meeting + meeting: :weekly_meeting_template duration: 10 author: :openproject_user notes: Some **markdown** - title: Reference - meeting: :weekly_meeting + meeting: :weekly_meeting_template duration: 5 author: :openproject_user notes: Some **markdown** @@ -81,27 +81,44 @@ project_seeder.seed! end - it "creates an associated meeting" do - meeting = Meeting.find_by(title: "Weekly") - expect(meeting.author).to eq user - expect(meeting.duration).to eq 0.5 + it "creates an associated series and template" do + series = RecurringMeeting.find_by(title: "Weekly") + expect(series.author).to eq user - expect(meeting.agenda_items.count).to eq 2 + template = series.template + expect(template.duration).to eq 0.5 + expect(template.agenda_items.count).to eq 2 - first = meeting.agenda_items.find_by(title: "First topic") + first = template.agenda_items.find_by(title: "First topic") expect(first.duration_in_minutes).to eq 10 expect(first.author).to eq user expect(first.notes).to eq "Some **markdown**" - second = meeting.agenda_items.find_by(work_package:) + second = template.agenda_items.find_by(work_package:) expect(second.title).to be_nil expect(second.duration_in_minutes).to eq 5 expect(second.author).to eq user expect(second.notes).to eq "Some **markdown**" end - it "uses default duration of 1h if not specified" do - meeting = Meeting.find_by(title: "Implicit 1h duration") - expect(meeting.duration).to eq 1 + it "schedules a job for the first instance" do + perform_enqueued_jobs + + series = RecurringMeeting.find_by(title: "Weekly") + expect(series.scheduled_instances.count).to eq(1) + instance = series.scheduled_instances.first.meeting + expect(instance.duration).to eq 0.5 + expect(instance.agenda_items.count).to eq 2 + + first = instance.agenda_items.find_by(title: "First topic") + expect(first.duration_in_minutes).to eq 10 + expect(first.author).to eq user + expect(first.notes).to eq "Some **markdown**" + + second = instance.agenda_items.find_by(work_package:) + expect(second.title).to be_nil + expect(second.duration_in_minutes).to eq 5 + expect(second.author).to eq user + expect(second.notes).to eq "Some **markdown**" end end diff --git a/modules/meeting/spec/services/meetings/create_service_integration_spec.rb b/modules/meeting/spec/services/meetings/create_service_integration_spec.rb index 973eb83bedeb..792937c5f9fe 100644 --- a/modules/meeting/spec/services/meetings/create_service_integration_spec.rb +++ b/modules/meeting/spec/services/meetings/create_service_integration_spec.rb @@ -49,6 +49,18 @@ subject { instance.call(**params, **default_params) } + describe "project" do + context "when not provided" do + let(:default_params) { { title: "foo" } } + + it "complains about the project, not the base authorization" do + expect(subject).not_to be_success + expect(subject.errors[:base]).to be_empty + expect(subject.errors[:project_id]).to contain_exactly "can't be blank." + end + end + end + describe "participants" do context "when passed" do let(:params) do diff --git a/modules/meeting/spec/services/meetings/update_service_integration_spec.rb b/modules/meeting/spec/services/meetings/update_service_integration_spec.rb index 697629cfaf50..2197c9f486cb 100644 --- a/modules/meeting/spec/services/meetings/update_service_integration_spec.rb +++ b/modules/meeting/spec/services/meetings/update_service_integration_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -44,23 +46,161 @@ let(:updated_meeting) { service_result.result } context "when meeting is in a series and scheduled to the future" do - let!(:recurring_meeting) { create(:recurring_meeting, project:, frequency: "daily") } - let!(:meeting) { create(:structured_meeting, recurring_meeting:, project:, start_time: Time.zone.tomorrow + 10.hours) } - let!(:schedule) do + shared_let(:recurring_meeting, refind: true) { create(:recurring_meeting, project:, frequency: "daily") } + shared_let(:meeting, refind: true) do + create(:structured_meeting, + recurring_meeting:, + project:, + start_time: Time.zone.today + 2.days + 10.hours) + end + shared_let(:schedule, refind: true) do create(:scheduled_meeting, meeting:, - start_time: Time.zone.today + 10.hours, + start_time: Time.zone.today + 2.days + 10.hours, recurring_meeting:) end - context "when trying to move it to before the scheduled time" do + context "when scheduled meeting is the first occurrence" do + before do + recurring_meeting.update!(start_time: Time.zone.today + 2.days + 10.hours) + end + + context "when moving it before the start_time of the series" do + let(:params) do + { start_time: Time.zone.tomorrow + 10.hours } + end + + it "is not valid" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]) + .to include("must be after #{format_time(Time.zone.today + 2.days + 10.hours)}.") + end + end + + context "when moving it later" do + let(:params) do + { start_time: Time.zone.today + 20.days + 10.hours } + end + + it "is not valid because needs to be before next occurrence" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]) + .to include("must be before #{format_time(Time.zone.today + 3.days + 10.hours)}.") + end + end + + context "when moving it later than the start time, then moving only start_time_hour" do + let(:params) do + { start_time_hour: "09:00" } + end + + before do + meeting.update_column(:start_time, Time.zone.tomorrow + 11.hours) + end + + it "is not valid because needs to be before next occurrence" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]) + .to include("must be after #{format_time(Time.zone.today + 2.days + 10.hours)}.") + end + end + end + + context "when moving it to the date of the previous schedule" do + let(:params) do + { start_time: Time.zone.today + 1.day + 10.hours } + end + + it "is not valid" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]).to include("must be after #{format_time(Time.zone.tomorrow + 10.hours)}.") + end + end + + context "when moving it to earlier than the date of the previous schedule" do + let(:params) do + { start_time: Time.zone.today + 1.day + 8.hours } + end + + it "is not valid" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]).to include("must be after #{format_time(Time.zone.tomorrow + 10.hours)}.") + end + end + + context "when moving it to after the date of the previous schedule" do + let(:params) do + { start_time: Time.zone.today + 1.day + 12.hours } + end + + it "is valid" do + expect(service_result).to be_success + end + end + + context "when previous schedule exists tomorrow at 10:00" do + shared_let(:previous_meeting) do + create(:structured_meeting, recurring_meeting:, project:, start_time: Time.zone.tomorrow + 10.hours) + end + shared_let(:previous_schedule) do + create(:scheduled_meeting, + meeting: previous_meeting, + start_time: Time.zone.tomorrow + 10.hours, + recurring_meeting:) + end + + context "and we try to move it to that date" do + let(:params) do + { start_time: Time.zone.tomorrow + 10.hours } + end + + it "is not valid" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]).to include("must be after #{format_time(Time.zone.tomorrow + 10.hours)}.") + end + end + + context "and we try to move it to before that date" do + let(:params) do + { start_time: Time.zone.tomorrow + 9.hours } + end + + it "is not valid" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]).to include("must be after #{format_time(Time.zone.tomorrow + 10.hours)}.") + end + end + + context "and we try to move it to after that date" do + let(:params) do + { start_time: Time.zone.tomorrow + 12.hours } + end + + it "is valid" do + expect(service_result).to be_success + end + end + end + + context "when trying to move it to before the start time" do + let(:params) do + { start_time: Time.zone.yesterday + 10.hours } + end + + it "is not valid" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]).to include("must be in the future.") + end + end + + context "when trying to move it to before today" do let(:params) do { start_time: Time.zone.yesterday + 10.hours } end it "does not be valid" do expect(service_result).not_to be_success - expect(service_result.errors[:start_date]).to include("must be after #{format_date(Time.zone.today + 10.hours)}.") + expect(service_result.errors[:start_date]).to include("must be in the future.") end end end diff --git a/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb b/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb index 23c89a63f14e..714c8aea39a0 100644 --- a/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb +++ b/modules/meeting/spec/services/recurring_meetings/create_service_integration_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -40,6 +42,31 @@ subject { instance.call(**params) } + shared_examples "creates the series" do + it "creates the series and template" do + expect(service_result).to be_success + expect(series).to be_persisted + + expect(series.template).to be_a(StructuredMeeting) + expect(series.template).to be_template + + expect(series.meetings.count).to eq(1) + expect(series.meetings.first).to be_template + end + end + + describe "project" do + context "when not provided" do + let(:params) { { title: "foo" } } + + it "complains about the project, not the base authorization" do + expect(subject).not_to be_success + expect(subject.errors[:base]).to be_empty + expect(subject.errors[:project_id]).to contain_exactly "can't be blank." + end + end + end + context "with a daily schedule" do let(:first_start) { Time.zone.tomorrow + 10.hours } let(:params) do @@ -54,16 +81,7 @@ } end - it "creates the series and template" do - expect(service_result).to be_success - expect(series).to be_persisted - - expect(series.template).to be_a(StructuredMeeting) - expect(series.template).to be_template - - expect(series.meetings.count).to eq(1) - expect(series.meetings.first).to be_template - end + it_behaves_like "creates the series" context "when the template cannot be saved" do let(:template) { StructuredMeeting.new } @@ -80,4 +98,49 @@ end end end + + describe "start time constraints" do + let(:params) do + { + start_time:, + frequency: "daily", + interval: 1, + end_after: "never", + project:, + title: "My daily" + } + end + + context "when start_time is today, but in the past" do + let(:start_time) { 1.hour.ago } + + it "adds a validation error for start_time_hour" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_time_hour]).to include "must be in the future." + expect(series).to be_new_record + end + end + + context "when start_time is today, but in the future" do + let(:start_time) { 1.hour.from_now } + + it_behaves_like "creates the series" + end + + context "when start_time is tomorrow" do + let(:start_time) { 1.day.from_now } + + it_behaves_like "creates the series" + end + + context "when start_time is yesterday" do + let(:start_time) { 1.day.ago } + + it "adds a validation error for start_date" do + expect(service_result).not_to be_success + expect(service_result.errors[:start_date]).to include "must be in the future." + expect(series).to be_new_record + end + end + end end diff --git a/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb b/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb index e8554a1c631b..9a7f6e7254b5 100644 --- a/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb +++ b/modules/meeting/spec/services/recurring_meetings/ical_service_spec.rb @@ -48,7 +48,7 @@ let(:template) { series.template } let(:service) { described_class.new(user:, series:) } - let(:result) { service.call.result } + let(:result) { service.generate_series.result } let(:parsed_ical) { Icalendar::Calendar.parse(result).first } let(:parsed_events) { parsed_ical.events } @@ -73,9 +73,30 @@ expect(parsed_events.count).to eq(1) expect(series_ical).to include("LOCATION:https://example.com/meet/important-meeting") expect(series_ical).to include("SUMMARY:[My Project] Weekly") - expect(series_ical).to include("UID:#{Setting.app_title}-#{Setting.host_name}-meeting-series-#{series.id}") expect(series_ical).to include("ATTENDEE;CN=Bob Barker;EMAIL=bob@example.com;PARTSTAT=NEEDS-ACTION;RSVP=TRU") expect(series_ical).to include("ATTENDEE;CN=Foo Fooer;EMAIL=foo@example.com;PARTSTAT=NEEDS-ACTION;RSVP=TRUE") + expect(series_ical).to include("RRULE:FREQ=WEEKLY;UNTIL=20251202T000000Z") + end + end + + describe "series with no end_date" do + shared_let(:series) do + create(:recurring_meeting, + author: user, + project:, + title: "Weekly", + frequency: "weekly", + start_time: DateTime.parse("2024-12-01T10:00:00Z"), + end_after: "never") + end + + it "contains serise and template information" do + expect(parsed_events.count).to eq(1) + expect(series_ical).to include("LOCATION:https://example.com/meet/important-meeting") + expect(series_ical).to include("SUMMARY:[My Project] Weekly") + expect(series_ical).to include("ATTENDEE;CN=Bob Barker;EMAIL=bob@example.com;PARTSTAT=NEEDS-ACTION;RSVP=TRU") + expect(series_ical).to include("ATTENDEE;CN=Foo Fooer;EMAIL=foo@example.com;PARTSTAT=NEEDS-ACTION;RSVP=TRUE") + expect(series_ical).to include("RRULE:FREQ=WEEKLY") end end @@ -144,5 +165,18 @@ expect(moved).to include("DTEND;TZID=America/New_York:20241216T073000") expect(moved).to include("URL:http://#{Setting.host_name}/projects/my-project/meetings/#{moved_schedule.meeting_id}") end + + context "when passing a specific occurrence" do + let(:result) { service.generate_occurrence(schedule.meeting).result } + + it "creates the specific event when requested" do + expect(parsed_events.count).to eq(1) + occurrence = parsed_events.first.to_ical + + expect(occurrence).to include("DTSTART;TZID=America/New_York:20241208T050000") + expect(occurrence).to include("DTEND;TZID=America/New_York:20241208T060000") + expect(occurrence).to include("URL:http://#{Setting.host_name}/projects/my-project/meetings/#{schedule.meeting_id}") + end + end end end diff --git a/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb b/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb index 11aab02ae46e..0c5bafff4a96 100644 --- a/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb +++ b/modules/meeting/spec/services/recurring_meetings/update_service_integration_spec.rb @@ -108,7 +108,7 @@ .perform_later(series) end - it "reschedules" do + it "reschedules and enqueues the next job" do job = GoodJob::Job.find_by(job_class: "RecurringMeetings::InitNextOccurrenceJob") expect(job.scheduled_at).to eq Time.zone.today + 1.day + 10.hours expect(service_result).to be_success @@ -116,6 +116,45 @@ new_job = GoodJob::Job.find_by(job_class: "RecurringMeetings::InitNextOccurrenceJob") expect(new_job.scheduled_at).to eq Time.zone.today + 2.days + 11.hours + + expect(series.upcoming_instantiated_meetings.count).to eq 1 + end + end + end + + describe "rescheduling mails" do + context "when updating the title" do + let(:params) do + { title: "New title" } + end + + it "does not create them" do + expect(service_result).to be_success + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries).to be_empty + end + end + + context "when updating the frequency and start_time" do + let(:params) do + { start_time: Time.zone.today + 2.days + 11.hours } + end + + let(:recipient) do + create(:user, member_with_permissions: { project => %i(view_meetings) }) + end + + before do + series.template.participants.delete_all + series.template.participants << MeetingParticipant.new(user: recipient, invited: true) + end + + it "sends out rescheduled mails" do + expect(service_result).to be_success + perform_enqueued_jobs + expect(ActionMailer::Base.deliveries.count).to eq(1) + expect(ActionMailer::Base.deliveries.first.subject) + .to eq "[#{project.name}] Meeting series '#{series.title}' rescheduled" end end end diff --git a/modules/meeting/spec/support/pages/meetings/edit.rb b/modules/meeting/spec/support/pages/meetings/edit.rb index 9146fd3d967c..a1b8c21bb78f 100644 --- a/modules/meeting/spec/support/pages/meetings/edit.rb +++ b/modules/meeting/spec/support/pages/meetings/edit.rb @@ -34,6 +34,7 @@ class Edit < Base attr_accessor :meeting def initialize(meeting) + super(meeting.project) self.meeting = meeting end @@ -62,7 +63,7 @@ def click_save end def path - edit_meeting_path(meeting) + edit_project_meeting_path(project, meeting) end end end diff --git a/modules/meeting/spec/support/pages/meetings/index.rb b/modules/meeting/spec/support/pages/meetings/index.rb index 624ed36a3322..bd2aa3b8c5c6 100644 --- a/modules/meeting/spec/support/pages/meetings/index.rb +++ b/modules/meeting/spec/support/pages/meetings/index.rb @@ -65,6 +65,10 @@ def set_start_time(time) page.execute_script("arguments[0].dispatchEvent(new Event('input'))", input.native) end + def set_end_after(value) + select value, from: "Meeting series ends" + end + def set_end_date(date) fill_in "End date", with: date, fill_options: { clear: :backspace } end @@ -126,7 +130,7 @@ def expect_no_copy_action(meeting) def expect_delete_action(meeting) within more_menu(meeting) do - expect(page).to have_button("Delete meeting") + expect(page).to have_link("Delete meeting") end end @@ -161,27 +165,52 @@ def set_quick_filter(upcoming: true) def expect_no_meetings_listed within "#content-wrapper" do expect(page) - .to have_content I18n.t(:no_results_title_text) + .to have_content I18n.t("meeting.blankslate.title") end end def expect_meetings_listed_in_order(*meetings) - within "[data-test-selector='Meetings::TableComponent']" do + retry_block do listed_meeting_titles = all("li div.title").map(&:text) - expect(listed_meeting_titles).to eq(meetings.map(&:title)) end end - def expect_meetings_listed(*meetings) + def expect_meetings_listed_in_table(*meetings) within "[data-test-selector='Meetings::TableComponent']" do meetings.each do |meeting| - expect(page).to have_css("div.title", - text: meeting.title) + expect(page).to have_css("div.title", text: meeting.title) end end end + def expect_meeting_listed_in_group(meeting, key: meeting_group_key(meeting)) + within "[data-test-selector='meetings-table-#{key}']" do + expect(page).to have_css("div.title", text: meeting.title) + end + end + + def meeting_group_key(meeting) + start_date = meeting.start_time.to_date + next_week = Time.current.next_occurring(Redmine::I18n.start_of_week) + + if start_date == Time.zone.today + :today + elsif start_date == Time.zone.tomorrow + :tomorrow + elsif start_date < next_week + :this_week + else + :later + end + end + + def expect_meetings_listed(*meetings) + meetings.each do |meeting| + expect(page).to have_css("div.title", text: meeting.title) + end + end + def expect_meetings_not_listed(*meetings) within "#content-wrapper" do meetings.each do |meeting| diff --git a/modules/meeting/spec/support/pages/meetings/show.rb b/modules/meeting/spec/support/pages/meetings/show.rb index 54fd2aba96f8..f86b59070f85 100644 --- a/modules/meeting/spec/support/pages/meetings/show.rb +++ b/modules/meeting/spec/support/pages/meetings/show.rb @@ -93,7 +93,7 @@ def click_edit end def path - meeting_path(meeting) + project_meeting_path(meeting.project, meeting) end end end diff --git a/modules/meeting/spec/support/pages/recurring_meeting/show.rb b/modules/meeting/spec/support/pages/recurring_meeting/show.rb index f3319dac3318..43f938ca79af 100644 --- a/modules/meeting/spec/support/pages/recurring_meeting/show.rb +++ b/modules/meeting/spec/support/pages/recurring_meeting/show.rb @@ -33,28 +33,24 @@ class Show < ::Pages::Meetings::Base attr_accessor :meeting def initialize(meeting) - super + super(meeting.project) self.meeting = meeting end def path - recurring_meeting_path(meeting) + project_recurring_meeting_path(project, meeting) end - def project_path - project_recurring_meeting_path(meeting.project, meeting) - end - - def expect_scheduled_meeting(date:) + def expect_planned_meeting(date:) within("li", text: date) do - expect(page).to have_css(".status", text: "Scheduled") + expect(page).to have_css(".status", text: "Planned") end end - def expect_no_scheduled_meeting(date:) + def expect_no_planned_meeting(date:) within("li", text: date) do - expect(page).to have_no_css(".status", text: "Scheduled") + expect(page).to have_no_css(".status", text: "Planned") end end @@ -89,9 +85,9 @@ def expect_rescheduled_meeting(old_date:, new_date:) end end - def create_from_template(date:) + def open(date:) within("li", text: date) do - click_on "Create from template" + click_on "Open" end end @@ -100,6 +96,8 @@ def cancel_occurrence(date:) click_on "more-button" click_on "Cancel this occurrence" end + + expect_modal("Cancel meeting occurrence") end def expect_subtitle(text:) @@ -110,11 +108,25 @@ def edit_meeting_series page.find_test_selector("recurring-meeting-action-menu").click click_on "Edit meeting series" - expect(page).to have_css("#new-meeting-dialog") + expect_modal("Edit Meeting") + end + + def delete_meeting_series + page.find_test_selector("recurring-meeting-action-menu").click + click_on "Delete meeting series" + + expect_modal("Delete meeting series") + end + + def end_meeting_series + page.find_test_selector("recurring-meeting-action-menu").click + click_on "End meeting series" + + expect_modal("End meeting series") end - def in_edit_dialog(&) - page.within("#new-meeting-dialog", &) + def expect_modal(...) + expect(page).to have_modal(...) end def expect_no_meeting(date:) @@ -140,7 +152,7 @@ def expect_open_actions(date:) end end - def expect_scheduled_actions(date:) + def expect_planned_actions(date:) within("li", text: date) do click_on "more-button" @@ -163,9 +175,5 @@ def expect_cancelled_actions(date:) click_on "more-button" end end - - # def for_meeting(date:, &) - # within("li", text: date, &) - # end end end diff --git a/modules/meeting/spec/support/pages/structured_meeting/mobile/show.rb b/modules/meeting/spec/support/pages/structured_meeting/mobile/show.rb index d879de81eaf2..46a8f2c92120 100644 --- a/modules/meeting/spec/support/pages/structured_meeting/mobile/show.rb +++ b/modules/meeting/spec/support/pages/structured_meeting/mobile/show.rb @@ -41,7 +41,7 @@ def open_participant_form within(meeting_details_container) do click_link_or_button "Show all" end - expect(page).to have_css("#edit-participants-dialog") + expect(page).to have_modal("Participants") end end end diff --git a/modules/meeting/spec/support/pages/structured_meeting/show.rb b/modules/meeting/spec/support/pages/structured_meeting/show.rb index 34e531761a98..b11727f61979 100644 --- a/modules/meeting/spec/support/pages/structured_meeting/show.rb +++ b/modules/meeting/spec/support/pages/structured_meeting/show.rb @@ -63,6 +63,10 @@ def add_agenda_item(type: MeetingAgendaItem, save: true, &) end end + def expect_modal(...) + expect(page).to have_modal(...) + end + def expect_no_add_form expect(page).not_to have_test_selector("#meeting-agenda-items-form-component") end @@ -204,11 +208,11 @@ def clear_item_edit_work_package_title def open_participant_form page.find_test_selector("manage-participants-button").click - expect(page).to have_css("#edit-participants-dialog") + expect_modal("Participants") end def in_participant_form(&) - page.within("#edit-participants-dialog", &) + page.within_modal("Participants", &) end def expect_participant(participant, invited: false, attended: false, editable: true) @@ -217,8 +221,17 @@ def expect_participant(participant, invited: false, attended: false, editable: t expect(page).to have_field(id: "checkbox_attended_#{participant.id}", checked: attended, disabled: !editable) end + def expect_participant_invited(participant, invited: true) + expect(page).to have_text(participant.name) + expect(page).to have_field(id: "checkbox_invited_#{participant.id}", checked: invited) + end + def invite_participant(participant) - check(id: "checkbox_invited_#{participant.id}") + id = "checkbox_invited_#{participant.id}" + retry_block do + check(id:) + raise "Expected #{participant.id} to be invited now" unless page.has_checked_field?(id:) + end end def expect_available_participants(count:) @@ -248,11 +261,13 @@ def in_latest_section_form(&) end def add_section(&) - page.within("#meeting-agenda-items-new-button-component") do - click_on I18n.t(:button_add) - click_on "Section" - # wait for the disabled button, indicating the turbo streams are applied - expect(page).to have_css("#meeting-agenda-items-new-button-component button[disabled='disabled']") + retry_block do + page.within("#meeting-agenda-items-new-button-component") do + click_on I18n.t(:button_add) + click_on "Section" + # wait for the disabled button, indicating the turbo streams are applied + expect(page).to have_css("#meeting-agenda-items-new-button-component button[disabled='disabled']") + end end in_latest_section_form(&) diff --git a/modules/my_page/spec/features/my/accountable_spec.rb b/modules/my_page/spec/features/my/accountable_spec.rb index ff7d978b3239..dccfa56b42af 100644 --- a/modules/my_page/spec/features/my/accountable_spec.rb +++ b/modules/my_page/spec/features/my/accountable_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/my/page" -RSpec.describe "Accountable widget on my page", :js do +RSpec.describe "Accountable widget on my page", + :js, + :selenium do let!(:type) { create(:type) } let!(:priority) { create(:default_priority) } let!(:project) { create(:project, types: [type]) } diff --git a/modules/my_page/spec/features/my/assigned_to_me_spec.rb b/modules/my_page/spec/features/my/assigned_to_me_spec.rb index f313d4c5504a..922800561ae1 100644 --- a/modules/my_page/spec/features/my/assigned_to_me_spec.rb +++ b/modules/my_page/spec/features/my/assigned_to_me_spec.rb @@ -30,7 +30,7 @@ require_relative "../../support/pages/my/page" -RSpec.describe "Assigned to me embedded query on my page", :js do +RSpec.describe "Assigned to me embedded query on my page", :js, :selenium do let!(:type) { create(:type) } let!(:priority) { create(:default_priority) } let!(:project) { create(:project, types: [type]) } diff --git a/modules/my_page/spec/features/my/custom_text_spec.rb b/modules/my_page/spec/features/my/custom_text_spec.rb index 955e5422227f..c9a147111099 100644 --- a/modules/my_page/spec/features/my/custom_text_spec.rb +++ b/modules/my_page/spec/features/my/custom_text_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/my/page" -RSpec.describe "Custom text widget on my page", :js do +RSpec.describe "Custom text widget on my page", + :js, + :selenium do let(:permissions) do [] end diff --git a/modules/my_page/spec/features/my/documents_spec.rb b/modules/my_page/spec/features/my/documents_spec.rb index 215c53e8f3b2..36be6b14b09c 100644 --- a/modules/my_page/spec/features/my/documents_spec.rb +++ b/modules/my_page/spec/features/my/documents_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/my/page" -RSpec.describe "My page documents widget", :js do +RSpec.describe "My page documents widget", + :js, + :selenium do let!(:project) { create(:project) } let!(:other_project) { create(:project) } let!(:visible_document) do diff --git a/modules/my_page/spec/features/my/my_page_spec.rb b/modules/my_page/spec/features/my/my_page_spec.rb index 88ebd892eb3c..c83fac736e99 100644 --- a/modules/my_page/spec/features/my/my_page_spec.rb +++ b/modules/my_page/spec/features/my/my_page_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/my/page" -RSpec.describe "My page", :js do +RSpec.describe "My page", + :js, + :selenium do let!(:type) { create(:type) } let!(:project) { create(:project, types: [type]) } let!(:open_status) { create(:default_status) } diff --git a/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb b/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb index 4c51943a37c3..4c0aeb1264a9 100644 --- a/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb +++ b/modules/my_page/spec/features/my/my_spent_time_widget_with_a_negative_time_zone_spec.rb @@ -100,7 +100,7 @@ aggregate_failures("when clicking a day, time entry day is set to the day clicked (Thursday)") do find(".fc-day-thu .te-calendar--add-entry", visible: false).click - time_logging_modal.has_field_with_value "spentOn", thursday.iso8601 + time_logging_modal.has_field_with_value "spent_on", thursday.iso8601 end end end diff --git a/modules/my_page/spec/features/my/news_spec.rb b/modules/my_page/spec/features/my/news_spec.rb index e7e8706b70eb..c7a50a23f9bd 100644 --- a/modules/my_page/spec/features/my/news_spec.rb +++ b/modules/my_page/spec/features/my/news_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/my/page" -RSpec.describe "My page news widget spec", :js do +RSpec.describe "My page news widget spec", + :js, + :selenium do let!(:project) { create(:project) } let!(:other_project) { create(:project) } let!(:visible_news) do diff --git a/modules/my_page/spec/features/my/time_entries_current_user_spec.rb b/modules/my_page/spec/features/my/time_entries_current_user_spec.rb index 61bf9925aac5..856eab938851 100644 --- a/modules/my_page/spec/features/my/time_entries_current_user_spec.rb +++ b/modules/my_page/spec/features/my/time_entries_current_user_spec.rb @@ -30,7 +30,8 @@ require_relative "../../support/pages/my/page" -RSpec.describe "My page time entries current user widget spec", :js do +# Test is flaky when using cuprite, but steady with selenium +RSpec.describe "My page time entries current user widget spec", :js, :selenium do let!(:type) { create(:type) } let!(:project) { create(:project, types: [type]) } let!(:activity) { create(:time_entry_activity) } @@ -115,7 +116,13 @@ let(:my_page) do Pages::My::Page.new end - let(:cf_field) { TextEditorField.new(page, custom_field.attribute_name(:camel_case)) } + let(:cf_field) do + TextEditorField.new( + page, + custom_field.attribute_name(:camel_case), + selector: ".FormControl:has(textarea#time_entry_custom_field_values_#{custom_field.id})" + ) + end let(:time_logging_modal) { Components::TimeLoggingModal.new } let!(:week_days) { week_with_saturday_and_sunday_as_weekend } @@ -193,38 +200,31 @@ time_logging_modal.is_visible true - time_logging_modal.work_package_is_missing true + time_logging_modal.activity_input_disabled_because_work_package_missing? true - time_logging_modal.has_field_with_value "spentOn", (Date.current.beginning_of_week(:sunday) + 3.days).strftime + time_logging_modal.has_field_with_value "spent_on", (Date.current.beginning_of_week(:sunday) + 3.days).strftime - time_logging_modal.shows_field "user", false + time_logging_modal.shows_field "user_id", false expect(page) .to have_no_css(".ng-spinner-loader") # Expect filtering works - time_logging_modal.work_package_field.autocomplete work_package.subject, select: false - - expect(page).to have_test_selector("op-autocompleter-item-subject", text: work_package.subject) - expect(page).not_to have_test_selector("op-autocompleter-item-subject", text: other_work_package.subject) + time_logging_modal.update_field "work_package_id", work_package.subject - time_logging_modal.update_work_package_field other_work_package.subject + time_logging_modal.update_field "work_package_id", other_work_package.subject - time_logging_modal.work_package_is_missing false + time_logging_modal.activity_input_disabled_because_work_package_missing? false - time_logging_modal.update_field "comment", "Comment for new entry" + time_logging_modal.update_field "comments", "Comment for new entry" - time_logging_modal.update_field "activity", activity.name + time_logging_modal.update_field "activity_id", activity.name time_logging_modal.update_field "hours", 4 - sleep(0.1) - - time_logging_modal.perform_action "Save" + time_logging_modal.submit time_logging_modal.is_visible false - my_page.expect_and_dismiss_toaster message: I18n.t(:notice_successful_create) - within entries_area.area do expect(page) .to have_css("td.fc-timegrid-col:nth-of-type(5) .te-calendar--time-entry", @@ -245,42 +245,34 @@ time_logging_modal.is_visible true - time_logging_modal.update_field "activity", other_activity.name + time_logging_modal.update_field "activity_id", other_activity.name # As the other_work_package now has time logged, it is now considered to be a # recent work package. - time_logging_modal.update_work_package_field other_work_package.subject, true + time_logging_modal.update_field "work_package_id", other_work_package.subject time_logging_modal.update_field "hours", 6 - time_logging_modal.update_field "comment", "Some comment" + time_logging_modal.update_field "comments", "Some comment" cf_field.set_value("Cf text value") - time_logging_modal.perform_action "Save" + time_logging_modal.submit time_logging_modal.is_visible false - sleep(0.1) - my_page.expect_and_dismiss_toaster message: I18n.t(:notice_successful_update) + wait_for_network_idle within entries_area.area do - all("td.fc-timegrid-col:nth-of-type(3) .te-calendar--time-entry").first.hover + all("td.fc-timegrid-col:nth-of-type(3) .te-calendar--time-entry").last.hover end - expect(page) - .to have_css(".ui-tooltip", text: "Work package: ##{other_work_package.id}: #{other_work_package.subject}") - - expect(page) - .to have_css(".ui-tooltip", text: "Hours: 6 h") - - expect(page) - .to have_css(".ui-tooltip", text: "Activity: #{other_activity.name}") - - expect(page) - .to have_css(".ui-tooltip", text: "Comment: Some comment") + sleep 0.1 - expect(page) - .to have_content "Total: 13 h" + expect(page).to have_css(".ui-tooltip", text: "Work package: ##{other_work_package.id}: #{other_work_package.subject}") + expect(page).to have_css(".ui-tooltip", text: "Hours: 6 h") + expect(page).to have_css(".ui-tooltip", text: "Activity: #{other_activity.name}") + expect(page).to have_css(".ui-tooltip", text: "Comment: Some comment") + expect(page).to have_content "Total: 16 h" ## Opening the configuration modal multiple times (Regression#54966) entries_area.click_menu_item I18n.t("js.grid.configure") @@ -297,7 +289,7 @@ uncheck "Monday" # the day visible_time_entry is logged for - click_button "Apply" + click_on "Apply" within entries_area.area do expect(page) @@ -315,14 +307,15 @@ end time_logging_modal.is_visible true - time_logging_modal.perform_action "Delete" + accept_confirm { time_logging_modal.delete } - page.driver.browser.switch_to.alert.accept - time_logging_modal.is_visible false + # TODO: this is currently not implemented + # time_logging_modal.is_visible false + + page.refresh # TODO: Remove within entries_area.area do - expect(page) - .to have_no_css("td.fc-timegrid-col:nth-of-type(5) .te-calendar--time-entry") + expect(page).to have_no_css("td.fc-timegrid-col:nth-of-type(5) .te-calendar--time-entry") end expect(TimeEntry.where(id: other_visible_time_entry.id)) @@ -356,4 +349,22 @@ .to have_css(".grid--widget-add") end end + + it "validates that a work package is set" do + my_page.add_widget(1, 1, :within, "My spent time") + entries_area = Components::Grids::GridArea.new(".grid--area.-widgeted:nth-of-type(1)") + my_page.expect_and_dismiss_toaster message: I18n.t(:notice_successful_update) + + within entries_area.area do + find("td.fc-timegrid-col:nth-of-type(5) .te-calendar--add-entry", visible: false).click + end + + time_logging_modal.is_visible true + time_logging_modal.update_field "hours", 6 + + time_logging_modal.submit + + time_logging_modal.is_visible true + time_logging_modal.field_has_error "work_package_id", "can't be blank." + end end diff --git a/modules/my_page/spec/features/my/work_package_table_spec.rb b/modules/my_page/spec/features/my/work_package_table_spec.rb index c6f8f0fdb1be..a8f284a80203 100644 --- a/modules/my_page/spec/features/my/work_package_table_spec.rb +++ b/modules/my_page/spec/features/my/work_package_table_spec.rb @@ -30,7 +30,9 @@ require_relative "../../support/pages/my/page" -RSpec.describe "Arbitrary WorkPackage query table widget on my page", :js do +RSpec.describe "Arbitrary WorkPackage query table widget on my page", + :js, + :with_cuprite do let!(:type) { create(:type) } let!(:other_type) { create(:type) } let!(:priority) { create(:default_priority) } @@ -161,12 +163,8 @@ context "without the permission to save queries" do let(:permissions) { %i[view_work_packages add_work_packages] } - let!(:my_page_grid) do - create(:my_page, :empty, user:) - end - it "cannot add the widget" do - my_page.expect_unable_to_add_widget(1, 1, :within, "Work packages table") + my_page.expect_unable_to_add_widget(1, 2, :column, "Work packages table") end end end diff --git a/modules/openid_connect/app/models/openid_connect/user_session_link.rb b/modules/openid_connect/app/models/openid_connect/user_session_link.rb index baa3caab442a..e15000a288ac 100644 --- a/modules/openid_connect/app/models/openid_connect/user_session_link.rb +++ b/modules/openid_connect/app/models/openid_connect/user_session_link.rb @@ -1,3 +1,33 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + module OpenIDConnect class UserSessionLink < ::ApplicationRecord self.table_name = "oidc_user_session_links" diff --git a/modules/openid_connect/app/models/openid_connect/user_token.rb b/modules/openid_connect/app/models/openid_connect/user_token.rb new file mode 100644 index 000000000000..485d14b971a3 --- /dev/null +++ b/modules/openid_connect/app/models/openid_connect/user_token.rb @@ -0,0 +1,41 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenIDConnect + class UserToken < ::ApplicationRecord + self.table_name = "oidc_user_tokens" + + IDP_AUDIENCE = "__op-idp__" + + belongs_to :user + + scope :idp, -> { where(audience: IDP_AUDIENCE) } + end +end diff --git a/modules/openid_connect/app/services/openid_connect/jwt_parser.rb b/modules/openid_connect/app/services/openid_connect/jwt_parser.rb new file mode 100644 index 000000000000..7de07e394ad6 --- /dev/null +++ b/modules/openid_connect/app/services/openid_connect/jwt_parser.rb @@ -0,0 +1,103 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is a project management system. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# + + +module OpenIDConnect + class JwtParser + include Dry::Monads[:result] + + SUPPORTED_JWT_ALGORITHMS = %w[ + RS256 + RS384 + RS512 + ].freeze + + def initialize(verify_audience: true, verify_expiration: true, required_claims: []) + @verify_audience = verify_audience + @verify_expiration = verify_expiration + @required_claims = required_claims + end + + def parse(token) + parse_unverified_iss_alg_kid(token).bind do |issuer, alg, kid| + return Failure("Token signature algorithm #{alg} is not supported") if SUPPORTED_JWT_ALGORITHMS.exclude?(alg) + + provider = fetch_provider(issuer) + return Failure("The access token issuer is unknown") if provider.blank? + + verified_payload, = JWT.decode( + token, + fetch_key(provider:, kid:), + true, + { + algorithm: alg, + verify_expiration: @verify_expiration, + verify_aud: @verify_audience, + aud: provider.client_id, + required_claims: all_required_claims + } + ) + + Success([verified_payload, provider]) + rescue JWT::DecodeError => e + Failure(e.message) + rescue JSON::JWK::Set::KidNotFound + Failure("The signature key ID is unknown") + end + end + + private + + def parse_unverified_iss_alg_kid(token) + unverified_payload, unverified_header = JWT.decode(token, nil, false) + return Failure("The token's Key Identifier (kid) is missing") unless unverified_header.key?("kid") + + Success([unverified_payload["iss"], unverified_header.fetch("alg"), unverified_header.fetch("kid")]) + rescue JWT::DecodeError => e + Failure(e.message) + end + + def fetch_provider(issuer) + return nil if issuer.blank? + + OpenIDConnect::Provider.where(available: true).where("options->>'issuer' = ?", issuer).first + end + + def fetch_key(provider:, kid:) + JSON::JWK::Set::Fetcher.fetch(provider.jwks_uri, kid:).to_key + end + + def all_required_claims + claims = ["iss"] + @required_claims + claims << "aud" if @verify_audience + + claims.uniq + end + end +end diff --git a/modules/openid_connect/app/services/openid_connect/user_tokens/create_service.rb b/modules/openid_connect/app/services/openid_connect/user_tokens/create_service.rb new file mode 100644 index 000000000000..7bfa6b4b729f --- /dev/null +++ b/modules/openid_connect/app/services/openid_connect/user_tokens/create_service.rb @@ -0,0 +1,73 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is a project management system. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# + + +module OpenIDConnect + module UserTokens + class CreateService + def initialize(user, jwt_parser: JwtParser.new(verify_audience: false, required_claims: ["aud"])) + @user = user + @jwt_parser = jwt_parser + end + + def call(access_token:, refresh_token: nil, known_audiences: [], clear_previous: false) + if access_token.blank? + Rails.logger.error("Could not associate token to user: No access token") + return + end + + if @user.nil? + Rails.logger.error("Could not associate token to user: Can't find user") + return + end + + @user.oidc_user_tokens.destroy_all if clear_previous + + token = prepare_token(access_token:, refresh_token:, known_audiences:) + token.save! if token.audiences.any? + end + + private + + def prepare_token(access_token:, refresh_token:, known_audiences:) + @user.oidc_user_tokens.build(access_token:, refresh_token:).tap do |token| + token.audiences = merge_audiences(known_audiences, discover_audiences(access_token).value_or([])) + end + end + + def discover_audiences(access_token) + @jwt_parser.parse(access_token).fmap { |decoded, _| Array(decoded["aud"]) } + end + + def merge_audiences(*args) + args.flatten.uniq + end + end + end +end diff --git a/modules/openid_connect/app/services/openid_connect/user_tokens/exchange_service.rb b/modules/openid_connect/app/services/openid_connect/user_tokens/exchange_service.rb new file mode 100644 index 000000000000..073667f1b341 --- /dev/null +++ b/modules/openid_connect/app/services/openid_connect/user_tokens/exchange_service.rb @@ -0,0 +1,111 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenIDConnect + module UserTokens + class ExchangeService + include Dry::Monads[:result] + include Dry::Monads::Do.for(:call) + + class Disabled + class << self + include Dry::Monads[:result] + + def call(_) = Failure("Token exchange disabled") + + def supported? = false + end + end + + def initialize(user:) + @user = user + end + + def call(audience) + return Failure("Provider does not support token exchange") unless supported? + + idp_token = yield FetchService.new(user: @user, token_exchange: Disabled) + .access_token_for(audience: UserToken::IDP_AUDIENCE) + + json = yield exchange_token_request(idp_token, audience) + + access_token = json["access_token"] + return Failure("Token exchange response invalid") if access_token.blank? + + # We are explicitly opting to not store the refresh token for exchanged tokens + # For one there is no need to store one, we can simply exchange a new token once the old expired. + # A second reason is that at least Keycloak (an IDP we implement against), offers broken + # refresh tokens after token exchange (see https://github.com/keycloak/keycloak/issues/37016) + token = store_exchanged_token(audience:, access_token:, refresh_token: nil) + Success(token) + end + + def supported? + provider&.token_exchange_capable? + end + + private + + def exchange_token_request(access_token, audience) + response = OpenProject.httpx + .basic_auth(provider.client_id, provider.client_secret) + .post(provider.token_endpoint, form: { + grant_type: "urn:ietf:params:oauth:grant-type:token-exchange", + subject_token: access_token, + audience: + }) + response.raise_for_status + + Success(response.json) + rescue HTTPX::Error => e + Failure(e) + end + + def store_exchanged_token(audience:, access_token:, refresh_token:) + token = @user.oidc_user_tokens.where("audiences ? :audience", audience:).first + if token + if token.audiences.size > 1 + raise "Did not expect to update token with multiple audiences (#{token.audiences}) in-place." + end + + token.update!(access_token:, refresh_token:) + else + token = @user.oidc_user_tokens.create!(access_token:, refresh_token:, audiences: [audience]) + end + + token + end + + def provider + @user.authentication_provider + end + end + end +end diff --git a/modules/openid_connect/app/services/openid_connect/user_tokens/fetch_service.rb b/modules/openid_connect/app/services/openid_connect/user_tokens/fetch_service.rb new file mode 100644 index 000000000000..2baa1a62ea04 --- /dev/null +++ b/modules/openid_connect/app/services/openid_connect/user_tokens/fetch_service.rb @@ -0,0 +1,104 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenIDConnect + module UserTokens + ## + # Provides APIs to obtain access tokens of a given user for use at a third-party + # application for which we know the audience name, which is typically the application's + # client_id at an identity provider that OpenProject and the application have in common. + class FetchService + include Dry::Monads[:result] + include Dry::Monads::Do.for(:access_token_for, :refreshed_access_token_for) + + def initialize(user:, + jwt_parser: JwtParser.new(verify_audience: false, verify_expiration: false), + token_exchange: ExchangeService.new(user:), + token_refresh: RefreshService.new(user:, token_exchange:)) + @user = user + @token_exchange = token_exchange + @token_refresh = token_refresh + @jwt_parser = jwt_parser + end + + ## + # Obtains an access token that can be used to make requests in the user's name at the + # remote service identified by the +audience+ parameter. + # + # The access token will be refreshed before being returned by this method, if it can be + # identified as being expired. There is no guarantee that all access tokens will be properly + # recognized as expired, so client's still need to make sure to handle rejected access tokens + # properly. Also see #refreshed_access_token_for. + # + # A token exchange is attempted, if the provider supports OAuth 2.0 Token Exchange and a token + # for the target audience either can't be found or it has expired, but has no available refresh token. + def access_token_for(audience:) + token = yield token_with_audience(audience) + token = yield @token_refresh.call(token) if expired?(token.access_token) + + Success(token.access_token) + end + + ## + # Obtains an access token that can be used to make requests in the user's name at the + # remote service identified by the +audience+ parameter. + # + # The access token will always be refreshed before being returned by this method. + # It is advised to use this method, after learning that a remote service rejected + # an access token, because it was expired. + # + # A token exchange is attempted, if the provider supports OAuth 2.0 Token Exchange and a token + # for the target audience either can't be found or it has expired, but has no available refresh token. + def refreshed_access_token_for(audience:) + token = yield token_with_audience(audience) + token = yield @token_refresh.call(token) + Success(token.access_token) + end + + private + + def token_with_audience(aud) + token = @user.oidc_user_tokens.where("audiences ? :aud", aud:).first + return Success(token) if token + + return @token_exchange.call(aud) if @token_exchange.supported? + + Failure("No token for audience '#{aud}'") + end + + def expired?(token_string) + exp = @jwt_parser.parse(token_string).fmap { |decoded, _| decoded["exp"] }.value_or(nil) + return false if exp.nil? + + exp <= Time.now.to_i + end + end + end +end diff --git a/modules/openid_connect/app/services/openid_connect/user_tokens/refresh_service.rb b/modules/openid_connect/app/services/openid_connect/user_tokens/refresh_service.rb new file mode 100644 index 000000000000..8d73536d6d68 --- /dev/null +++ b/modules/openid_connect/app/services/openid_connect/user_tokens/refresh_service.rb @@ -0,0 +1,90 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenIDConnect + module UserTokens + class RefreshService + include Dry::Monads[:result] + include Dry::Monads::Do.for(:call) + + def initialize(user:, token_exchange:) + @user = user + @token_exchange = token_exchange + end + + def call(token) + if token.refresh_token.blank? + return exchange_instead_of_refresh(token) + end + + json = yield refresh_token_request(token.refresh_token) + + access_token = json["access_token"] + refresh_token = json["refresh_token"] + return Failure("Refresh token response invalid") if access_token.blank? + + token.update!(access_token:, refresh_token:) + + Success(token) + end + + private + + def exchange_instead_of_refresh(token) + # We can attempt a token exchange instead of a refresh, if we previously exchanged the token. + # For simplicity we do not consider scenarios where the original token had a wider audience, + # because all tokens obtained through exchange in this service will have exactly one audience. + if @token_exchange.supported? && token.audiences.size == 1 + return @token_exchange.call(token.audiences.first) + end + + Failure("Can't refresh the access token") + end + + def refresh_token_request(refresh_token) + response = OpenProject.httpx + .basic_auth(provider.client_id, provider.client_secret) + .post(provider.token_endpoint, form: { + grant_type: :refresh_token, + refresh_token: + }) + response.raise_for_status + + Success(response.json) + rescue HTTPX::Error => e + Failure(e) + end + + def provider + @user.authentication_provider + end + end + end +end diff --git a/modules/openid_connect/config/locales/crowdin/tr.yml b/modules/openid_connect/config/locales/crowdin/tr.yml index 72a9b01f4c4e..e8448ff2f1a4 100644 --- a/modules/openid_connect/config/locales/crowdin/tr.yml +++ b/modules/openid_connect/config/locales/crowdin/tr.yml @@ -8,14 +8,14 @@ tr: attributes: openid_connect/provider: name: İsim - slug: Unique identifier + slug: Benzersiz tanımlayıcı display_name: Ekran adı client_id: İstemci ID client_secret: İstemci gizliliği secret: Gizli scope: kapsam grant_types_supported: Supported grant types - limit_self_registration: Limit self registration + limit_self_registration: Kendi kendine kaydı sınırlayın authorization_endpoint: Yetkilendirme bitiş noktası userinfo_endpoint: Kullanıcı bilgisi bitiş noktası token_endpoint: Gösterge bitiş noktası @@ -28,7 +28,7 @@ tr: icon: Özel simge claims: Bilgiler acr_values: ACR değerleri - redirect_url: Redirect URL + redirect_url: Yönlendirme bağlantısı activerecord: errors: models: diff --git a/modules/openid_connect/db/migrate/20241212131910_add_oidc_user_tokens.rb b/modules/openid_connect/db/migrate/20241212131910_add_oidc_user_tokens.rb new file mode 100644 index 000000000000..fea407b84f0a --- /dev/null +++ b/modules/openid_connect/db/migrate/20241212131910_add_oidc_user_tokens.rb @@ -0,0 +1,43 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class AddOidcUserTokens < ActiveRecord::Migration[7.1] + def change + create_table :oidc_user_tokens do |t| + t.references :user, null: false, index: true, foreign_key: { on_delete: :cascade } + + t.string :access_token, null: false + t.string :refresh_token, null: true + t.jsonb :audiences, null: false, default: [] + + t.timestamps + end + end +end diff --git a/modules/openid_connect/lib/open_project/openid_connect/engine.rb b/modules/openid_connect/lib/open_project/openid_connect/engine.rb index bde77b42ab7f..145d66bfcf5d 100644 --- a/modules/openid_connect/lib/open_project/openid_connect/engine.rb +++ b/modules/openid_connect/lib/open_project/openid_connect/engine.rb @@ -25,6 +25,8 @@ class Engine < ::Rails::Engine openid_connect/auth_provider-custom.png ) + patches %i[Sessions::UserSession User] + class_inflection_override("openid_connect" => "OpenIDConnect") register_auth_providers do @@ -49,7 +51,11 @@ class Engine < ::Rails::Engine end # Remember oidc session values when logging in user - h[:retain_from_session] = %w[omniauth.oidc_sid] + h[:retain_from_session] = %w[ + omniauth.oidc_sid + omniauth.oidc_access_token + omniauth.oidc_refresh_token + ] h[:backchannel_logout_callback] = ->(logout_token) do ::OpenProject::OpenIDConnect::SessionMapper.handle_logout(logout_token) diff --git a/modules/openid_connect/lib/open_project/openid_connect/hooks/hook.rb b/modules/openid_connect/lib/open_project/openid_connect/hooks/hook.rb index 20894a869de6..19d544e25dc6 100644 --- a/modules/openid_connect/lib/open_project/openid_connect/hooks/hook.rb +++ b/modules/openid_connect/lib/open_project/openid_connect/hooks/hook.rb @@ -33,17 +33,34 @@ class Hook < OpenProject::Hook::Listener # Once the user has signed in and has an oidc session # we want to map that to the internal session def user_logged_in(context) - session = context[:session] - oidc_sid = session["omniauth.oidc_sid"] - return if oidc_sid.nil? + session = context.fetch(:session) + ::OpenProject::OpenIDConnect::SessionMapper.handle_login(session) + + user = context.fetch(:user) + + # We clear previous tokens while adding this one to avoid keeping + # stale tokens around (and to avoid piling up duplicate IDP tokens) + # -> Fresh login causes fresh set of tokens + OpenIDConnect::UserTokens::CreateService.new(user).call( + access_token: session["omniauth.oidc_access_token"], + refresh_token: session["omniauth.oidc_refresh_token"], + known_audiences: [OpenIDConnect::UserToken::IDP_AUDIENCE], + clear_previous: true + ) - ::OpenProject::OpenIDConnect::SessionMapper.handle_login(oidc_sid, session) end ## # Called once omniauth has returned with an auth hash - # NOTE: It's a passthrough as we no longer persist the access token into the cookie - def omniauth_user_authorized(_context); end + def omniauth_user_authorized(context) + controller = context.fetch(:controller) + session = controller.session + + session["omniauth.oidc_access_token"] = context.dig(:auth_hash, :credentials, :token) + session["omniauth.oidc_refresh_token"] = context.dig(:auth_hash, :credentials, :refresh_token) + + nil + end end end end diff --git a/modules/openid_connect/lib/open_project/openid_connect/patches.rb b/modules/openid_connect/lib/open_project/openid_connect/patches.rb new file mode 100644 index 000000000000..46d0ade680f3 --- /dev/null +++ b/modules/openid_connect/lib/open_project/openid_connect/patches.rb @@ -0,0 +1,32 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenProject::OpenIDConnect::Patches +end diff --git a/modules/openid_connect/lib/open_project/openid_connect/patches/sessions/user_session_patch.rb b/modules/openid_connect/lib/open_project/openid_connect/patches/sessions/user_session_patch.rb new file mode 100644 index 000000000000..aa960866aa9d --- /dev/null +++ b/modules/openid_connect/lib/open_project/openid_connect/patches/sessions/user_session_patch.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenProject::OpenIDConnect::Patches::Sessions::UserSessionPatch + def self.included(base) # :nodoc: + base.extend(ClassMethods) + base.include(InstanceMethods) + + base.class_eval do + has_one :oidc_session_link, class_name: "OpenIDConnect::UserSessionLink", foreign_key: "session_id" + end + end + + module ClassMethods + end + + module InstanceMethods + end +end diff --git a/modules/openid_connect/lib/open_project/openid_connect/patches/user_patch.rb b/modules/openid_connect/lib/open_project/openid_connect/patches/user_patch.rb new file mode 100644 index 000000000000..6a0ce7669482 --- /dev/null +++ b/modules/openid_connect/lib/open_project/openid_connect/patches/user_patch.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpenProject::OpenIDConnect::Patches::UserPatch + def self.included(base) # :nodoc: + base.extend(ClassMethods) + base.include(InstanceMethods) + + base.class_eval do + has_many :oidc_user_tokens, class_name: "OpenIDConnect::UserToken", foreign_key: "user_id" + end + end + + module ClassMethods + end + + module InstanceMethods + end +end diff --git a/modules/openid_connect/lib/open_project/openid_connect/session_mapper.rb b/modules/openid_connect/lib/open_project/openid_connect/session_mapper.rb index 13107bcffd60..893efde30d88 100644 --- a/modules/openid_connect/lib/open_project/openid_connect/session_mapper.rb +++ b/modules/openid_connect/lib/open_project/openid_connect/session_mapper.rb @@ -8,11 +8,9 @@ def self.handle_logout(logout_token) raise e end - def self.handle_login(oidc_session, session) - if oidc_session.blank? - Rails.logger.info { "No OIDC session returned from provider. Cannot map session for later logouts." } - return - end + def self.handle_login(session) + oidc_session = session["omniauth.oidc_sid"] + return if oidc_session.blank? link = ::OpenIDConnect::UserSessionLink.new(oidc_session:) new(link).link_to_internal!(session) diff --git a/modules/openid_connect/spec/factories/oidc_provider_factory.rb b/modules/openid_connect/spec/factories/oidc_provider_factory.rb index 069df379891c..ed28a8d6a5c8 100644 --- a/modules/openid_connect/spec/factories/oidc_provider_factory.rb +++ b/modules/openid_connect/spec/factories/oidc_provider_factory.rb @@ -18,6 +18,13 @@ "authorization_endpoint" => "https://keycloak.local/realms/master/protocol/openid-connect/auth" } end + + trait :token_exchange_capable do + callback(:after_build) do |provider| + provider.options["grant_types_supported"] ||= [] + provider.options["grant_types_supported"] << "urn:ietf:params:oauth:grant-type:token-exchange" + end + end end factory :oidc_provider_google, class: "OpenIDConnect::Provider" do diff --git a/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb b/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb index ab1f0cd42cac..33fca964ac5c 100644 --- a/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb +++ b/modules/openid_connect/spec/features/administration/oidc_custom_crud_spec.rb @@ -30,8 +30,7 @@ require_module_spec_helper RSpec.describe "OIDC administration CRUD", - :js, - :with_cuprite do + :js do shared_let(:user) { create(:admin) } let(:danger_zone) { DangerZone.new(page) } diff --git a/modules/openid_connect/spec/lib/session_mapper_spec.rb b/modules/openid_connect/spec/lib/session_mapper_spec.rb index 96bab9c1d940..462e6b977231 100644 --- a/modules/openid_connect/spec/lib/session_mapper_spec.rb +++ b/modules/openid_connect/spec/lib/session_mapper_spec.rb @@ -28,23 +28,28 @@ require "spec_helper" RSpec.describe OpenProject::OpenIDConnect::SessionMapper do - let(:mock_session) do - Class.new(Rack::Session::Abstract::SessionHash) do - def initialize(id) - super(nil, nil) - @id = Rack::Session::SessionId.new(id) - @data = {} - @loaded = true - end - end + let(:session) do + instance_double(ActionDispatch::Request::Session, + id: instance_double(Rack::Session::SessionId, private_id: 42)) + end + + let(:session_data) do + { + "omniauth.oidc_sid" => oidc_session_id + } + end + + let(:oidc_session_id) { "oidc_sid_foo" } + + before do + allow(session).to receive(:[]) { |k| session_data[k] } end describe "handle_login" do - let(:session) { mock_session.new("foo") } let!(:plain_session) { create(:user_session, session_id: session.id.private_id) } let!(:user_session) { Sessions::UserSession.find_by(session_id: plain_session.session_id) } - subject { described_class.handle_login "oidc_sid_foo", session } + subject { described_class.handle_login session } it "creates a user link object" do expect { subject }.to change(OpenIDConnect::UserSessionLink, :count).by(1) @@ -52,7 +57,7 @@ def initialize(id) expect(link).to be_present expect(link.session).to eq user_session - expect(link.oidc_session).to eq "oidc_sid_foo" + expect(link.oidc_session).to eq oidc_session_id end end diff --git a/modules/openid_connect/spec/requests/openid_connect_spec.rb b/modules/openid_connect/spec/requests/openid_connect_spec.rb index 88a9fc4bdd00..da0dc9a50b40 100644 --- a/modules/openid_connect/spec/requests/openid_connect_spec.rb +++ b/modules/openid_connect/spec/requests/openid_connect_spec.rb @@ -46,30 +46,33 @@ family_name: "Wurst" } end + let(:access_token) { "foo-bar-baz" } + let(:refresh_token) { "refreshing-foo-bar-baz" } + let(:oidc_sid) { "oidc-session-id-42" } before do # The redirect will include an authorisation code. # Since we don't actually get a valid code in the test we will stub the resulting AccessToken. allow_any_instance_of(OpenIDConnect::Client).to receive(:access_token!) do - OpenIDConnect::AccessToken.new client: self, access_token: "foo bar baz" + instance_double(OpenIDConnect::AccessToken, + access_token:, + refresh_token:, + userinfo!: OpenIDConnect::ResponseObject::UserInfo.new(user_info), + id_token: "not-nil").as_null_object end - # Using the granted AccessToken the client then performs another request to the OpenID Connect - # provider to retrieve user information such as name and email address. - # Since the test is not supposed to make an actual call it is be stubbed too. - allow_any_instance_of(OpenIDConnect::AccessToken).to receive(:userinfo!).and_return( - OpenIDConnect::ResponseObject::UserInfo.new(user_info) + # We are also stubbing the way that an ID token would be decoded, so that the omniauth-openid-connect + # strategy can fill the session id as well + allow(OpenIDConnect::ResponseObject::IdToken).to receive(:decode).and_return( + instance_double(OpenIDConnect::ResponseObject::IdToken, sid: oidc_sid).as_null_object ) - - # Enable storing the access token in a cookie is not necessary since it is currently hard wired to always - # be true. end describe "sign-up and login" do let(:limit_self_registration) { false } let!(:provider) { create(:oidc_provider, slug: "keycloak", limit_self_registration:) } - it "logs in the user" do + it "signs up and logs in the user" do ## # it should redirect to the provider's openid connect authentication endpoint click_on_signin("keycloak") @@ -95,23 +98,40 @@ expect(user).not_to be_nil expect(user.active?).to be true - ## - # it should redirect to the provider again upon clicking on sign-in when the user has been activated - user = User.find_by(mail: user_info[:email]) - user.activate - user.save! + session = Sessions::UserSession.for_user(user).first + session_link = session&.oidc_session_link - click_on_signin("keycloak") + expect(session_link).not_to be_nil + expect(session_link.oidc_session).to eq oidc_sid - expect(response).to have_http_status :found - expect(response.location).to match /https:\/\/#{host}.*$/ + token = user.oidc_user_tokens.first + expect(token).not_to be_nil + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to eq ["__op-idp__"] + end - ## - # it should then login the user upon the redirect back from the provider - redirect_from_provider("keycloak") + context "when the user is already registered" do + before do + click_on_signin("keycloak") + redirect_from_provider("keycloak") + end - expect(response).to have_http_status :found - expect(response.location).to match /\/my\/page/ + it "logs in the user" do + ## + # it should redirect to the provider again upon clicking on sign-in when the user has been activated + click_on_signin("keycloak") + + expect(response).to have_http_status :found + expect(response.location).to match /https:\/\/#{host}.*$/ + + ## + # it should then login the user upon the redirect back from the provider + redirect_from_provider("keycloak") + + expect(response).to have_http_status :found + expect(response.location).to match /\/my\/page/ + end end context "with self-registration disabled and provider respecting that", diff --git a/modules/openid_connect/spec/services/openid_connect/jwt_parser_spec.rb b/modules/openid_connect/spec/services/openid_connect/jwt_parser_spec.rb new file mode 100644 index 000000000000..8d2508e498b0 --- /dev/null +++ b/modules/openid_connect/spec/services/openid_connect/jwt_parser_spec.rb @@ -0,0 +1,162 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +require "spec_helper" + +RSpec.describe OpenIDConnect::JwtParser do + subject(:parse) { described_class.new.parse(token) } + + let(:private_key) { OpenSSL::PKey::RSA.generate(2048) } + let(:payload) do + { "exp" => expiration, "sub" => "M. Curie", "iss" => "International Space Station", "aud" => our_client_id } + end + let(:token) { JWT.encode(payload, private_key, "RS256", { kid: "key-identifier" }) } + + let!(:provider) { create(:oidc_provider) } + let(:known_issuer) { "International Space Station" } + let(:our_client_id) { "openproject.org" } + let(:expiration) { 1.minute.from_now.to_i } + + before do + allow(JSON::JWK::Set::Fetcher).to receive(:fetch).and_return( + instance_double(JSON::JWK, to_key: private_key.public_key) + ) + + provider.options["issuer"] = known_issuer + provider.options["client_id"] = our_client_id + provider.options["jwks_uri"] = "https://example.com/certs" + provider.save! + end + + it { is_expected.to be_success } + + it "parses the token" do + parsed, = parse.value! + expect(parsed).to eq payload + end + + it "returns the provider configuration for the associated provider" do + _, p = parse.value! + expect(p).to eq provider + end + + it "correctly queries for the token's public key" do + parse + + expect(JSON::JWK::Set::Fetcher).to have_received(:fetch).with("https://example.com/certs", kid: "key-identifier") + end + + context "when the provider signing the token is not known" do + let(:known_issuer) { "Lunar Gateway" } + + it { is_expected.to be_failure } + + it "indicates the problem" do + expect(parse.failure).to match(/issuer is unknown/) + end + end + + context "when the provider signing the token is not available" do + before do + provider.update!(available: false) + end + + it { is_expected.to be_failure } + + it "indicates the problem" do + expect(parse.failure).to match(/issuer is unknown/) + end + end + + context "when the token is not a valid JWT" do + let(:token) { Base64.encode64("banana").strip } + + it { is_expected.to be_failure } + end + + context "when the token is signed using an unsupported signature" do + let(:token) { JWT.encode(payload, "secret", "HS256", { kid: "key-identifier" }) } + + it { is_expected.to be_failure } + + it "indicates the problem" do + expect(parse.failure).to match(/HS256 is not supported/) + end + end + + context "when we are not the token's audience" do + before do + payload["aud"] = "Alice" + end + + it { is_expected.to be_failure } + + context "and the audience shall not be verified" do + subject(:parse) { described_class.new(verify_audience: false).parse(token) } + + it { is_expected.to be_success } + end + end + + context "when the token does not indicate a Key Identifier" do + let(:token) { JWT.encode(payload, private_key, "RS256") } + + it { is_expected.to be_failure } + + it "indicates the problem" do + expect(parse.failure).to match(/Key Identifier .+ is missing/) + end + end + + context "when requiring a specific claim" do + subject(:parse) { described_class.new(required_claims: ["sub"]).parse(token) } + + it { is_expected.to be_success } + + context "and when the required claim is missing" do + before do + payload.delete("sub") + end + + it { is_expected.to be_failure } + end + end + + context "when the token is expired" do + let(:expiration) { 1.second.ago.to_i } + + it { is_expected.to be_failure } + + context "and when not verifying expiration" do + subject(:parse) { described_class.new(verify_expiration: false).parse(token) } + + it { is_expected.to be_success } + end + end +end diff --git a/modules/openid_connect/spec/services/openid_connect/user_tokens/create_service_spec.rb b/modules/openid_connect/spec/services/openid_connect/user_tokens/create_service_spec.rb new file mode 100644 index 000000000000..523c6e92d258 --- /dev/null +++ b/modules/openid_connect/spec/services/openid_connect/user_tokens/create_service_spec.rb @@ -0,0 +1,229 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +require "spec_helper" + +RSpec.describe OpenIDConnect::UserTokens::CreateService do + subject { described_class.new(user, jwt_parser: parser).call(**args) } + + let(:user) { create(:user) } + + let(:args) { { access_token:, refresh_token:, known_audiences: ["io"] } } + + let(:access_token) { "access-token-foo" } + let(:refresh_token) { "refresh-token-bar" } + + let(:parser) { instance_double(OpenIDConnect::JwtParser, parse: Success([parsed_jwt, nil])) } + let(:parsed_jwt) { { "aud" => ["aud1", "aud2"] } } + + before do + allow(Rails.logger).to receive(:error) + end + + it "creates a correct user token", :aggregate_failures do + expect { subject }.to change(OpenIDConnect::UserToken, :count).by(1) + + token = OpenIDConnect::UserToken.last + expect(token.user_id).to eq user.id + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to contain_exactly("io", "aud1", "aud2") + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + + context "when the JWT encodes aud as a string" do + let(:parsed_jwt) { { "aud" => "aud1" } } + + it "creates a correct user token", :aggregate_failures do + expect { subject }.to change(OpenIDConnect::UserToken, :count).by(1) + + token = OpenIDConnect::UserToken.last + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to contain_exactly("io", "aud1") + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + end + + context "when the access token is not a valid JWT" do + let(:parser) { instance_double(OpenIDConnect::JwtParser, parse: Failure("Oops, not a JWT!")) } + + it "creates a correct user token", :aggregate_failures do + expect { subject }.to change(OpenIDConnect::UserToken, :count).by(1) + + token = OpenIDConnect::UserToken.last + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to contain_exactly("io") + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + end + + context "when there is no refresh token" do + let(:refresh_token) { nil } + + it "creates a correct user token", :aggregate_failures do + expect { subject }.to change(OpenIDConnect::UserToken, :count).by(1) + + token = OpenIDConnect::UserToken.last + expect(token.user_id).to eq user.id + expect(token.access_token).to eq access_token + expect(token.refresh_token).to be_nil + expect(token.audiences).to contain_exactly("io", "aud1", "aud2") + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + end + + context "when there is no access token" do + let(:access_token) { nil } + + it "does not create a user token" do + expect { subject }.not_to change(OpenIDConnect::UserToken, :count) + end + + it "logs an error" do + subject + expect(Rails.logger).to have_received(:error) + end + end + + context "when no user was passed" do + let(:user) { nil } + + it "does not create a user token" do + expect { subject }.not_to change(OpenIDConnect::UserToken, :count) + end + + it "logs an error" do + subject + expect(Rails.logger).to have_received(:error) + end + end + + context "when there is no audience" do + let(:args) { { access_token:, refresh_token:, known_audiences: [] } } + + it "creates a correct user token", :aggregate_failures do + expect { subject }.to change(OpenIDConnect::UserToken, :count).by(1) + + token = OpenIDConnect::UserToken.last + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to contain_exactly("aud1", "aud2") + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + + context "and the token has no audience defined" do + let(:parsed_jwt) { { "sub" => "ject" } } + + it "does not create a user token" do + expect { subject }.not_to change(OpenIDConnect::UserToken, :count) + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + end + end + + context "when another user token existed before" do + let!(:existing_token) { user.oidc_user_tokens.create!(access_token: "existing", audiences: ["blubb"]) } + + it "keeps the existing token" do + subject + expect(OpenIDConnect::UserToken.find_by(id: existing_token.id)).to be_present + end + + it "creates a correct user token", :aggregate_failures do + expect { subject }.to change(OpenIDConnect::UserToken, :count).by(1) + + token = OpenIDConnect::UserToken.last + expect(token.user_id).to eq user.id + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to contain_exactly("io", "aud1", "aud2") + end + + context "and when previous tokens shall be cleared" do + let(:args) { { access_token:, refresh_token:, known_audiences: ["io"], clear_previous: true } } + + it "deletes the previous token" do + subject + expect(OpenIDConnect::UserToken.find_by(id: existing_token.id)).to be_nil + end + + it "creates a correct user token", :aggregate_failures do + expect { subject }.not_to change(OpenIDConnect::UserToken, :count) + + token = OpenIDConnect::UserToken.last + expect(token.user_id).to eq user.id + expect(token.access_token).to eq access_token + expect(token.refresh_token).to eq refresh_token + expect(token.audiences).to contain_exactly("io", "aud1", "aud2") + end + + it "logs no error" do + subject + expect(Rails.logger).not_to have_received(:error) + end + end + end + + context "when audiences from token and arguments overlap" do + let(:parsed_jwt) { { "aud" => ["io", "aud2"] } } + + it "normalizes the audience array" do + subject + + token = OpenIDConnect::UserToken.last + expect(token.audiences).to contain_exactly("io", "aud2") + end + end +end diff --git a/modules/openid_connect/spec/services/openid_connect/user_tokens/exchange_service_spec.rb b/modules/openid_connect/spec/services/openid_connect/user_tokens/exchange_service_spec.rb new file mode 100644 index 000000000000..12a6ebaf8908 --- /dev/null +++ b/modules/openid_connect/spec/services/openid_connect/user_tokens/exchange_service_spec.rb @@ -0,0 +1,116 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +require "spec_helper" + +RSpec.describe OpenIDConnect::UserTokens::ExchangeService, :webmock do + let(:service) { described_class.new(user:) } + let(:user) { create(:user, identity_url: "#{provider.slug}:1337") } + let(:provider) { create(:oidc_provider, :token_exchange_capable) } + + let(:access_token) { "the-access-token" } + let(:refresh_token) { "the-refresh-token" } + let(:idp_access_token) { "the-idp-access-token" } + + let(:existing_audience) { "existing-audience" } + + let(:exchange_response) do + { + status: 200, + headers: { "Content-Type": "application/json" }, + body: { access_token: "#{access_token}-exchanged", refresh_token: "#{refresh_token}-exchanged" }.to_json + } + end + + before do + user.oidc_user_tokens.create!(access_token: idp_access_token, audiences: [OpenIDConnect::UserToken::IDP_AUDIENCE]) + user.oidc_user_tokens.create!(access_token:, refresh_token:, audiences: [existing_audience]) + stub_request(:post, provider.token_endpoint) + .with(body: hash_including(grant_type: "urn:ietf:params:oauth:grant-type:token-exchange")) + .to_return(**exchange_response) + end + + describe "#call" do + subject(:result) { service.call(audience) } + + let(:audience) { "new-audience" } + + it { is_expected.to be_success } + + it "creates a new user token", :aggregate_failures do + expect { subject }.to change(user.oidc_user_tokens, :count).from(2).to(3) + expect(user.oidc_user_tokens.last.access_token).to eq("the-access-token-exchanged") + expect(user.oidc_user_tokens.last.refresh_token).to be_nil + end + + it "returns the new user token" do + expect(result.value!).to eq(user.oidc_user_tokens.last) + end + + it "used the IDP access token to perform the exchange" do + subject + expect(WebMock).to have_requested(:post, provider.token_endpoint) + .with(body: hash_including(subject_token: idp_access_token)) + end + + context "when exchanging token for an existing user token" do + let(:audience) { existing_audience } + + it { is_expected.to be_success } + + it "creates a new user token", :aggregate_failures do + expect { subject }.not_to change(user.oidc_user_tokens, :count) + expect(user.oidc_user_tokens.last.access_token).to eq("the-access-token-exchanged") + expect(user.oidc_user_tokens.last.refresh_token).to be_nil + end + + it "returns the updated user token" do + expect(result.value!).to eq(user.oidc_user_tokens.last) + end + end + + context "when provider is not capable of token exchange" do + let(:provider) { create(:oidc_provider) } + + it { is_expected.to be_failure } + end + end + + describe "#supported?" do + subject { service.supported? } + + it { is_expected.to be_truthy } + + context "when provider is not capable of token exchange" do + let(:provider) { create(:oidc_provider) } + + it { is_expected.to be_falsey } + end + end +end diff --git a/modules/openid_connect/spec/services/openid_connect/user_tokens/fetch_service_spec.rb b/modules/openid_connect/spec/services/openid_connect/user_tokens/fetch_service_spec.rb new file mode 100644 index 000000000000..47e5f90cd392 --- /dev/null +++ b/modules/openid_connect/spec/services/openid_connect/user_tokens/fetch_service_spec.rb @@ -0,0 +1,131 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +require "spec_helper" + +RSpec.describe OpenIDConnect::UserTokens::FetchService, :webmock do + let(:service) { described_class.new(user:, jwt_parser:, token_exchange:, token_refresh:) } + let(:user) { create(:user) } + let(:jwt_parser) { instance_double(OpenIDConnect::JwtParser, parse: Success([parsed_jwt, nil])) } + let(:parsed_jwt) { { "exp" => Time.now.to_i + 60 } } + + let(:token_exchange) { instance_double(OpenIDConnect::UserTokens::ExchangeService, supported?: false) } + let(:token_refresh) { instance_double(OpenIDConnect::UserTokens::RefreshService) } + + let(:access_token) { "the-access-token" } + let(:refresh_token) { "the-refresh-token" } + + let(:existing_audience) { "existing-audience" } + let(:queried_audience) { existing_audience } + + before do + user.oidc_user_tokens.create!(access_token:, refresh_token:, audiences: [existing_audience]) + allow(token_refresh).to receive(:call) do |token| + token.update!(access_token: "access-token-refreshed", refresh_token: "refresh-token-refreshed") + Success(token) + end + allow(token_exchange).to receive(:call) do |aud| + Success(user.oidc_user_tokens.create!(access_token: "access-token-exchanged", + refresh_token: "refresh-token-exchanged", + audiences: [aud])) + end + end + + describe "#access_token_for" do + subject(:result) { service.access_token_for(audience: queried_audience) } + + it { is_expected.to be_success } + + it "returns the stored access token" do + expect(result.value!).to eq(access_token) + end + + context "when the token can't be parsed as JWT" do + let(:jwt_parser) { instance_double(OpenIDConnect::JwtParser, parse: Failure("Not a valid JWT")) } + + it { is_expected.to be_success } + + it "returns the stored access token" do + expect(result.value!).to eq(access_token) + end + end + + context "when the token is expired" do + let(:parsed_jwt) { { "exp" => Time.now.to_i } } + + it { is_expected.to be_success } + + it "returns the refreshed access token" do + expect(result.value!).to eq("access-token-refreshed") + end + end + + context "when audience can't be found" do + let(:queried_audience) { "wrong-audience" } + + it { is_expected.to be_failure } + + it "does not attempt a token exchange" do + subject + expect(token_exchange).not_to have_received(:call) + end + + context "and the provider is token exchange capable" do + let(:token_exchange) { instance_double(OpenIDConnect::UserTokens::ExchangeService, supported?: true) } + + it { is_expected.to be_success } + + it "returns the exchanged access token" do + expect(result.value!).to eq("access-token-exchanged") + end + + it "tries to exchange the correct audience" do + subject + expect(token_exchange).to have_received(:call).with(queried_audience) + end + end + end + end + + describe "#refreshed_access_token_for" do + subject(:result) { service.refreshed_access_token_for(audience: queried_audience) } + + it { is_expected.to be_success } + + it "returns the refreshed access token" do + expect(result.value!).to eq("access-token-refreshed") + end + + context "when audience can't be found" do + let(:queried_audience) { "wrong-audience" } + + it { is_expected.to be_failure } + end + end +end diff --git a/modules/openid_connect/spec/services/openid_connect/user_tokens/refresh_service_spec.rb b/modules/openid_connect/spec/services/openid_connect/user_tokens/refresh_service_spec.rb new file mode 100644 index 000000000000..22e9124af2af --- /dev/null +++ b/modules/openid_connect/spec/services/openid_connect/user_tokens/refresh_service_spec.rb @@ -0,0 +1,130 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +require "spec_helper" + +RSpec.describe OpenIDConnect::UserTokens::RefreshService, :webmock do + subject(:result) { service.call(token) } + + let(:service) { described_class.new(user:, token_exchange:) } + let(:user) { create(:user, identity_url: "#{provider.slug}:1337") } + let(:provider) { create(:oidc_provider) } + + let(:token_exchange) do + instance_double(OpenIDConnect::UserTokens::ExchangeService, supported?: false) + end + + let(:token) do + user.oidc_user_tokens.create!(access_token: "a-token", refresh_token: "r-token", audiences: ["the-audience"]) + end + + let(:refresh_response) do + { + status: 200, + headers: { "Content-Type": "application/json" }, + body: { access_token: "a-refreshed", refresh_token: "r-refreshed" }.to_json + } + end + + before do + stub_request(:post, provider.token_endpoint) + .with(body: hash_including(grant_type: "refresh_token")) + .to_return(**refresh_response) + token.save! + end + + it { is_expected.to be_success } + + it "returns the updated token" do + expect(result.value!).to eq(user.oidc_user_tokens.first) + end + + it "updates the stored access token" do + expect { subject }.to change { user.oidc_user_tokens.first.access_token }.from("a-token").to("a-refreshed") + end + + it "updates the stored refresh token" do + expect { subject }.to change { user.oidc_user_tokens.first.refresh_token }.from("r-token").to("r-refreshed") + end + + context "when the refresh response is unexpected JSON" do + let(:refresh_response) do + { + status: 200, # misbehaving server responds with wrong JSON for success status + headers: { "Content-Type": "application/json" }, + body: { error: "I can't let you do that Dave!" }.to_json + } + end + + it { is_expected.to be_failure } + end + + context "when the refresh response has unexpected status" do + let(:refresh_response) do + { + status: 502, + headers: { "Content-Type": "text/html" }, + body: "502 Bad Gateway" + } + end + + it { is_expected.to be_failure } + end + + context "when there is no refresh token" do + let(:token) do + user.oidc_user_tokens.create!(access_token: "a-token", refresh_token: nil, audiences: ["the-audience"]) + end + + it { is_expected.to be_failure } + + it "does not try to perform a token refresh" do + subject + expect(WebMock).not_to have_requested(:post, provider.token_endpoint) + .with(body: hash_including(grant_type: "refresh_token")) + end + + context "and the provider is token exchange capable" do + let(:token_exchange) do + instance_double(OpenIDConnect::UserTokens::ExchangeService, supported?: true, call: Success("exchange-result")) + end + + it { is_expected.to be_success } + + it "returns the exchanged access token" do + expect(result.value!).to eq("exchange-result") + end + + it "tries to exchange for the token's audience" do + subject + expect(token_exchange).to have_received(:call).with("the-audience") + end + end + end +end diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb b/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb index 506d398e3a76..63d2c6cf5a9b 100644 --- a/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb +++ b/modules/overviews/app/components/project_life_cycles/sections/edit_component.html.erb @@ -7,11 +7,10 @@ method: :put, data: { "controller": "overview--project-life-cycles-form", - "overview--project-life-cycles-form-target": "form", + "overview--project-life-cycles-form-url-value": project_life_cycles_form_path(project_id: model.id), "application-target": "dynamic", turbo: true, turbo_stream: true, - preview_url: project_life_cycles_form_path(project_id: model.id), "test-selector": "async-dialog-content" }, url: update_project_life_cycles_path(project_id: model.id), diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb index a2eab213ea09..b7d6fd2db05e 100644 --- a/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb +++ b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.html.erb @@ -1,16 +1,16 @@ <%= render(Primer::Alpha::Dialog.new(title: t("label_life_cycle_step_plural"), - size: :large, - id: dialog_id)) do |d| + size: :medium_portrait, + id: DIALOG_ID)) do |d| d.with_header(variant: :large) - d.with_body(classes: "Overlay-body_autocomplete_height") do + d.with_body do render(::ProjectLifeCycles::Sections::EditComponent.new(model)) end d.with_footer do component_collection do |footer_collection| footer_collection.with_component(Primer::ButtonComponent.new( data: { - "close-dialog-id": dialog_id + "close-dialog-id": DIALOG_ID } )) do t("button_cancel") diff --git a/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb index 45f2689421ea..9d9a248eda15 100644 --- a/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb +++ b/modules/overviews/app/components/project_life_cycles/sections/edit_dialog_component.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -33,9 +35,7 @@ class EditDialogComponent < ApplicationComponent include OpTurbo::Streamable include OpPrimer::ComponentHelpers - def dialog_id - "edit-project-life-cycles-dialog" - end + DIALOG_ID = "edit-project-life-cycles-dialog" end end end diff --git a/modules/overviews/config/locales/crowdin/tr.yml b/modules/overviews/config/locales/crowdin/tr.yml index c1b022abcc2f..4599429389c4 100644 --- a/modules/overviews/config/locales/crowdin/tr.yml +++ b/modules/overviews/config/locales/crowdin/tr.yml @@ -1,4 +1,4 @@ tr: overviews: - label: 'Genel Bakış' + label: 'Genel bakış' permission_manage_overview: 'Genel bakış sayfasını yönet' diff --git a/modules/overviews/spec/features/managing_overview_page_spec.rb b/modules/overviews/spec/features/managing_overview_page_spec.rb index b05955516e07..5760ba3651b9 100644 --- a/modules/overviews/spec/features/managing_overview_page_spec.rb +++ b/modules/overviews/spec/features/managing_overview_page_spec.rb @@ -30,7 +30,7 @@ require_relative "../support/pages/overview" -RSpec.describe "Overview page managing", :js do +RSpec.describe "Overview page managing", :js, :selenium do let!(:type) { create(:type) } let!(:project) { create(:project, types: [type], description: "My **custom** description") } let!(:open_status) { create(:default_status) } diff --git a/modules/reporting/app/controllers/cost_reports_controller.rb b/modules/reporting/app/controllers/cost_reports_controller.rb index 57cce384b577..1f5fc4556535 100644 --- a/modules/reporting/app/controllers/cost_reports_controller.rb +++ b/modules/reporting/app/controllers/cost_reports_controller.rb @@ -174,7 +174,7 @@ def destroy # Update a record with new query parameters and save it. Redirects to the # specified record or renders the updated table on XHR def update - if set_filter? # save + if save_query? # save old_query = @query prepare_query if old_query @@ -182,6 +182,8 @@ def update old_query.save! @query = old_query end + elsif set_filter? # apply + prepare_query end if request.xhr? table @@ -467,6 +469,12 @@ def set_filter? params[:set_filter].to_i == 1 end + ## + # Determines if the request contains a query to save + def save_query? + params[:save_query].to_i == 1 + end + ## # Extract active filters from the http params def http_filter_parameters diff --git a/modules/reporting/app/helpers/reporting_helper.rb b/modules/reporting/app/helpers/reporting_helper.rb index 35f5ffe14e62..822fe88b68da 100644 --- a/modules/reporting/app/helpers/reporting_helper.rb +++ b/modules/reporting/app/helpers/reporting_helper.rb @@ -141,6 +141,28 @@ def field_representation_map(key, value) end # rubocop:enable Metrics/AbcSize + def spent_on_time_representation(start_timestamp, hours) + return "" if start_timestamp.nil? + + result = format_time(start_timestamp, include_date: false) + return result if hours.nil? || hours.zero? + + end_timestamp = start_timestamp + hours.hours + days_between_suffix = days_between_representation(start_timestamp, end_timestamp) + "#{result} - #{format_time(end_timestamp, include_date: false)}#{days_between_suffix}" + end + + def days_between_representation(start_timestamp, end_timestamp) + return "" if start_timestamp.nil? || end_timestamp.nil? + + days_between = (end_timestamp.to_date - start_timestamp.to_date).to_i + if days_between.positive? + " (+#{WorkPackage::Exports::Formatters::Days.new(nil) + .format_value(days_between, nil) + .delete(' ')})" + end + end + def custom_value(cf_identifier, value) cf_id = cf_identifier.gsub("custom_field", "").to_i diff --git a/modules/reporting/app/models/cost_query/filter/work_package_id.rb b/modules/reporting/app/models/cost_query/filter/work_package_id.rb index 3872127e7cd4..72894bf5dcd2 100644 --- a/modules/reporting/app/models/cost_query/filter/work_package_id.rb +++ b/modules/reporting/app/models/cost_query/filter/work_package_id.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -31,6 +33,10 @@ def self.label WorkPackage.model_name.human end + def self.available_operators + ["=", "!", "=_child_work_packages", "!_child_work_packages"].map(&:to_operator) + end + def self.available_values(*) WorkPackage .where(project_id: Project.allowed_to(User.current, :view_work_packages)) @@ -39,10 +45,6 @@ def self.available_values(*) .map { |id, subject| [text_for_tuple(id, subject), id] } end - def self.available_operators - ["="].map(&:to_operator) - end - ## # Overwrites Report::Filter::Base self.label_for_value method # to achieve a more performant implementation @@ -50,16 +52,21 @@ def self.label_for_value(value) return nil unless value.to_i.to_s == value.to_s # we expect an work_package-id work_package = WorkPackage.find(value.to_i) - [text_for_work_package(work_package), work_package.id] if work_package and work_package.visible?(User.current) + [text_for_work_package(work_package), work_package.id] if work_package&.visible?(User.current) end def self.text_for_tuple(id, subject) str = "##{id} " - str << (subject.length > 30 ? subject.first(26) + "..." : subject) + str << (subject.length > 30 ? "#{subject.first(26)}..." : subject) end - def self.text_for_work_package(i) - i = i.first if i.is_a? Array - text_for_touble(i.id, i.subject) + def self.text_for_work_package(work_package_or_work_package_list) + wp = if work_package_or_work_package_list.is_a?(Array) + work_package_or_work_package_list.first + else + work_package_or_work_package_list + end + + text_for_tuple(wp.id, wp.subject) end end diff --git a/modules/reporting/app/models/cost_query/operator.rb b/modules/reporting/app/models/cost_query/operator.rb index 6c804f850b8c..1441fe83ab33 100644 --- a/modules/reporting/app/models/cost_query/operator.rb +++ b/modules/reporting/app/models/cost_query/operator.rb @@ -50,8 +50,13 @@ def modify(query, field, *_values) def modify(query, field, *values) p_ids = [] values.each do |value| - p_ids += ([value] << Project.find(value).descendants.map(&:id)) + project = Project.visible.find(value) + next unless project + + p_ids << project.id + p_ids += project.descendants.pluck(:id) end + "=".to_operator.modify query, field, p_ids rescue ActiveRecord::RecordNotFound query @@ -63,12 +68,53 @@ def modify(query, field, *values) p_ids = [] values.each do |value| value.to_s.split(",").each do |id| - p_ids += ([id] << Project.find(id).descendants.map(&:id)) + project = Project.visible.find(id) + next unless project + + p_ids << project.id + p_ids += project.descendants.pluck(:id) end end + "!".to_operator.modify query, field, p_ids rescue ActiveRecord::RecordNotFound query end end + + new "=_child_work_packages", validate: :integers, label: :label_is_work_package_with_descendants do + def modify(query, field, *values) + wp_ids = [] + values.each do |value| + work_package = WorkPackage.visible.find(value) + next unless work_package + + wp_ids << work_package.id + wp_ids += work_package.descendants.pluck(:id) + end + + "=".to_operator.modify query, field, wp_ids + rescue ActiveRecord::RecordNotFound + query + end + end + + new "!_child_work_packages", validate: :integers, label: :label_is_not_work_package_with_descendants do + def modify(query, field, *values) + wp_ids = [] + values.each do |value| + value.to_s.split(",").each do |id| + work_package = WorkPackage.visible.find(id) + next unless work_package + + wp_ids << work_package.id + wp_ids += work_package.descendants.pluck(:id) + end + end + + "!".to_operator.modify query, field, wp_ids + rescue ActiveRecord::RecordNotFound + query + end + end end diff --git a/modules/reporting/app/models/cost_query/result.rb b/modules/reporting/app/models/cost_query/result.rb index 32b5d4bb38e5..8690ae253e27 100644 --- a/modules/reporting/app/models/cost_query/result.rb +++ b/modules/reporting/app/models/cost_query/result.rb @@ -44,6 +44,7 @@ class Base < Report::Result::Base class DirectResult < Report::Result::DirectResult include BaseAdditions + def display_costs self["display_costs"].to_i end @@ -51,10 +52,32 @@ def display_costs def real_costs (self["real_costs"] || 0).to_d if display_costs? # FIXME: default value here? end + + def start_timestamp + return nil if self["start_time"].blank? || self["time_zone"].blank? || self["spent_on"].blank? + + timestamp(Date.parse(self["spent_on"]), self["start_time"], self["time_zone"]) + end + + def end_timestamp + return nil if self["units"].blank? + + start = start_timestamp + return nil if start.nil? + + start + self["units"].to_f.hours + end + + private + + def timestamp(date, time, time_zone) + ActiveSupport::TimeZone[time_zone].local(date.year, date.month, date.day, time / 60, time % 60) + end end class WrappedResult < Report::Result::WrappedResult include BaseAdditions + def display_costs (sum_for :display_costs) >= 1 ? 1 : 0 end diff --git a/modules/reporting/app/models/cost_query/sql_statement.rb b/modules/reporting/app/models/cost_query/sql_statement.rb index 973eaf8d14c7..d43b2dc2920c 100644 --- a/modules/reporting/app/models/cost_query/sql_statement.rb +++ b/modules/reporting/app/models/cost_query/sql_statement.rb @@ -74,6 +74,8 @@ def to_s # cost_type_id | -1 | cost_type_id # type | "TimeEntry" | "CostEntry" # count | 1 | 1 + # start_time | start_time | nil + # time_zone | time_zone | nil # # Also: This _should_ handle joining activities and cost_types, as the logic differs for time_entries # and cost_entries. @@ -102,7 +104,7 @@ def self.unified_entry(model) # # @param [CostQuery::SqlStatement] query The statement to adjust def self.unify_time_entries(query) - query.select :activity_id, :logged_by_id, units: :hours, cost_type_id: -1 + query.select :activity_id, :logged_by_id, :start_time, :time_zone, units: :hours, cost_type_id: -1 query.select cost_type: quoted_label(:caption_labor) end @@ -111,7 +113,7 @@ def self.unify_time_entries(query) # # @param [CostQuery::SqlStatement] query The statement to adjust def self.unify_cost_entries(query) - query.select :units, :cost_type_id, :logged_by_id, activity_id: -1 + query.select :units, :cost_type_id, :logged_by_id, activity_id: -1, start_time: nil, time_zone: nil query.select cost_type: "cost_types.name" query.join CostType end diff --git a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb index 4c2735ab7d5b..dae4c2706db8 100644 --- a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb +++ b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb @@ -5,6 +5,7 @@ class CostQuery::PDF::TimesheetGenerator include WorkPackage::PDFExport::Export::Cover include WorkPackage::PDFExport::Export::Page include WorkPackage::PDFExport::Export::Style + include ReportingHelper H1_FONT_SIZE = 26 H1_MARGIN_BOTTOM = 2 @@ -90,6 +91,7 @@ def generate! def render_doc write_cover_page! if with_cover? + write_overview! write_heading! write_hr! write_entries! @@ -98,13 +100,16 @@ def render_doc end def write_entries! - all_entries - .group_by(&:user) - .each do |user, result| + grouped_by_user_entries.each do |user, result| write_table(user, result) end end + def grouped_by_user_entries + all_entries + .group_by(&:user) + end + def all_entries @all_entries ||= begin ids = query @@ -124,6 +129,7 @@ def build_table_rows(entries) .each do |spent_on, lines| rows.concat(build_table_day_rows(spent_on, lines)) end + rows.push(build_table_row_sum(entries)) rows end @@ -148,6 +154,24 @@ def build_table_row(spent_on, entry) ].compact end + def build_table_row_sum(entries) + [ + { content: "", rowspan: 1 }, + "", + with_times_column? ? "" : nil, + { content: format_sum_time_entries(entries), font_style: :bold }, + "" + ].compact + end + + def format_sum_time_entries(entries) + format_hours(sum_time_entries(entries)) + end + + def sum_time_entries(entries) + entries.sum(&:hours) + end + def build_table_row_comment(entry) [{ content: entry.comments, @@ -177,7 +201,7 @@ def table_columns_widths end end - def build_table(rows) + def build_table(rows, has_sum_row) pdf.make_table( rows, header: true, @@ -195,6 +219,7 @@ def build_table(rows) adjust_borders_last_column(table) adjust_borders_spanned_column(table) adjust_border_header_row(table) + adjust_border_sum_row(table) if has_sum_row end end @@ -229,8 +254,14 @@ def adjust_border_header_row(table) end end + def adjust_border_sum_row(table) + table.rows(-1).columns(0).style do |c| + c.borders = c.borders - [:right] + end + end + def split_group_rows(table_rows) - measure_table = build_table(table_rows) + measure_table = build_table(table_rows, true) groups = [] index = 0 while index < table_rows.length @@ -271,7 +302,7 @@ def write_grouped_tables(grouped_rows) grouped_rows.each do |grouped_row| grouped_row_height = grouped_row[:height] if current_table_height + grouped_row_height >= available_space_from_bottom - write_grouped_row_table(current_table) + write_grouped_row_table(current_table, false) pdf.start_new_page current_table = [header_row] current_table_height = header_row[:height] @@ -279,15 +310,15 @@ def write_grouped_tables(grouped_rows) current_table.push(grouped_row) current_table_height += grouped_row_height end - write_grouped_row_table(current_table) + write_grouped_row_table(current_table, true) pdf.move_down(28) end - def write_grouped_row_table(grouped_rows) + def write_grouped_row_table(grouped_rows, has_sum_row) current_table = [] merge_first_columns(grouped_rows) grouped_rows.map! { |row| current_table.concat(row[:rows]) } - build_table(current_table).draw + build_table(current_table, has_sum_row).draw end def merge_first_columns(grouped_rows) @@ -322,6 +353,56 @@ def write_hr! pdf.move_down(HR_MARGIN_BOTTOM) end + def write_overview! + groups = grouped_by_user_entries + return if groups.size <= 1 + + write_heading! + write_hr! + write_overview_table!(overview_table_rows(groups)) + + start_new_page_if_needed + end + + def write_overview_table!(rows) + pdf.make_table( + rows, + header: true, + width: pdf.bounds.width, + cell_style: { + size: TABLE_CELL_FONT_SIZE, + border_color: TABLE_CELL_BORDER_COLOR, + border_width: 0.5, + borders: %i[top bottom left right], + padding: [TABLE_CELL_PADDING, TABLE_CELL_PADDING, TABLE_CELL_PADDING + 2, TABLE_CELL_PADDING] + } + ) do |table| + adjust_overview_border_sum_row(table) + end.draw + end + + def adjust_overview_border_sum_row(table) + row = table.rows(-1) + row.columns(0).style { |c| c.borders = c.borders - [:right] } + row.columns(-1).style { |c| c.borders = c.borders - [:left] } + end + + def overview_table_rows(groups) + rows = [ + [ + { content: TimeEntry.human_attribute_name(:user), font_style: :bold }, + { content: I18n.t("export.timesheet.sum_hours"), font_style: :bold } + ] + ] + groups.each do |user, entries| + rows.push([user.name, format_sum_time_entries(entries)]) + end + + total = groups.sum { |_user, entries| entries.sum(&:hours) } + rows.push(["", { content: format_hours(total), font_style: :bold }]) + rows + end + def write_heading! pdf.formatted_text([{ text: heading, size: H1_FONT_SIZE, style: :bold }]) pdf.move_down(H1_MARGIN_BOTTOM) @@ -351,26 +432,7 @@ def format_hours(hours) end def format_spent_on_time(entry) - start_timestamp = entry.start_timestamp - return "" if start_timestamp.nil? - - result = format_time(start_timestamp, include_date: false) - end_timestamp = entry.end_timestamp - return result if end_timestamp.nil? - - days_between_suffix = format_days_between(start_timestamp, end_timestamp) - "#{result} - #{format_time(end_timestamp, include_date: false)}#{days_between_suffix}" - end - - def format_days_between(start_timestamp, end_timestamp) - days_between = (end_timestamp.to_date - start_timestamp.to_date).to_i - if days_between.positive? - " (+#{days_formatter.format_value(days_between, nil).delete(' ')})" - end - end - - def days_formatter - @days_formatter ||= WorkPackage::Exports::Formatters::Days.new(nil) + spent_on_time_representation(entry.start_timestamp, entry.hours) end def with_times_column? diff --git a/modules/reporting/config/locales/crowdin/af.yml b/modules/reporting/config/locales/crowdin/af.yml index 57c062824a6c..c81de2978abd 100644 --- a/modules/reporting/config/locales/crowdin/af.yml +++ b/modules/reporting/config/locales/crowdin/af.yml @@ -45,6 +45,8 @@ af: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ af: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/ar.yml b/modules/reporting/config/locales/crowdin/ar.yml index 6bc2fadeb24e..d9bb7f5484fc 100644 --- a/modules/reporting/config/locales/crowdin/ar.yml +++ b/modules/reporting/config/locales/crowdin/ar.yml @@ -45,6 +45,8 @@ ar: label_greater: ">" label_is_not_project_with_subprojects: "لا (تشمل المشاريع الفرعية)" label_is_project_with_subprojects: "هو (يشمل المشاريع الفرعية)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "سمات مجموعة العمل" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ ar: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "الاعمدة المحددة" diff --git a/modules/reporting/config/locales/crowdin/az.yml b/modules/reporting/config/locales/crowdin/az.yml index 8494a1d7445e..e9ad49ecd048 100644 --- a/modules/reporting/config/locales/crowdin/az.yml +++ b/modules/reporting/config/locales/crowdin/az.yml @@ -45,6 +45,8 @@ az: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ az: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/be.yml b/modules/reporting/config/locales/crowdin/be.yml index 738a5431b765..1756fde468f4 100644 --- a/modules/reporting/config/locales/crowdin/be.yml +++ b/modules/reporting/config/locales/crowdin/be.yml @@ -45,6 +45,8 @@ be: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ be: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/bg.yml b/modules/reporting/config/locales/crowdin/bg.yml index 2b6dbcff67d2..68c3c49b8b9a 100644 --- a/modules/reporting/config/locales/crowdin/bg.yml +++ b/modules/reporting/config/locales/crowdin/bg.yml @@ -45,6 +45,8 @@ bg: label_greater: ">" label_is_not_project_with_subprojects: "не е (включва подпроекти)" label_is_project_with_subprojects: "е (включва подпроекти)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Атрибути на работния пакет" label_less: "<" label_logged_by_reporting: "Влязъл от" @@ -91,8 +93,11 @@ bg: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Вашият износ на отчети за разходите XLS" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Избрани колони" diff --git a/modules/reporting/config/locales/crowdin/ca.yml b/modules/reporting/config/locales/crowdin/ca.yml index aef19f3a48d4..70cba4a4fbcd 100644 --- a/modules/reporting/config/locales/crowdin/ca.yml +++ b/modules/reporting/config/locales/crowdin/ca.yml @@ -45,6 +45,8 @@ ca: label_greater: ">" label_is_not_project_with_subprojects: "no és (inclou subprojectes)" label_is_project_with_subprojects: "és (inclou subprojectes)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Atributs del paquet de treball" label_less: "<" label_logged_by_reporting: "Registrat per" @@ -91,8 +93,11 @@ ca: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "La teva exportació de l'informe de costos XLS" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Columnes seleccionades" diff --git a/modules/reporting/config/locales/crowdin/ckb-IR.yml b/modules/reporting/config/locales/crowdin/ckb-IR.yml index 64b6bc7ffa5c..9179be62cb23 100644 --- a/modules/reporting/config/locales/crowdin/ckb-IR.yml +++ b/modules/reporting/config/locales/crowdin/ckb-IR.yml @@ -45,6 +45,8 @@ ckb-IR: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ ckb-IR: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/cs.yml b/modules/reporting/config/locales/crowdin/cs.yml index 988da86fc741..e186af9a6fa7 100644 --- a/modules/reporting/config/locales/crowdin/cs.yml +++ b/modules/reporting/config/locales/crowdin/cs.yml @@ -45,6 +45,8 @@ cs: label_greater: ">" label_is_not_project_with_subprojects: "není (včetně podprojektů)" label_is_project_with_subprojects: "je (včetně podprojektů)" + label_is_work_package_with_descendants: "je (včetně potomků)" + label_is_not_work_package_with_descendants: "není (včetně potomků)" label_work_package_attributes: "Atributy pracovního balíčku" label_less: "<" label_logged_by_reporting: "Zadáno" @@ -91,8 +93,11 @@ cs: button: "Exportovat výkaz PDF" timesheet: "Pracovní výkaz" time: "Čas" + sum_hours: Suma cost_reports: title: "Váš export XLS zprávy o nákladech" + start_time: "Čas zahájení" + end_time: "Čas ukončení" reporting: group_by: selected_columns: "Vybrané sloupce" diff --git a/modules/reporting/config/locales/crowdin/da.yml b/modules/reporting/config/locales/crowdin/da.yml index 41e76bce110e..61a55480aefd 100644 --- a/modules/reporting/config/locales/crowdin/da.yml +++ b/modules/reporting/config/locales/crowdin/da.yml @@ -45,6 +45,8 @@ da: label_greater: ">" label_is_not_project_with_subprojects: "findes ikke (inkluderer underprojekter)" label_is_project_with_subprojects: "findes (inkluderer underprojekter)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Egenskaber for arbejdspakker" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ da: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/de.yml b/modules/reporting/config/locales/crowdin/de.yml index c2095cf00632..9ebcb8a56a4b 100644 --- a/modules/reporting/config/locales/crowdin/de.yml +++ b/modules/reporting/config/locales/crowdin/de.yml @@ -45,6 +45,8 @@ de: label_greater: ">" label_is_not_project_with_subprojects: "ist nicht (mit Unterprojekten)" label_is_project_with_subprojects: "ist (mit Unterprojekten)" + label_is_work_package_with_descendants: "ist (einschließlich Unterelemente)" + label_is_not_work_package_with_descendants: "ist nicht (einschließlich Unterelemente)" label_work_package_attributes: "Attribute am Ticket" label_less: "<" label_logged_by_reporting: "Gebucht von" @@ -91,8 +93,11 @@ de: button: "Stundenzettel als PDF exportieren" timesheet: "Stundenzettel" time: "Stunden" + sum_hours: Summe cost_reports: title: "Kostenbericht als XLS-Export" + start_time: "Startzeit" + end_time: "Endzeit" reporting: group_by: selected_columns: "Ausgewählte Spalten" diff --git a/modules/reporting/config/locales/crowdin/el.yml b/modules/reporting/config/locales/crowdin/el.yml index 7f3b0f679be9..bb9cb486134f 100644 --- a/modules/reporting/config/locales/crowdin/el.yml +++ b/modules/reporting/config/locales/crowdin/el.yml @@ -45,6 +45,8 @@ el: label_greater: ">" label_is_not_project_with_subprojects: "δεν είναι (περιλαμβάνει υποέργα)" label_is_project_with_subprojects: "είναι (περιλαμβάνει υποέργα)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Χαρακτηριστικά πακέτου εργασίας" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ el: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Επιλεγμένες στήλες" diff --git a/modules/reporting/config/locales/crowdin/eo.yml b/modules/reporting/config/locales/crowdin/eo.yml index bce2b1795803..1d82259aab77 100644 --- a/modules/reporting/config/locales/crowdin/eo.yml +++ b/modules/reporting/config/locales/crowdin/eo.yml @@ -45,6 +45,8 @@ eo: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ eo: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/es.yml b/modules/reporting/config/locales/crowdin/es.yml index 7c7a26d855ef..424d20a8e7cf 100644 --- a/modules/reporting/config/locales/crowdin/es.yml +++ b/modules/reporting/config/locales/crowdin/es.yml @@ -45,6 +45,8 @@ es: label_greater: ">" label_is_not_project_with_subprojects: "no (incluye subproyectos)" label_is_project_with_subprojects: "es (incluye subproyectos)" + label_is_work_package_with_descendants: "es (incluye descendientes)" + label_is_not_work_package_with_descendants: "no es (incluye descendientes)" label_work_package_attributes: "Atributos del paquetes de trabajo" label_less: "<" label_logged_by_reporting: "Registrado por" @@ -91,8 +93,11 @@ es: button: "Exportar registro horario en PDF" timesheet: "Registro horario" time: "Tiempo" + sum_hours: Suma cost_reports: title: "Su exportación de informes de costes XLS" + start_time: "Hora de inicio" + end_time: "Hora de finalización" reporting: group_by: selected_columns: "Columnas seleccionadas" diff --git a/modules/reporting/config/locales/crowdin/et.yml b/modules/reporting/config/locales/crowdin/et.yml index 11fd40508e8d..cd9619e91040 100644 --- a/modules/reporting/config/locales/crowdin/et.yml +++ b/modules/reporting/config/locales/crowdin/et.yml @@ -45,6 +45,8 @@ et: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ et: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/eu.yml b/modules/reporting/config/locales/crowdin/eu.yml index db594cb00694..8fd36868ab1a 100644 --- a/modules/reporting/config/locales/crowdin/eu.yml +++ b/modules/reporting/config/locales/crowdin/eu.yml @@ -45,6 +45,8 @@ eu: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ eu: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/fa.yml b/modules/reporting/config/locales/crowdin/fa.yml index 05b1ba74b22a..2719ad1e2ab4 100644 --- a/modules/reporting/config/locales/crowdin/fa.yml +++ b/modules/reporting/config/locales/crowdin/fa.yml @@ -45,6 +45,8 @@ fa: label_greater: ">" label_is_not_project_with_subprojects: "نیست (شامل پروژه‌های زیرمجموعه)" label_is_project_with_subprojects: "هست (شامل پروژه‌های زیرمجموعه)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "خصوصیات پکیج‌کاری" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ fa: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/fi.yml b/modules/reporting/config/locales/crowdin/fi.yml index 9a2748920c48..b8adadd84079 100644 --- a/modules/reporting/config/locales/crowdin/fi.yml +++ b/modules/reporting/config/locales/crowdin/fi.yml @@ -45,6 +45,8 @@ fi: label_greater: ">" label_is_not_project_with_subprojects: "ei ole (sisältää aliprojekteja)" label_is_project_with_subprojects: "on (sisältää aliprojekteja)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Työnpaketin parametrit" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ fi: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Valitut sarakkeet" diff --git a/modules/reporting/config/locales/crowdin/fil.yml b/modules/reporting/config/locales/crowdin/fil.yml index cf1237ed162b..e8df8bcbc2b2 100644 --- a/modules/reporting/config/locales/crowdin/fil.yml +++ b/modules/reporting/config/locales/crowdin/fil.yml @@ -45,6 +45,8 @@ fil: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ fil: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/fr.yml b/modules/reporting/config/locales/crowdin/fr.yml index 645658854f6f..2457dafc441d 100644 --- a/modules/reporting/config/locales/crowdin/fr.yml +++ b/modules/reporting/config/locales/crowdin/fr.yml @@ -45,6 +45,8 @@ fr: label_greater: ">" label_is_not_project_with_subprojects: "n'est pas (y compris les sous-projets)" label_is_project_with_subprojects: "est (y compris les sous-projets)" + label_is_work_package_with_descendants: "est (y compris les descendants)" + label_is_not_work_package_with_descendants: "n'est pas (y compris les descendants)" label_work_package_attributes: "Attributs du lot de travaux" label_less: "<" label_logged_by_reporting: "Saisi par" @@ -91,8 +93,11 @@ fr: button: "Exporter la feuille de temps PDF" timesheet: "Feuille de temps" time: "Temps" + sum_hours: Total cost_reports: title: "Exportation XLS de vos rapports de coûts" + start_time: "Heure de début" + end_time: "Heure de fin" reporting: group_by: selected_columns: "Colonnes sélectionnées" diff --git a/modules/reporting/config/locales/crowdin/he.yml b/modules/reporting/config/locales/crowdin/he.yml index 1b6c555c0731..140fbd6242ab 100644 --- a/modules/reporting/config/locales/crowdin/he.yml +++ b/modules/reporting/config/locales/crowdin/he.yml @@ -45,6 +45,8 @@ he: label_greater: ">" label_is_not_project_with_subprojects: "לא (כולל תת פרוייקטים)" label_is_project_with_subprojects: "הוא (כולל תת פרוייקטים)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "תכונות חבילת עבודה" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ he: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/hi.yml b/modules/reporting/config/locales/crowdin/hi.yml index b1d47b506e16..053da9dd4b0f 100644 --- a/modules/reporting/config/locales/crowdin/hi.yml +++ b/modules/reporting/config/locales/crowdin/hi.yml @@ -45,6 +45,8 @@ hi: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ hi: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/hr.yml b/modules/reporting/config/locales/crowdin/hr.yml index 28a98ea6434b..acbcb9761b0e 100644 --- a/modules/reporting/config/locales/crowdin/hr.yml +++ b/modules/reporting/config/locales/crowdin/hr.yml @@ -45,6 +45,8 @@ hr: label_greater: ">" label_is_not_project_with_subprojects: "nije (uključujući i podprojekte)" label_is_project_with_subprojects: "je (uključujući podprojekte)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Atributi radnih paketa" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ hr: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/hu.yml b/modules/reporting/config/locales/crowdin/hu.yml index 78d965eee2e0..dfdf30f6a75a 100644 --- a/modules/reporting/config/locales/crowdin/hu.yml +++ b/modules/reporting/config/locales/crowdin/hu.yml @@ -45,6 +45,8 @@ hu: label_greater: ">" label_is_not_project_with_subprojects: "nem egyezik (alprojektekkel együtt)" label_is_project_with_subprojects: "egyezik (alprojektekkel együtt)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Munkacsomag attribútumai" label_less: "<" label_logged_by_reporting: "Naplózta" @@ -91,8 +93,11 @@ hu: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Költségjelentés készítése XLS formában" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "A kijelölt oszlopok" diff --git a/modules/reporting/config/locales/crowdin/id.yml b/modules/reporting/config/locales/crowdin/id.yml index a2c5b977deba..6c24e3ed9813 100644 --- a/modules/reporting/config/locales/crowdin/id.yml +++ b/modules/reporting/config/locales/crowdin/id.yml @@ -45,6 +45,8 @@ id: label_greater: ">" label_is_not_project_with_subprojects: "yang bukan (termasuk dalam subproyek)" label_is_project_with_subprojects: "adalah (termasuk dalam subproyek)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Attribut work package" label_less: "<" label_logged_by_reporting: "Dicatat oleh" @@ -91,8 +93,11 @@ id: button: "Ekspor absensi PDF" timesheet: "Absensi" time: "Waktu" + sum_hours: Sum cost_reports: title: "Ekspor XLS Laporan Biaya Anda" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Kolom terpilih" diff --git a/modules/reporting/config/locales/crowdin/it.yml b/modules/reporting/config/locales/crowdin/it.yml index d1d0f0cd3a03..826528e0a73b 100644 --- a/modules/reporting/config/locales/crowdin/it.yml +++ b/modules/reporting/config/locales/crowdin/it.yml @@ -45,6 +45,8 @@ it: label_greater: ">" label_is_not_project_with_subprojects: "non è (include sottoprogetti)" label_is_project_with_subprojects: "è (include sottoprogetti)" + label_is_work_package_with_descendants: "è (include i discendenti)" + label_is_not_work_package_with_descendants: "non è (include i discendenti)" label_work_package_attributes: "Attributi del pacchetto lavoro" label_less: "<" label_logged_by_reporting: "Registrato da" @@ -91,8 +93,11 @@ it: button: "Esportazione del foglio presenze in PDF" timesheet: "Foglio presenze" time: "Ora" + sum_hours: Somma cost_reports: title: "Esportazione XLS dei report sui costi" + start_time: "Ora di inizio" + end_time: "Ora di fine" reporting: group_by: selected_columns: "Colonne selezionate" diff --git a/modules/reporting/config/locales/crowdin/ja.yml b/modules/reporting/config/locales/crowdin/ja.yml index d5b389273c7c..019468877312 100644 --- a/modules/reporting/config/locales/crowdin/ja.yml +++ b/modules/reporting/config/locales/crowdin/ja.yml @@ -45,6 +45,8 @@ ja: label_greater: ">" label_is_not_project_with_subprojects: "ではない (子プロジェクトを含む)" label_is_project_with_subprojects: "は(サブプロジェクトを含む)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "作業項目の属性" label_less: "<" label_logged_by_reporting: "によって記録" @@ -91,8 +93,11 @@ ja: button: "PDFタイムシートをエクスポート" timesheet: "タイムシート" time: "時間" + sum_hours: Sum cost_reports: title: "あなたのコストレポートXLSのエクスポート" + start_time: "開始時間" + end_time: "終了時間" reporting: group_by: selected_columns: "選択された列" diff --git a/modules/reporting/config/locales/crowdin/ka.yml b/modules/reporting/config/locales/crowdin/ka.yml index 17f4b561e06e..c0728450cb5b 100644 --- a/modules/reporting/config/locales/crowdin/ka.yml +++ b/modules/reporting/config/locales/crowdin/ka.yml @@ -45,6 +45,8 @@ ka: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "ჩანაწერის ავტორი" @@ -91,8 +93,11 @@ ka: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/kk.yml b/modules/reporting/config/locales/crowdin/kk.yml index 0879b51229e1..6812b911f543 100644 --- a/modules/reporting/config/locales/crowdin/kk.yml +++ b/modules/reporting/config/locales/crowdin/kk.yml @@ -45,6 +45,8 @@ kk: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ kk: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/ko.yml b/modules/reporting/config/locales/crowdin/ko.yml index 501becdbb06a..7fe66f08c7bb 100644 --- a/modules/reporting/config/locales/crowdin/ko.yml +++ b/modules/reporting/config/locales/crowdin/ko.yml @@ -45,6 +45,8 @@ ko: label_greater: ">" label_is_not_project_with_subprojects: "일치하지 않음(하위 프로젝트 포함)" label_is_project_with_subprojects: "일치함(하위 프로젝트 포함)" + label_is_work_package_with_descendants: "(하위 항목 포함)임" + label_is_not_work_package_with_descendants: "(하위 항목 포함) 아님" label_work_package_attributes: "작업 패키지 특성" label_less: "<" label_logged_by_reporting: "기록자" @@ -91,8 +93,11 @@ ko: button: "PDF 타임시트 내보내기" timesheet: "타임시트" time: "시간" + sum_hours: 합계 cost_reports: title: "비용 리포트 XML로 내보내기" + start_time: "시작 시간" + end_time: "종료 시간" reporting: group_by: selected_columns: "선택된 열" diff --git a/modules/reporting/config/locales/crowdin/lt.yml b/modules/reporting/config/locales/crowdin/lt.yml index 4463ae0a5c5f..cb7fab3ddf6e 100644 --- a/modules/reporting/config/locales/crowdin/lt.yml +++ b/modules/reporting/config/locales/crowdin/lt.yml @@ -45,6 +45,8 @@ lt: label_greater: ">" label_is_not_project_with_subprojects: "nėra (apima subprojektus)" label_is_project_with_subprojects: "yra (apima subprojektus)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Darbų paketo atributai" label_less: "<" label_logged_by_reporting: "Registravo" @@ -91,8 +93,11 @@ lt: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Jūsų kainos ataskaitų XLS eksportas" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Pasirinkti stulpeliai" diff --git a/modules/reporting/config/locales/crowdin/lv.yml b/modules/reporting/config/locales/crowdin/lv.yml index a3fd4fbbcd3b..f7053ea4b9b0 100644 --- a/modules/reporting/config/locales/crowdin/lv.yml +++ b/modules/reporting/config/locales/crowdin/lv.yml @@ -45,6 +45,8 @@ lv: label_greater: "lielāks >" label_is_not_project_with_subprojects: "nav (ietver apakšprojektus)" label_is_project_with_subprojects: "ir (ieskaitot apakšprojektus)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Darba pieteikumu atribūti" label_less: "mazāk <" label_logged_by_reporting: "Ielogoja" @@ -91,8 +93,11 @@ lv: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Izvēlētās kolonnas" diff --git a/modules/reporting/config/locales/crowdin/mn.yml b/modules/reporting/config/locales/crowdin/mn.yml index d6254bf6dff7..10097bd95ef0 100644 --- a/modules/reporting/config/locales/crowdin/mn.yml +++ b/modules/reporting/config/locales/crowdin/mn.yml @@ -45,6 +45,8 @@ mn: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ mn: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/ms.yml b/modules/reporting/config/locales/crowdin/ms.yml index 2b571189d0c3..fc54ffd3a3bc 100644 --- a/modules/reporting/config/locales/crowdin/ms.yml +++ b/modules/reporting/config/locales/crowdin/ms.yml @@ -45,6 +45,8 @@ ms: label_greater: ">" label_is_not_project_with_subprojects: "adalah tidak (termasuk subprojek)" label_is_project_with_subprojects: "adalah (termasuk subprojek)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Atribut pakej kerja" label_less: "<" label_logged_by_reporting: "Dilog oleh" @@ -91,8 +93,11 @@ ms: button: "Eksport lembaran masa PDF" timesheet: "Lembaran masa" time: "Masa" + sum_hours: Sum cost_reports: title: "Eksport Laporan Kos XLS anda" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Kolum terpilih" diff --git a/modules/reporting/config/locales/crowdin/ne.yml b/modules/reporting/config/locales/crowdin/ne.yml index 05f56d7be845..94b202eedf16 100644 --- a/modules/reporting/config/locales/crowdin/ne.yml +++ b/modules/reporting/config/locales/crowdin/ne.yml @@ -45,6 +45,8 @@ ne: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ ne: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/nl.yml b/modules/reporting/config/locales/crowdin/nl.yml index 75e59f722a53..ad8a7563cc69 100644 --- a/modules/reporting/config/locales/crowdin/nl.yml +++ b/modules/reporting/config/locales/crowdin/nl.yml @@ -45,6 +45,8 @@ nl: label_greater: ">" label_is_not_project_with_subprojects: "is niet (inclusief subprojecten)" label_is_project_with_subprojects: "is (inclusief subprojecten)" + label_is_work_package_with_descendants: "is (inclusief nakomelingen)" + label_is_not_work_package_with_descendants: "is niet (inclusief afstammelingen)" label_work_package_attributes: "Attributen van het werkpakket" label_less: "<" label_logged_by_reporting: "Gelogd door" @@ -91,8 +93,11 @@ nl: button: "Exporteer PDF-tijdregistratie" timesheet: "Tijdregistratie" time: "Tijd" + sum_hours: Som cost_reports: title: "Jouw kostenrapporten XLS export" + start_time: "Starttijd" + end_time: "Eindtijd" reporting: group_by: selected_columns: "Geselecteerde kolommen" diff --git a/modules/reporting/config/locales/crowdin/no.yml b/modules/reporting/config/locales/crowdin/no.yml index 385d44f3b806..fdcd17f7ba02 100644 --- a/modules/reporting/config/locales/crowdin/no.yml +++ b/modules/reporting/config/locales/crowdin/no.yml @@ -45,6 +45,8 @@ label_greater: ">" label_is_not_project_with_subprojects: "er ikke (inkluderer underprosjekter)" label_is_project_with_subprojects: "er (inkluderer underprosjekter)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Statuser for arbeidspakke" label_less: "<" label_logged_by_reporting: "Logget av" @@ -91,8 +93,11 @@ button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Din XLS-eksport av kostnadsrapporter" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Valgte kolonner" diff --git a/modules/reporting/config/locales/crowdin/pl.yml b/modules/reporting/config/locales/crowdin/pl.yml index 455268d97910..6737403c8120 100644 --- a/modules/reporting/config/locales/crowdin/pl.yml +++ b/modules/reporting/config/locales/crowdin/pl.yml @@ -45,6 +45,8 @@ pl: label_greater: ">" label_is_not_project_with_subprojects: "nie jest (zawiera podprojekty)" label_is_project_with_subprojects: "jest (zawiera podprojekty)" + label_is_work_package_with_descendants: "jest (zawiera elementy potomne)" + label_is_not_work_package_with_descendants: "nie jest (zawiera elementy potomne)" label_work_package_attributes: "Atrybuty zadań" label_less: "<" label_logged_by_reporting: "W dzienniku zarejestrował:" @@ -91,8 +93,11 @@ pl: button: "Wyeksportuj kartę czasu pracy w formacie PDF" timesheet: "Karta czasu pracy" time: "Czas" + sum_hours: Suma cost_reports: title: "Twój eksport raportów kosztów w formacie XLS" + start_time: "Czas rozpoczęcia" + end_time: "Czas zakończenia" reporting: group_by: selected_columns: "Wybrane kolumny" diff --git a/modules/reporting/config/locales/crowdin/pt-BR.yml b/modules/reporting/config/locales/crowdin/pt-BR.yml index 03be8d4c19a6..0f4ae4d395ed 100644 --- a/modules/reporting/config/locales/crowdin/pt-BR.yml +++ b/modules/reporting/config/locales/crowdin/pt-BR.yml @@ -45,6 +45,8 @@ pt-BR: label_greater: ">" label_is_not_project_with_subprojects: "não é (inclui subprojetos)" label_is_project_with_subprojects: "é (inclui subprojetos)" + label_is_work_package_with_descendants: "é (inclui descendentes)" + label_is_not_work_package_with_descendants: "não é (inclui descendentes)" label_work_package_attributes: "Atributos do pacote de trabalho" label_less: "<" label_logged_by_reporting: "Registrado por" @@ -91,8 +93,11 @@ pt-BR: button: "Exportar planilha de horas em PDF" timesheet: "Planilha de horas" time: "Hora" + sum_hours: Soma cost_reports: title: "Exportação XLS dos seus relatórios de custos" + start_time: "Hora de início" + end_time: "Hora de término" reporting: group_by: selected_columns: "Colunas selecionadas" diff --git a/modules/reporting/config/locales/crowdin/pt-PT.yml b/modules/reporting/config/locales/crowdin/pt-PT.yml index 3b9d69aa43ce..2296209d55e0 100644 --- a/modules/reporting/config/locales/crowdin/pt-PT.yml +++ b/modules/reporting/config/locales/crowdin/pt-PT.yml @@ -45,6 +45,8 @@ pt-PT: label_greater: ">" label_is_not_project_with_subprojects: "não é (inclui subprojetos)" label_is_project_with_subprojects: "é (inclui subprojetos)" + label_is_work_package_with_descendants: "é (inclui descendentes)" + label_is_not_work_package_with_descendants: "não é (inclui descendentes)" label_work_package_attributes: "Atributos do pacote de trabalho" label_less: "<" label_logged_by_reporting: "Registado por" @@ -91,8 +93,11 @@ pt-PT: button: "Exportar registo horário em PDF" timesheet: "Registo horário" time: "Hora" + sum_hours: Soma cost_reports: title: "A sua exportação dos Relatórios de Custo XLS" + start_time: "Hora de início" + end_time: "Hora de fim" reporting: group_by: selected_columns: "Colunas selecionadas" diff --git a/modules/reporting/config/locales/crowdin/ro.yml b/modules/reporting/config/locales/crowdin/ro.yml index 495c67319309..5bdd7685edad 100644 --- a/modules/reporting/config/locales/crowdin/ro.yml +++ b/modules/reporting/config/locales/crowdin/ro.yml @@ -45,6 +45,8 @@ ro: label_greater: ">" label_is_not_project_with_subprojects: "nu este (incluzând subproiecte)" label_is_project_with_subprojects: "este (incluzând subproiecte)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Atribute pachet de lucru" label_less: "<" label_logged_by_reporting: "Logat ca" @@ -91,8 +93,11 @@ ro: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Timp" + sum_hours: Sum cost_reports: title: "Exportul dumneavoastră de rapoarte de costuri XLS" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Coloane selectate" diff --git a/modules/reporting/config/locales/crowdin/ru.yml b/modules/reporting/config/locales/crowdin/ru.yml index 02fdaa9f09f4..cf8664e7830a 100644 --- a/modules/reporting/config/locales/crowdin/ru.yml +++ b/modules/reporting/config/locales/crowdin/ru.yml @@ -45,6 +45,8 @@ ru: label_greater: ">" label_is_not_project_with_subprojects: "нет (включая подпроекты)" label_is_project_with_subprojects: "есть (включая подпроекты)" + label_is_work_package_with_descendants: "является (включая потомков)" + label_is_not_work_package_with_descendants: "не является (включая потомков)" label_work_package_attributes: "Атрибуты рабочего пакета" label_less: "<" label_logged_by_reporting: "Зарегистрировано" @@ -91,8 +93,11 @@ ru: button: "Экспорт табеля учета рабочего времени в PDF" timesheet: "Табель учета рабочего времени" time: "Время" + sum_hours: Сумма cost_reports: title: "Экспорт ваших отчетов о затратах в XLS" + start_time: "Время начала" + end_time: "Время окончания" reporting: group_by: selected_columns: "Выбранные столбцы" diff --git a/modules/reporting/config/locales/crowdin/rw.yml b/modules/reporting/config/locales/crowdin/rw.yml index 19c783f56867..274b6f0580bf 100644 --- a/modules/reporting/config/locales/crowdin/rw.yml +++ b/modules/reporting/config/locales/crowdin/rw.yml @@ -45,6 +45,8 @@ rw: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ rw: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/si.yml b/modules/reporting/config/locales/crowdin/si.yml index 09b324f68034..2f78da0fdbba 100644 --- a/modules/reporting/config/locales/crowdin/si.yml +++ b/modules/reporting/config/locales/crowdin/si.yml @@ -45,6 +45,8 @@ si: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ si: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/sk.yml b/modules/reporting/config/locales/crowdin/sk.yml index 826a97504012..5a4db9989099 100644 --- a/modules/reporting/config/locales/crowdin/sk.yml +++ b/modules/reporting/config/locales/crowdin/sk.yml @@ -45,6 +45,8 @@ sk: label_greater: ">" label_is_not_project_with_subprojects: "nie je (neobsahuje podprojekty)" label_is_project_with_subprojects: "je (obsahuje podprojekty)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Atribúty pracovného balíčka" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ sk: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Váš XLS export správy o nákladoch" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Vybrané stĺpce" diff --git a/modules/reporting/config/locales/crowdin/sl.yml b/modules/reporting/config/locales/crowdin/sl.yml index 8743ad06ceb5..c5cbfd441c7e 100644 --- a/modules/reporting/config/locales/crowdin/sl.yml +++ b/modules/reporting/config/locales/crowdin/sl.yml @@ -45,6 +45,8 @@ sl: label_greater: ">" label_is_not_project_with_subprojects: "ni (s podprojekti) " label_is_project_with_subprojects: "je (s podprojekti) " + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Atributi delovnega paketa" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ sl: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Izbrani stolpci" diff --git a/modules/reporting/config/locales/crowdin/sr.yml b/modules/reporting/config/locales/crowdin/sr.yml index 54409bbea091..9fc23c2184a4 100644 --- a/modules/reporting/config/locales/crowdin/sr.yml +++ b/modules/reporting/config/locales/crowdin/sr.yml @@ -45,6 +45,8 @@ sr: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ sr: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/sv.yml b/modules/reporting/config/locales/crowdin/sv.yml index 8a989f5df991..5efc8412d89b 100644 --- a/modules/reporting/config/locales/crowdin/sv.yml +++ b/modules/reporting/config/locales/crowdin/sv.yml @@ -45,6 +45,8 @@ sv: label_greater: ">" label_is_not_project_with_subprojects: "är inte (inkluderar delprojekt)" label_is_project_with_subprojects: "är (inkluderar delprojekt)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Arbetspaketsattribut" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ sv: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Valda kolumner" diff --git a/modules/reporting/config/locales/crowdin/th.yml b/modules/reporting/config/locales/crowdin/th.yml index 9e86a22d4db0..2fc4a356879d 100644 --- a/modules/reporting/config/locales/crowdin/th.yml +++ b/modules/reporting/config/locales/crowdin/th.yml @@ -45,6 +45,8 @@ th: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ th: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/tr.yml b/modules/reporting/config/locales/crowdin/tr.yml index e62fac4358ba..04d284d4f4d0 100644 --- a/modules/reporting/config/locales/crowdin/tr.yml +++ b/modules/reporting/config/locales/crowdin/tr.yml @@ -23,7 +23,7 @@ tr: plugin_openproject_reporting: name: "OpenProject Raporlama" description: "Bu eklenti, OpenProject Zaman ve maliyetler eklentisi tarafından oluşturulan filtreleme ve gruplama ile özel maliyet raporları oluşturmaya izin verir." - button_save_report_as: "Farklı kaydet..." + button_save_report_as: "Raporu farklı kaydet..." comments: "Yorum" cost_reports_title: "Zaman ve maliyetler" label_cost_report: "Maliyet raporu" @@ -45,6 +45,8 @@ tr: label_greater: ">" label_is_not_project_with_subprojects: "değil (alt projeler dahil)" label_is_project_with_subprojects: "(alt projeler dahil)" + label_is_work_package_with_descendants: "(torunları içerir)" + label_is_not_work_package_with_descendants: "değildir (torunları içerir)" label_work_package_attributes: "Çalışma paketi nitelikleri" label_less: "<" label_logged_by_reporting: "Giriş yapan:" @@ -91,8 +93,11 @@ tr: button: "PDF zaman çizelgesini dışa aktar" timesheet: "Zaman Çizelgesi" time: "Zaman" + sum_hours: Toplam cost_reports: title: "Maliyet Raporlarınızın XLS çıktısı" + start_time: "Başlangıç zamanı" + end_time: "Bitiş zamanı" reporting: group_by: selected_columns: "Seçilen sütunlar" diff --git a/modules/reporting/config/locales/crowdin/uk.yml b/modules/reporting/config/locales/crowdin/uk.yml index 7bd51c681c25..093bb7dfa95c 100644 --- a/modules/reporting/config/locales/crowdin/uk.yml +++ b/modules/reporting/config/locales/crowdin/uk.yml @@ -45,6 +45,8 @@ uk: label_greater: ">" label_is_not_project_with_subprojects: "не є (включає підпроекти)" label_is_project_with_subprojects: "є (включає підпроекти)" + label_is_work_package_with_descendants: "є (включно з нащадками)" + label_is_not_work_package_with_descendants: "не є (включно з нащадками)" label_work_package_attributes: "Атрибути робочого пакету" label_less: "<" label_logged_by_reporting: "Ви ввійшли як" @@ -91,8 +93,11 @@ uk: button: "Експортувати табель обліку часу в PDF" timesheet: "Табель обліку часу" time: "Час" + sum_hours: Сума cost_reports: title: "Експорт звітів про витрати у форматі XLS" + start_time: "Час початку" + end_time: "Час завершення" reporting: group_by: selected_columns: "Вибрані стовпці" diff --git a/modules/reporting/config/locales/crowdin/uz.yml b/modules/reporting/config/locales/crowdin/uz.yml index 32a28ee62f74..a2666f6f0eea 100644 --- a/modules/reporting/config/locales/crowdin/uz.yml +++ b/modules/reporting/config/locales/crowdin/uz.yml @@ -45,6 +45,8 @@ uz: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -91,8 +93,11 @@ uz: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: selected_columns: "Selected columns" diff --git a/modules/reporting/config/locales/crowdin/vi.yml b/modules/reporting/config/locales/crowdin/vi.yml index 62828dade11c..cc7d2c10aa94 100644 --- a/modules/reporting/config/locales/crowdin/vi.yml +++ b/modules/reporting/config/locales/crowdin/vi.yml @@ -45,6 +45,8 @@ vi: label_greater: ">" label_is_not_project_with_subprojects: "không phải (bao gồm các dự án con)" label_is_project_with_subprojects: "là (bao gồm các dự án con)" + label_is_work_package_with_descendants: "là (bao gồm tập con)" + label_is_not_work_package_with_descendants: "không phải (kể cả tập con)" label_work_package_attributes: "Các thuộc tính gói công việc" label_less: "<" label_logged_by_reporting: "Đã ghi bởi" @@ -91,8 +93,11 @@ vi: button: "Xuất bảng thời gian bằng PDF" timesheet: "Bảng thời gian" time: "Thời gian" + sum_hours: Sum cost_reports: title: "Xuất báo cáo chi phí của bạn sang XLS" + start_time: "Thời gian bắt đầu" + end_time: "Thời gian kết thúc" reporting: group_by: selected_columns: "Các cột đã chọn" diff --git a/modules/reporting/config/locales/crowdin/zh-CN.yml b/modules/reporting/config/locales/crowdin/zh-CN.yml index 818a44fb11a1..4d231a37b3c3 100644 --- a/modules/reporting/config/locales/crowdin/zh-CN.yml +++ b/modules/reporting/config/locales/crowdin/zh-CN.yml @@ -45,6 +45,8 @@ zh-CN: label_greater: ">" label_is_not_project_with_subprojects: "不是（包含子项目）" label_is_project_with_subprojects: "是（包含子项目）" + label_is_work_package_with_descendants: "是（包括后代）" + label_is_not_work_package_with_descendants: "不（包括后代）" label_work_package_attributes: "工作包属性" label_less: "<" label_logged_by_reporting: "记录者为" @@ -91,8 +93,11 @@ zh-CN: button: "导出 PDF 时间表" timesheet: "时间表" time: "时间" + sum_hours: 总和 cost_reports: title: "您的成本报告 XLS 导出" + start_time: "开始时间" + end_time: "结束时间" reporting: group_by: selected_columns: "选定的列" diff --git a/modules/reporting/config/locales/crowdin/zh-TW.yml b/modules/reporting/config/locales/crowdin/zh-TW.yml index b3ecce8721ae..160d6764df09 100644 --- a/modules/reporting/config/locales/crowdin/zh-TW.yml +++ b/modules/reporting/config/locales/crowdin/zh-TW.yml @@ -45,6 +45,8 @@ zh-TW: label_greater: ">" label_is_not_project_with_subprojects: "不是 (包括子專案)" label_is_project_with_subprojects: "是 (包括子專案)" + label_is_work_package_with_descendants: "是（包括繼任）" + label_is_not_work_package_with_descendants: "不是（包括繼任）" label_work_package_attributes: "工作項目屬性" label_less: "<" label_logged_by_reporting: "記錄者" @@ -91,8 +93,11 @@ zh-TW: button: "匯出 PDF 時間表" timesheet: "時間表" time: "時間" + sum_hours: 總和 cost_reports: title: "您的成本報表(以XLS匯出)" + start_time: "開始時間" + end_time: "結束時間" reporting: group_by: selected_columns: "選擇列" diff --git a/modules/reporting/config/locales/en.yml b/modules/reporting/config/locales/en.yml index 1b56799a2c02..27a86d35c3c1 100644 --- a/modules/reporting/config/locales/en.yml +++ b/modules/reporting/config/locales/en.yml @@ -58,6 +58,8 @@ en: label_greater: ">" label_is_not_project_with_subprojects: "is not (includes subprojects)" label_is_project_with_subprojects: "is (includes subprojects)" + label_is_work_package_with_descendants: "is (includes descendants)" + label_is_not_work_package_with_descendants: "is not (includes descendants)" label_work_package_attributes: "Work package attributes" label_less: "<" label_logged_by_reporting: "Logged by" @@ -110,8 +112,11 @@ en: button: "Export PDF timesheet" timesheet: "Timesheet" time: "Time" + sum_hours: Sum cost_reports: title: "Your Cost Reports XLS export" + start_time: "Start time" + end_time: "End time" reporting: group_by: diff --git a/modules/reporting/lib/open_project/reporting/cost_entry_xls_table.rb b/modules/reporting/lib/open_project/reporting/cost_entry_xls_table.rb index 6cdd22eedb73..4606b113ed48 100644 --- a/modules/reporting/lib/open_project/reporting/cost_entry_xls_table.rb +++ b/modules/reporting/lib/open_project/reporting/cost_entry_xls_table.rb @@ -52,22 +52,48 @@ def format_columns number_format: currency_format) end + def cost_fields_columns(result) + cost_entry_attributes + .map { |field| show_field field, result.fields[field.to_s] } + end + + def cost_main_times_columns(result) + [ + format_time(result.start_timestamp, include_date: false), + cost_main_end_time_column(result.start_timestamp, result.end_timestamp) + ] + end + + def cost_main_end_time_column(start_timestamp, end_timestamp) + return "" if start_timestamp.nil? || end_timestamp.nil? + + days_between = (end_timestamp.to_date - start_timestamp.to_date).to_i + day_prefix = days_between >= 1 ? "#{end_timestamp.to_date.iso8601} " : "" + "#{day_prefix}#{format_time(end_timestamp, include_date: false)}" + end + + def cost_main_columns(result) + main_cols = [show_field(:spent_on, result.fields[:spent_on.to_s])] + main_cols.concat cost_main_times_columns(result) if with_times_column? + main_cols + end + def cost_row(result) current_cost_type_id = result.fields["cost_type_id"].to_i - cost_entry_attributes - .map { |field| show_field field, result.fields[field.to_s] } - .concat( - [ - show_result(result, current_cost_type_id), # units - cost_type_label(current_cost_type_id, @cost_type), # cost type - show_result(result, 0) # costs/currency - ] + cost_main_columns(result) + .concat(cost_fields_columns(result)) + .push( + + show_result(result, current_cost_type_id), # units + cost_type_label(current_cost_type_id, @cost_type), # cost type + show_result(result, 0) # costs/currency + ) end def build_footer - footer = [""] * cost_entry_attributes.size + footer = [""] * (cost_entry_attributes.size + main_headers.size) footer += if show_result(query, 0) == show_result(query) multiple_unit_types_footer else @@ -84,14 +110,22 @@ def multiple_unit_types_footer ["", "", show_result(query)] end + def main_headers + main = [label_for(:spent_on)] + if with_times_column? + main.push I18n.t(:"export.cost_reports.start_time"), I18n.t(:"export.cost_reports.end_time") + end + main + end + def headers - cost_entry_attributes - .map { |field| label_for(field) } - .concat([CostEntry.human_attribute_name(:units), CostType.model_name.human, CostEntry.human_attribute_name(:costs)]) + main_headers + .concat(cost_entry_attributes.map { |field| label_for(field) }) + .push(CostEntry.human_attribute_name(:units), CostType.model_name.human, CostEntry.human_attribute_name(:costs)) end def cost_entry_attributes - %i[spent_on user_id activity_id work_package_id comments project_id] + %i[user_id activity_id work_package_id comments project_id] end # Returns the results of the query sorted by date the time was spent on and by id @@ -103,4 +137,12 @@ def sorted_results .sort .flat_map { |_, date_results| date_results.sort_by { |r| r.fields["id"] } } end + + def labour_query? + @unit_id == -1 + end + + def with_times_column? + Setting.allow_tracking_start_and_end_times && labour_query? + end end diff --git a/modules/reporting/lib/widget/controls/save.rb b/modules/reporting/lib/widget/controls/save.rb index 21375f6d8675..de1c93b3291a 100644 --- a/modules/reporting/lib/widget/controls/save.rb +++ b/modules/reporting/lib/widget/controls/save.rb @@ -34,6 +34,6 @@ def render "#", id: "query-breadcrumb-save", class: "button icon-context icon-save", - "data-target": url_for(action: "update", id: @subject.id, set_filter: "1")) + "data-target": url_for(action: :update, id: @subject.id, set_filter: "1", save_query: "1")) end end diff --git a/modules/reporting/lib/widget/table/entry_table.rb b/modules/reporting/lib/widget/table/entry_table.rb index 6cab895d47e6..513934a3f0c7 100644 --- a/modules/reporting/lib/widget/table/entry_table.rb +++ b/modules/reporting/lib/widget/table/entry_table.rb @@ -27,7 +27,9 @@ #++ class Widget::Table::EntryTable < Widget::Table - FIELDS = %i[spent_on user_id activity_id work_package_id comments logged_by_id project_id].freeze + include ReportingHelper + + FIELDS = %i[user_id activity_id work_package_id comments logged_by_id project_id].freeze def render content = content_tag :div, class: "generic-table--container -with-footer" do @@ -47,6 +49,7 @@ def render def colgroup content_tag :colgroup do + concat content_tag(:col, "") FIELDS.each do concat content_tag(:col, "") end @@ -56,33 +59,31 @@ def colgroup end end + def head_column_field(field) + head_column(label_for(field)) + end + + def head_column(label) + content_tag(:th) do + content_tag(:div, class: "generic-table--sort-header-outer") do + content_tag(:div, class: "generic-table--sort-header") do + content_tag(:span, label) + end + end + end + end + # rubocop:disable Metrics/AbcSize def head content_tag :thead do content_tag :tr do + concat head_column_field(:spent_on) + concat head_column(I18n.t("label_time")) if with_times_column? FIELDS.map do |field| - concat content_tag(:th) { - content_tag(:div, class: "generic-table--sort-header-outer") do - content_tag(:div, class: "generic-table--sort-header") do - content_tag(:span, label_for(field)) - end - end - } + concat head_column_field(field) end - concat content_tag(:th) { - content_tag(:div, class: "generic-table--sort-header-outer") do - content_tag(:div, class: "generic-table--sort-header") do - content_tag(:span, cost_type.try(:unit_plural) || I18n.t(:units)) - end - end - } - concat content_tag(:th) { - content_tag(:div, class: "generic-table--sort-header-outer") do - content_tag(:div, class: "generic-table--sort-header") do - content_tag(:span, CostEntry.human_attribute_name(:costs)) - end - end - } + concat head_column(cost_type.try(:unit_plural) || I18n.t(:units)) + concat head_column(CostEntry.human_attribute_name(:costs)) hit = false @subject.each_direct_result do |result| next if hit @@ -101,15 +102,16 @@ def head def foot content_tag :tfoot do content_tag :tr do + main_columns = with_times_column? ? 2 : 1 if show_result(@subject, 0) == show_result(@subject) - concat content_tag(:td, "", colspan: FIELDS.size + 1) + concat content_tag(:td, "", colspan: FIELDS.size + main_columns + 1) concat content_tag(:td) { concat content_tag(:div, show_result(@subject), class: "result generic-table--footer-outer") } else - concat content_tag(:td, "", colspan: FIELDS.size) + concat content_tag(:td, "", colspan: FIELDS.size + main_columns) concat content_tag(:td) { concat content_tag(:div, show_result(@subject), @@ -126,15 +128,25 @@ def foot end end + def body_column_field(field, result) + content_tag(:td, show_field(field, result.fields[field.to_s]), + "raw-data": raw_field(field, result.fields[field.to_s]), + class: "left") + end + def body content_tag :tbody do rows = "".html_safe @subject.each_direct_result do |result| rows << (content_tag(:tr) do + concat body_column_field(:spent_on, result) + if with_times_column? + concat content_tag :td, spent_on_time_representation(result.start_timestamp, result["units"].to_f), + class: "start_time right", + "raw-data": result.start_timestamp.to_s + end FIELDS.each do |field| - concat content_tag(:td, show_field(field, result.fields[field.to_s]), - "raw-data": raw_field(field, result.fields[field.to_s]), - class: "left") + concat body_column_field(field, result) end concat content_tag :td, show_result(result, result.fields["cost_type_id"].to_i), class: "units right", @@ -177,4 +189,13 @@ def icons(result) end # rubocop:enable Metrics/AbcSize + + def labour_query? + cost_type_filter = @subject.filters.detect { |f| f.is_a?(CostQuery::Filter::CostTypeId) } + cost_type_filter&.values&.first.to_i == -1 + end + + def with_times_column? + Setting.allow_tracking_start_and_end_times && labour_query? + end end diff --git a/modules/reporting/spec/features/applying_spec.rb b/modules/reporting/spec/features/applying_spec.rb new file mode 100644 index 000000000000..9dcad206a74e --- /dev/null +++ b/modules/reporting/spec/features/applying_spec.rb @@ -0,0 +1,78 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "spec_helper" +require_relative "support/pages/cost_report_page" + +RSpec.describe "Cost report page apply", :js do + let(:project) { create(:project) } + let(:user) { create(:admin) } + let(:report_page) { Pages::CostReportPage.new project } + + before do + login_as user + visit cost_reports_path(project) + report_page.save as: "Testreport" + end + + def clear_project_filter + within "#filter_project_id" do + find(".filter_rem").click + end + end + + def reload_page + page.refresh + wait_for_reload + end + + it "applying does not save a report" do + # we load our report + click_on "Testreport" + + # we have project filter + expect(page).to have_css("#filter_project_id") + + # we remove it + clear_project_filter + + # must be gone + expect(page).to have_no_css("#filter_project_id") + + # press Apply + report_page.apply + + # reload report + click_on "Testreport" + + # must be present + expect(page).to have_css("#filter_project_id") + end +end diff --git a/modules/reporting/spec/features/calculations_spec.rb b/modules/reporting/spec/features/calculations_spec.rb index dd4d1f94a6a1..54f8d7ef232c 100644 --- a/modules/reporting/spec/features/calculations_spec.rb +++ b/modules/reporting/spec/features/calculations_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "Cost Report", "calculations", :js, :with_cuprite do +RSpec.describe "Cost Report", "calculations", :js do let(:project) { create(:project) } let(:user) { create(:admin) } let(:work_package) { create(:work_package, project:) } diff --git a/modules/reporting/spec/features/export_cost_report_spec.rb b/modules/reporting/spec/features/export_cost_report_spec.rb index 8301e541d6dd..a687fdd7cc44 100644 --- a/modules/reporting/spec/features/export_cost_report_spec.rb +++ b/modules/reporting/spec/features/export_cost_report_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -29,18 +31,36 @@ require_relative "../spec_helper" require_relative "support/pages/cost_report_page" -RSpec.describe "Cost reports XLS export", :js do +RSpec.describe "Cost reports XLS export", :js, with_flag: { track_start_and_end_times_for_time_entries: true } do shared_let(:project) { create(:project) } shared_let(:user) { create(:admin) } shared_let(:cost_type) { create(:cost_type, name: "Post-war", unit: "cap", unit_plural: "caps") } shared_let(:work_package) { create(:work_package, project:, subject: "Some task") } - shared_let(:cost_entry) { create(:cost_entry, user:, work_package:, project:, cost_type:) } + shared_let(:cost_entry) do + create(:cost_entry, user:, work_package:, project:, + cost_type:, spent_on: 3.days.ago) + end + shared_let(:time_entry) do + create(:time_entry, user:, work_package:, project:, + start_time: 1 * 60, + spent_on: 2.days.ago, + hours: 1.95, + time_zone: "UTC") + end + shared_let(:time_entry_long) do + create(:time_entry, user:, work_package:, project:, + start_time: 1 * 60, + spent_on: 1.day.ago, + hours: 28.0, + time_zone: "UTC") + end + let(:report_page) { Pages::CostReportPage.new project } let(:sheet) { @download_list.refresh_from(page).latest_downloaded_content } # rubocop:disable RSpec/InstanceVariable subject do io = StringIO.new sheet - Spreadsheet.open(io).worksheets.first + Spreadsheet.open(io).worksheets end before do @@ -52,7 +72,70 @@ DownloadList.clear end - it "can download and open the XLS" do + def expect_custom_cost_entry(cost_entry_row) + date, user_ref, _, wp_ref, _, project_ref, costs, type, = cost_entry_row + expect(date).to eq(cost_entry.spent_on.iso8601) + expect(user_ref).to eq(user.name) + expect(wp_ref).to include "Some task" + expect(project_ref).to eq project.name + expect(costs).to eq 1.0 + expect(type).to eq "Post-war" + end + + def expect_labor_cost_entry(cost_entry_row, entry) + date, user_ref, _, wp_ref, _, project_ref, costs, type, = cost_entry_row + expect(date).to eq(entry.spent_on.iso8601) + expect(user_ref).to eq(user.name) + expect(wp_ref).to include "Some task" + expect(project_ref).to eq project.name + expect(costs).to eq entry.hours + expect(type).to eq "Labor" + end + + def expect_time_entry(time_entry_row, entry, start_time_value, end_time_value) + date, start_time, end_time, user_ref, _, wp_ref, _, project_ref, costs, type, = time_entry_row + expect(date).to eq(entry.spent_on.iso8601) + expect(start_time).to eq start_time_value + expect(end_time).to eq end_time_value + expect(user_ref).to eq(user.name) + expect(wp_ref).to include "Some task" + expect(project_ref).to eq project.name + expect(costs).to eq entry.hours + expect(type).to eq "Labor" + end + + def expect_sheet_title(title) + expect(title.first).to include("Cost reports (#{Time.zone.today.strftime('%m/%d/%Y')})") + end + + def expect_cost_entries_sheet + title, _, cost_entry_row, time_entry_row, time_entry_long_row = subject.first.rows + expect_sheet_title title + expect_custom_cost_entry cost_entry_row + expect_labor_cost_entry time_entry_row, time_entry + expect_labor_cost_entry time_entry_long_row, time_entry_long + end + + def expect_time_entries_sheet(allow_show_start_and_end_times) + title, _, time_entry_row, time_entry_long_row = subject.second.rows + expect_sheet_title title + if allow_show_start_and_end_times + expect_time_entry time_entry_row, time_entry, "01:00 AM", "02:57 AM" + expect_time_entry time_entry_long_row, time_entry_long, "01:00 AM", + "#{(time_entry_long.spent_on + 1.day).iso8601} 05:00 AM" + else + expect_labor_cost_entry time_entry_row, time_entry + expect_labor_cost_entry time_entry_long_row, time_entry_long + end + end + + def expect_custom_type_entries_sheet + title, _, cost_entry = subject.third.rows + expect_sheet_title title + expect_custom_cost_entry cost_entry + end + + def export_xls report_page.visit! click_on "Export XLS" @@ -61,16 +144,23 @@ perform_enqueued_jobs expect(page).to have_text(I18n.t("export.succeeded")) + end - title, _, entry, = subject.rows - expect(title.first).to include("Cost reports (#{Time.zone.today.strftime('%m/%d/%Y')})") - date, user_ref, _, wp_ref, _, project_ref, costs, type, = entry + context "with allow_tracking_start_and_end_times", with_settings: { allow_tracking_start_and_end_times: true } do + it "can download and open the XLS" do + export_xls + expect_cost_entries_sheet + expect_time_entries_sheet true + expect_custom_type_entries_sheet + end + end - expect(date).to eq(Time.zone.today.iso8601) - expect(user_ref).to eq(user.name) - expect(wp_ref).to include "Some task" - expect(project_ref).to eq project.name - expect(costs).to eq 1.0 - expect(type).to eq "Post-war" + context "without allow_tracking_start_and_end_times", with_settings: { allow_tracking_start_and_end_times: false } do + it "can download and open the XLS" do + export_xls + expect_cost_entries_sheet + expect_time_entries_sheet false + expect_custom_type_entries_sheet + end end end diff --git a/modules/reporting/spec/features/export_timesheet_spec.rb b/modules/reporting/spec/features/export_timesheet_spec.rb index 35f552fc9611..bc783d8a4a72 100644 --- a/modules/reporting/spec/features/export_timesheet_spec.rb +++ b/modules/reporting/spec/features/export_timesheet_spec.rb @@ -37,28 +37,25 @@ shared_let(:cost_entry) { create(:cost_entry, user:, work_package:, project:, cost_type:) } let(:report_page) { Pages::CostReportPage.new project } - subject { @download_list.refresh_from(page).latest_download.to_s } # rubocop:disable RSpec/InstanceVariable - - before do - @download_list = DownloadList.new - login_as(user) - end - - after do - DownloadList.clear - end + current_user { user } it "can download the PDF" do report_page.visit! - click_on I18n.t("export.timesheet.button") - expect(page).to have_content I18n.t("job_status_dialog.generic_messages.in_queue"), - wait: 10 - perform_enqueued_jobs + # The export opens a new tab with the result + new_window = window_opened_by do + click_on I18n.t("export.timesheet.button") + + expect(page).to have_content I18n.t("job_status_dialog.generic_messages.in_queue") + + perform_enqueued_jobs - expect(page).to have_text(I18n.t("export.succeeded"), - wait: 10) + expect(page).to have_text(I18n.t("export.succeeded")) + end - expect(subject).to have_text(".pdf") + # Switching to that tab and checking that the content is a PDF + within_window new_window do + expect(page.source).to have_css("[type='application/pdf']") + end end end diff --git a/modules/reporting/spec/features/filter_spec.rb b/modules/reporting/spec/features/filter_spec.rb index f3466494374d..21b52eb34224 100644 --- a/modules/reporting/spec/features/filter_spec.rb +++ b/modules/reporting/spec/features/filter_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "Cost report calculations", :js, :with_cuprite do +RSpec.describe "Cost report calculations", :js do let(:project) { create(:project) } let(:user) { create(:admin) } diff --git a/modules/reporting/spec/features/group_by_spec.rb b/modules/reporting/spec/features/group_by_spec.rb index 5d41ed4b7364..a71f6bfb7a22 100644 --- a/modules/reporting/spec/features/group_by_spec.rb +++ b/modules/reporting/spec/features/group_by_spec.rb @@ -1,7 +1,7 @@ require "spec_helper" require_relative "support/pages/cost_report_page" -RSpec.describe "Cost report calculations", "grouping", :js, :with_cuprite do +RSpec.describe "Cost report calculations", "grouping", :js do let(:project) { create(:project) } let(:user) { create(:admin) } let(:work_package) { create(:work_package, project:) } diff --git a/modules/reporting/spec/features/main_menu_item_spec.rb b/modules/reporting/spec/features/main_menu_item_spec.rb index 8a8aed930998..ddf722f7a258 100644 --- a/modules/reporting/spec/features/main_menu_item_spec.rb +++ b/modules/reporting/spec/features/main_menu_item_spec.rb @@ -31,7 +31,7 @@ require "spec_helper" -RSpec.describe "Cost and Reports Main Menu Item", :js, :with_cuprite do +RSpec.describe "Cost and Reports Main Menu Item", :js do shared_let(:admin) { create(:admin) } shared_let(:project) { create(:project) } shared_let(:user_with_permissions) { create(:user, member_with_permissions: { project => %i[view_time_entries] }) } diff --git a/modules/reporting/spec/features/support/components/cost_reports_base_table.rb b/modules/reporting/spec/features/support/components/cost_reports_base_table.rb index 88611e39871a..ab386d906d1d 100644 --- a/modules/reporting/spec/features/support/components/cost_reports_base_table.rb +++ b/modules/reporting/spec/features/support/components/cost_reports_base_table.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -34,6 +36,7 @@ class CostReportsBaseTable include Capybara::RSpecMatchers include RSpec::Matchers include Flash::Expectations + include Redmine::I18n attr_reader :time_logging_modal @@ -57,26 +60,43 @@ def expect_value(value, row) expect(page).to have_css("#{row_selector(row)} .units", text: value) end - def edit_time_entry(new_value, row) + def expect_cell_text(value, row, column) + expect(page).to have_css(cell_selector(row, column), text: value) + end + + def expect_sort_header_column(text, present: true) + if present + expect(page).to have_css("#result-table .generic-table--sort-header", text:) + else + expect(page).to have_no_css("#result-table .generic-table--sort-header", text:) + end + end + + def edit_time_entry(row, hours:) SeleniumHubWaiter.wait page.find("#{row_selector(row)} .icon-edit").click time_logging_modal.is_visible true - time_logging_modal.update_field "hours", new_value - time_logging_modal.work_package_is_missing false + time_logging_modal.change_hours(hours) + time_logging_modal.activity_input_disabled_because_work_package_missing? false - time_logging_modal.perform_action "Save" - SeleniumHubWaiter.wait + time_logging_modal.submit + + if using_cuprite? + wait_for_reload + else + sleep 1 + end expect_action_icon "edit", row - expect_value new_value, row + expect_value l_hours(hours), row end def edit_cost_entry(new_value, row, cost_entry_id) SeleniumHubWaiter.wait page.find("#{row_selector(row)} .icon-edit").click - expect(page).to have_current_path("/cost_entries/" + cost_entry_id + "/edit") + expect(page).to have_current_path("/cost_entries/#{cost_entry_id}/edit") SeleniumHubWaiter.wait fill_in("cost_entry_units", with: new_value) @@ -86,9 +106,13 @@ def edit_cost_entry(new_value, row, cost_entry_id) def delete_entry(row) SeleniumHubWaiter.wait - page.find("#{row_selector(row)} .icon-delete").click - page.driver.browser.switch_to.alert.accept + if using_cuprite? + accept_confirm { page.find("#{row_selector(row)} .icon-delete").click } + else + page.find("#{row_selector(row)} .icon-delete").click + page.driver.browser.switch_to.alert.accept + end end private @@ -96,5 +120,9 @@ def delete_entry(row) def row_selector(row) "#result-table tbody tr:nth-of-type(#{row})" end + + def cell_selector(row, column) + "#{row_selector(row)} td:nth-of-type(#{column})" + end end end diff --git a/modules/reporting/spec/features/time_entries_spec.rb b/modules/reporting/spec/features/time_entries_spec.rb new file mode 100644 index 000000000000..d7867e33d448 --- /dev/null +++ b/modules/reporting/spec/features/time_entries_spec.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +require "spec_helper" +require_relative "support/pages/cost_report_page" +require_relative "support/components/cost_reports_base_table" + +RSpec.describe "Cost report showing time entries with start & end times", :js, + with_flag: { track_start_and_end_times_for_time_entries: true } do + shared_let(:project) { create(:project) } + shared_let(:user) { create(:admin) } + shared_let(:work_package) { create(:work_package, project:) } + shared_let(:time_entry) do + create :time_entry, user:, work_package:, project:, + start_time: 1 * 60, + spent_on: 1.day.ago, + hours: 1.25, + time_zone: "UTC" + end + shared_let(:time_entry_long) do + create :time_entry, user:, work_package:, project:, + start_time: 1 * 60, + hours: 28.0, + time_zone: "UTC" + end + let(:report_page) { Pages::CostReportPage.new project } + let(:table) { Components::CostReportsBaseTable.new } + + before do + login_as(user) + report_page.visit! + report_page.clear + report_page.apply + end + + context "with allow_tracking_start_and_end_times", with_settings: { allow_tracking_start_and_end_times: true } do + it "shows the time column" do + table.expect_sort_header_column("TIME", present: true) + table.rows_count 2 + + table.expect_value("1.25 hours", 1) + table.expect_cell_text("01:00 AM - 02:15 AM", 1, 2) + + table.expect_value("28.00 hours", 2) + table.expect_cell_text("01:00 AM - 05:00 AM (+1d)", 2, 2) + end + end + + context "without allow_tracking_start_and_end_times", with_settings: { allow_tracking_start_and_end_times: false } do + it "does not show the time column" do + table.expect_sort_header_column("TIME", present: false) + table.rows_count 2 + end + end +end diff --git a/modules/reporting/spec/features/update_cost_report_spec.rb b/modules/reporting/spec/features/update_cost_report_spec.rb index 1c0d960d5982..0ffbdd669cc0 100644 --- a/modules/reporting/spec/features/update_cost_report_spec.rb +++ b/modules/reporting/spec/features/update_cost_report_spec.rb @@ -29,7 +29,7 @@ require File.expand_path(File.dirname(__FILE__) + "/../spec_helper.rb") require_relative "support/pages/cost_report_page" -RSpec.describe "updating a cost report's cost type", :js do +RSpec.describe "updating a cost report's cost type", :js, :selenium do let(:project) { create(:project_with_types, members: { user => create(:project_role) }) } let(:user) do create(:admin) diff --git a/modules/reporting/spec/features/update_entries_spec.rb b/modules/reporting/spec/features/update_entries_spec.rb index cc5eac314a9c..ceb318a6efa5 100644 --- a/modules/reporting/spec/features/update_entries_spec.rb +++ b/modules/reporting/spec/features/update_entries_spec.rb @@ -75,7 +75,7 @@ table.expect_action_icon "edit", 1 table.expect_action_icon "delete", 1 - table.edit_time_entry 2, 1 + table.edit_time_entry 1, hours: 2 table.delete_entry 1 table.rows_count 0 diff --git a/modules/reporting/spec/models/cost_query/filter_spec.rb b/modules/reporting/spec/models/cost_query/filter_spec.rb index c31794ea5781..c1a1ef3f31e1 100644 --- a/modules/reporting/spec/models/cost_query/filter_spec.rb +++ b/modules/reporting/spec/models/cost_query/filter_spec.rb @@ -101,7 +101,7 @@ def create_work_package_with_time_entry(work_package_params = {}, entry_params = activity:) end - it "onlies return entries from the given #{filter}" do + it "only return entries from the given #{filter}" do query.filter field, value: object.id query.result.each do |result| expect(result[field].to_s).to eq(object.id.to_s) @@ -156,7 +156,7 @@ def create_work_package_with_time_entry(work_package_params = {}, entry_params = activity:) end - it "onlies return entries from the given CostQuery::Filter::AuthorId" do + it "only return entries from the given CostQuery::Filter::AuthorId" do query.filter "author_id", value: author.id query.result.each do |result| work_package_id = result["work_package_id"] @@ -312,7 +312,7 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ CostQuery::Filter::PriorityId, CostQuery::Filter::TypeId ].each do |filter| - it "onlies allow default operators for #{filter}" do + it "only allow default operators for #{filter}" do expect(filter.new.available_operators.uniq.sort).to eq(CostQuery::Operator.default_operators.uniq.sort) end end @@ -323,7 +323,7 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ CostQuery::Filter::CategoryId, CostQuery::Filter::VersionId ].each do |filter| - it "onlies allow default+null operators for #{filter}" do + it "only allow default+null operators for #{filter}" do expect(filter.new.available_operators.uniq.sort).to eq((CostQuery::Operator.default_operators + CostQuery::Operator.null_operators).sort) end end @@ -332,8 +332,13 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ [ CostQuery::Filter::WorkPackageId ].each do |filter| - it "onlies allow default operators for #{filter}" do - expect(filter.new.available_operators.uniq).to contain_exactly(CostQuery::Operator.default_operator) + it "allows custom filters#{filter}" do + expect(filter.new.available_operators.uniq).to contain_exactly( + Report::Operator.new("!"), + CostQuery::Operator.new("!_child_work_packages"), + Report::Operator.new("="), + CostQuery::Operator.new("=_child_work_packages") + ) end end @@ -345,7 +350,7 @@ def create_matching_object_with_time_entries(factory, work_package_field, entry_ CostQuery::Filter::StartDate, CostQuery::Filter::DueDate ].each do |filter| - it "onlies allow time operators for #{filter}" do + it "only allow time operators for #{filter}" do expect(filter.new.available_operators.uniq.sort).to eq(CostQuery::Operator.time_operators.sort) end end diff --git a/modules/reporting/spec/models/cost_query/operator_spec.rb b/modules/reporting/spec/models/cost_query/operator_spec.rb index 5e00339452dc..3d440f969889 100644 --- a/modules/reporting/spec/models/cost_query/operator_spec.rb +++ b/modules/reporting/spec/models/cost_query/operator_spec.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) the OpenProject GmbH @@ -28,171 +30,177 @@ require File.expand_path("#{File.dirname(__FILE__)}/../../spec_helper") -RSpec.describe CostQuery, :reporting_query_helper do +RSpec.describe CostQuery::Operator, :reporting_query_helper do minimal_query let!(:project1) { create(:project, name: "project1", created_at: 5.minutes.ago) } let!(:project2) { create(:project, name: "project2", created_at: 6.minutes.ago) } - describe CostQuery::Operator do - def cost_query(table, field, operator, *values) - sql = CostQuery::SqlStatement.new table - yield sql if block_given? - operator.to_operator.modify sql, field, *values - ActiveRecord::Base.connection.select_all(sql.to_s).to_a - end + let(:admin) { create(:admin) } - def query_on_entries(field, operator, *values) - sql = CostQuery::SqlStatement.for_entries - operator.to_operator.modify sql, field, *values - ActiveRecord::Base.connection.select_all(sql.to_s).to_a - end + before do + allow(User).to receive(:current).and_return(admin) + end - def create_project(options = {}) - create(:project, options) - end + def cost_query(table, field, operator, *values) + sql = CostQuery::SqlStatement.new table + yield sql if block_given? + operator.to_operator.modify sql, field, *values + ActiveRecord::Base.connection.select_all(sql.to_s).to_a + end - it "does =" do - expect(cost_query("projects", "id", "=", project1.id).size).to eq(1) - end + def query_on_entries(field, operator, *values) + sql = CostQuery::SqlStatement.for_entries + operator.to_operator.modify sql, field, *values + ActiveRecord::Base.connection.select_all(sql.to_s).to_a + end - it "does = for multiple values" do - expect(cost_query("projects", "id", "=", project1.id, project2.id).size).to eq(2) - end + def create_project(options = {}) + create(:project, options) + end - it "does = for no values" do - sql = CostQuery::SqlStatement.new "projects" - "=".to_operator.modify sql, "id" - result = (ActiveRecord::Base.connection.select_all sql.to_s) - expect(result).to be_empty - end + it "does =" do + expect(cost_query("projects", "id", "=", project1.id).size).to eq(1) + end - it "does = for nil" do - expect(cost_query("projects", "id", "=", nil).size).to eq(0) - end + it "does = for multiple values" do + expect(cost_query("projects", "id", "=", project1.id, project2.id).size).to eq(2) + end - it "does = for empty string" do - expect(cost_query("projects", "id", "=", "").size).to eq(0) - end + it "does = for no values" do + sql = CostQuery::SqlStatement.new "projects" + "=".to_operator.modify sql, "id" + result = (ActiveRecord::Base.connection.select_all sql.to_s) + expect(result).to be_empty + end - it "does <=" do - expect(cost_query("projects", "id", "<=", project2.id - 1).size).to eq(1) - end + it "does = for nil" do + expect(cost_query("projects", "id", "=", nil).size).to eq(0) + end - it "does >=" do - expect(cost_query("projects", "id", ">=", project1.id + 1).size).to eq(1) - end + it "does = for empty string" do + expect(cost_query("projects", "id", "=", "").size).to eq(0) + end - it "does !" do - expect(cost_query("projects", "id", "!", project1.id).size).to eq(1) - end + it "does <=" do + expect(cost_query("projects", "id", "<=", project2.id - 1).size).to eq(1) + end - it "does ! for empty string" do - expect(cost_query("projects", "id", "!", "").size).to eq(0) - end + it "does >=" do + expect(cost_query("projects", "id", ">=", project1.id + 1).size).to eq(1) + end - it "does ! for multiple values" do - expect(cost_query("projects", "id", "!", project1.id, project2.id).size).to eq(0) - end + it "does !" do + expect(cost_query("projects", "id", "!", project1.id).size).to eq(1) + end - it "does !*" do - expect(cost_query("cost_entries", "project_id", "!*", []).size).to eq(0) - end + it "does ! for empty string" do + expect(cost_query("projects", "id", "!", "").size).to eq(0) + end - it "does ~ (contains)" do - expect(cost_query("projects", "name", "~", "o").size).to eq(Project.all.count { |p| p.name.include?("o") }) - expect(cost_query("projects", "name", "~", "test").size).to eq(Project.all.count { |p| p.name.include?("test") }) - expect(cost_query("projects", "name", "~", "child").size).to eq(Project.all.count { |p| p.name.include?("child") }) - end + it "does ! for multiple values" do + expect(cost_query("projects", "id", "!", project1.id, project2.id).size).to eq(0) + end - it "does !~ (not contains)" do - expect(cost_query("projects", "name", "!~", "o").size).to eq(Project.all.count { |p| p.name.exclude?("o") }) - expect(cost_query("projects", "name", "!~", "test").size).to eq(Project.all.count { |p| p.name.exclude?("test") }) - expect(cost_query("projects", "name", "!~", "child").size).to eq(Project.all.count { |p| p.name.exclude?("child") }) - end + it "does !*" do + expect(cost_query("cost_entries", "project_id", "!*", []).size).to eq(0) + end - it "does c (closed work_package)" do - expect(cost_query("work_packages", "status_id", "c") { |s| s.join Status => [WorkPackage, :status] }.size).to be >= 0 - end + it "does ~ (contains)" do + expect(cost_query("projects", "name", "~", "o").size).to eq(Project.all.count { |p| p.name.include?("o") }) + expect(cost_query("projects", "name", "~", "test").size).to eq(Project.all.count { |p| p.name.include?("test") }) + expect(cost_query("projects", "name", "~", "child").size).to eq(Project.all.count { |p| p.name.include?("child") }) + end - it "does o (open work_package)" do - expect(cost_query("work_packages", "status_id", "o") { |s| s.join Status => [WorkPackage, :status] }.size).to be >= 0 - end + it "does !~ (not contains)" do + expect(cost_query("projects", "name", "!~", "o").size).to eq(Project.all.count { |p| p.name.exclude?("o") }) + expect(cost_query("projects", "name", "!~", "test").size).to eq(Project.all.count { |p| p.name.exclude?("test") }) + expect(cost_query("projects", "name", "!~", "child").size).to eq(Project.all.count { |p| p.name.exclude?("child") }) + end - it "does give the correct number of results when counting closed and open work_packages" do - a = cost_query("work_packages", "status_id", "o") { |s| s.join Status => [WorkPackage, :status] }.size - b = cost_query("work_packages", "status_id", "c") { |s| s.join Status => [WorkPackage, :status] }.size - expect(WorkPackage.count).to eq(a + b) - end + it "does c (closed work_package)" do + expect(cost_query("work_packages", "status_id", "c") { |s| s.join Status => [WorkPackage, :status] }.size).to be >= 0 + end - it "does w (this week)" do - # somehow this test doesn't work on sundays - n = cost_query("projects", "created_at", "w").size - day_in_this_week = Time.zone.now.at_beginning_of_week + 1.day - create(:project, created_at: day_in_this_week) - expect(cost_query("projects", "created_at", "w").size).to eq(n + 1) - create(:project, created_at: day_in_this_week + 7.days) - create(:project, created_at: day_in_this_week - 7.days) - expect(cost_query("projects", "created_at", "w").size).to eq(n + 1) - end + it "does o (open work_package)" do + expect(cost_query("work_packages", "status_id", "o") { |s| s.join Status => [WorkPackage, :status] }.size).to be >= 0 + end - it "does t (today)" do - s = cost_query("projects", "created_at", "t").size - create(:project, created_at: Date.yesterday) - expect(cost_query("projects", "created_at", "t").size).to eq(s) - create(:project, created_at: Time.zone.now) - expect(cost_query("projects", "created_at", "t").size).to eq(s + 1) - end + it "does give the correct number of results when counting closed and open work_packages" do + a = cost_query("work_packages", "status_id", "o") { |s| s.join Status => [WorkPackage, :status] }.size + b = cost_query("work_packages", "status_id", "c") { |s| s.join Status => [WorkPackage, :status] }.size + expect(WorkPackage.count).to eq(a + b) + end - it "does t+ (after the day which is n days in the future)" do - n = cost_query("projects", "created_at", ">t+", 1).size - create(:project, created_at: Time.zone.now) - expect(cost_query("projects", "created_at", ">t+", 1).size).to eq(n) - create(:project, created_at: Date.tomorrow + 1) - expect(cost_query("projects", "created_at", ">t+", 1).size).to eq(n + 1) - end + it "does t- (after the day which is n days ago)" do - n = cost_query("projects", "created_at", ">t-", 1).size - create(:project, created_at: Date.today) - expect(cost_query("projects", "created_at", ">t-", 1).size).to eq(n + 1) - create(:project, created_at: Date.yesterday - 1) - expect(cost_query("projects", "created_at", ">t-", 1).size).to eq(n + 1) - end + it "does t+ (n days in the future)" do + n = cost_query("projects", "created_at", "t+", 1).size + create(:project, created_at: Date.tomorrow) + expect(cost_query("projects", "created_at", "t+", 1).size).to eq(n + 1) + create(:project, created_at: Date.tomorrow + 2) + expect(cost_query("projects", "created_at", "t+", 1).size).to eq(n + 1) + end - it "does t- (n days ago)" do - n = cost_query("projects", "created_at", "t-", 1).size - create(:project, created_at: Date.yesterday) - expect(cost_query("projects", "created_at", "t-", 1).size).to eq(n + 1) - create(:project, created_at: Date.yesterday - 2) - expect(cost_query("projects", "created_at", "t-", 1).size).to eq(n + 1) - end + it "does >t+ (after the day which is n days in the future)" do + n = cost_query("projects", "created_at", ">t+", 1).size + create(:project, created_at: Time.zone.now) + expect(cost_query("projects", "created_at", ">t+", 1).size).to eq(n) + create(:project, created_at: Date.tomorrow + 1) + expect(cost_query("projects", "created_at", ">t+", 1).size).to eq(n + 1) + end - it "does t- (after the day which is n days ago)" do + n = cost_query("projects", "created_at", ">t-", 1).size + create(:project, created_at: Time.zone.today) + expect(cost_query("projects", "created_at", ">t-", 1).size).to eq(n + 1) + create(:project, created_at: Date.yesterday - 1) + expect(cost_query("projects", "created_at", ">t-", 1).size).to eq(n + 1) + end + + it "does t- (n days ago)" do + n = cost_query("projects", "created_at", "t-", 1).size + create(:project, created_at: Date.yesterday) + expect(cost_query("projects", "created_at", "t-", 1).size).to eq(n + 1) + create(:project, created_at: Date.yesterday - 2) + expect(cost_query("projects", "created_at", "t-", 1).size).to eq(n + 1) + end + + it "does d" do - expect(cost_query("projects", "created_at", "<>d", Time.zone.now, 5.minutes.from_now).size).to eq(0) - end + it "does =d" do + # assuming that there aren't more than one project created at the same time + expect(cost_query("projects", "created_at", "=d", Project.order(Arel.sql("id ASC")).first.created_at).size).to eq(1) + end - it "does >d" do - # assuming that all projects were created in the past - expect(cost_query("projects", "created_at", ">d", Time.zone.now).size).to eq(0) - end + it "does d" do + expect(cost_query("projects", "created_at", "<>d", Time.zone.now, 5.minutes.from_now).size).to eq(0) + end + + it "does >d" do + # assuming that all projects were created in the past + expect(cost_query("projects", "created_at", ">d", Time.zone.now).size).to eq(0) + end - describe "arity" do - arities = { "t" => 0, "w" => 0, "<>d" => 2, ">d" => 1 } - arities.each do |o, a| - it("#{o} should take #{a} values") { expect(o.to_operator.arity).to eq(a) } - end + describe "arity" do + arities = { "t" => 0, "w" => 0, "<>d" => 2, ">d" => 1 } + arities.each do |o, a| + it("#{o} should take #{a} values") { expect(o.to_operator.arity).to eq(a) } end end end diff --git a/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb b/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb index 094739b435d0..3b0a6ed3e7ad 100644 --- a/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb +++ b/modules/reporting/spec/workers/cost_query/pdf/timesheet_generator_spec.rb @@ -100,7 +100,7 @@ def expected_cover_page user.name, export_time_formatted].compact end - def expected_first_page_content + def expected_starting_content [query.name] end @@ -118,6 +118,11 @@ def expected_page_footer(page_number) [page_number, export_date_formatted, query.name] end + def expected_sum_row(row_user, _with_times_column) + sum = time_entries.filter { |t_entry| t_entry.user == row_user }.sum(&:hours) + [generator.format_hours(sum)] + end + def expected_entry_row(t_entry, with_times_column) [format_date(t_entry.spent_on)].concat(expected_entry_columns(t_entry, with_times_column)) end @@ -133,15 +138,27 @@ def expected_entry_columns(t_entry, with_times_column) ].compact end - def expected_document(with_times_column) - [ - *expected_cover_page, - *expected_first_page_content, + def expected_overview_page_content + result = [query.name, + TimeEntry.human_attribute_name(:user), I18n.t("export.timesheet.sum_hours")] + time_entries.group_by(&:user).each do |user, entries| + result << user.name + result << generator.format_hours(entries.sum(&:hours)) + end + result << generator.format_hours(time_entries.sum(&:hours)) + end + def expected_first_user_table(with_times_column) + [ user.name, *expected_table_header(with_times_column), *expected_entry_row(user_time_entry, with_times_column), + *expected_sum_row(user, with_times_column) + ] + end + def expected_second_user_table(with_times_column) + [ time_entry.user.name, *expected_table_header(with_times_column), format_date(time_entry.spent_on), # merged date rows @@ -149,8 +166,21 @@ def expected_document(with_times_column) *expected_entry_columns(other_time_entry, with_times_column), *expected_entry_row(time_entry_with_comment, with_times_column), *expected_entry_row(time_entry_without_time, with_times_column), + *expected_sum_row(time_entry.user, with_times_column) + ] + end + + def expected_document(with_times_column) + [ + *expected_cover_page, + + *expected_overview_page_content, + *expected_page_footer("2/3"), - *expected_page_footer("2/2") + *expected_starting_content, + *expected_first_user_table(with_times_column), + *expected_second_user_table(with_times_column), + *expected_page_footer("3/3") ].join(" ") end diff --git a/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb b/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb index baf796521fa0..fd37bafa49ce 100644 --- a/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb +++ b/modules/storages/app/components/storages/open_project_storage_modal_component.html.erb @@ -4,7 +4,7 @@ data:) ) do |dialog| %> <% dialog.with_header(display: :none) %> - <% dialog.with_body(id: self.class.dialog_body_id, p: 2) do %> + <% dialog.with_body(id: self.class.dialog_body_id) do %> <%= render(self.class::Body.new(@state)) %> <% end %> <% dialog.with_footer do %> diff --git a/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb b/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb index 43231f3549f6..4acfff76650e 100644 --- a/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb +++ b/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.html.erb @@ -28,54 +28,25 @@ See COPYRIGHT and LICENSE files for more details. ++#%> <%= - component_wrapper do - primer_form_with( - model: @project_storage, - url: admin_settings_storage_project_storage_path(id: @project_storage, page: current_page), - data: { - turbo: true, - controller: 'disable-when-checked', - 'disable-when-checked-reversed-value': true - }, - method: :delete - ) do |form| - render(Primer::OpenProject::FeedbackDialog.new( - id: id, - title: nil, - test_selector: id, - size: :large - )) do |dialog| - dialog.with_feedback_message(icon_arguments: { icon: :alert, color: :danger }) do |message| - message.with_heading(tag: :h2) { heading } - message.with_description { text } - end - - dialog.with_additional_details do - render(Primer::Alpha::CheckBox.new( - name: "confirm_delete", - label: confirmation_text, - data: { 'disable-when-checked-target': 'cause' } - )) - end - - dialog.with_footer do - component_collection do |footer| - footer.with_component(Primer::ButtonComponent.new(data: { "close-dialog-id": id })) do - I18n.t("button_close") - end - - footer.with_component( - Primer::ButtonComponent.new(scheme: :danger, type: :submit, - test_selector: "remove-project-storage-button", - disabled: true, - data: { - "disable-when-checked-target": "effect", - "close-dialog-id": id - }) - ) { I18n.t("button_remove") } - end - end - end + render(Primer::OpenProject::DangerDialog.new( + id:, + title:, + test_selector: id, + size: :large, + form_arguments: { + model: @project_storage, + action: admin_settings_storage_project_storage_path(id: @project_storage, page: current_page), + data: { + turbo: true + }, + method: :delete + }, + confirm_button_text: I18n.t("button_remove") + )) do |dialog| + dialog.with_confirmation_message do |message| + message.with_heading(tag: :h2) { heading } + message.with_description_content(text) end + dialog.with_confirmation_check_box_content(confirmation_text) end %> diff --git a/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.rb b/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.rb index ecd4b986e0d4..599274885244 100644 --- a/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.rb +++ b/modules/storages/app/components/storages/project_storages/destroy_confirmation_dialog_component.rb @@ -44,6 +44,10 @@ def id "project-storage-#{@project_storage.id}-destroy-confirmation-dialog" end + def title + I18n.t("project_storages.remove_project.dialog.title") + end + def heading I18n.t("project_storages.remove_project.dialog.heading_text", storage: @storage.name) end diff --git a/modules/storages/app/contracts/storages/storages/nextcloud_contract.rb b/modules/storages/app/contracts/storages/storages/nextcloud_contract.rb index 7f718f7e9d5e..d9d218132dd0 100644 --- a/modules/storages/app/contracts/storages/storages/nextcloud_contract.rb +++ b/modules/storages/app/contracts/storages/storages/nextcloud_contract.rb @@ -36,6 +36,12 @@ class NextcloudContract < ::ModelContract # But only do so if the validations above for URL were successful. validates :host, secure_context_uri: true, nextcloud_compatible_host: true, unless: -> { errors.include?(:host) } + attribute :authentication_method + validates :authentication_method, presence: true, inclusion: { in: ::Storages::NextcloudStorage::AUTHENTICATION_METHODS } + + attribute :nextcloud_audience + validates :nextcloud_audience, presence: true, if: :nextcloud_storage_authenticate_via_idp? + attribute :automatically_managed attribute :username @@ -68,6 +74,10 @@ def nextcloud_default_storage_username? @model.username == @model.provider_fields_defaults[:username] end + def nextcloud_storage_authenticate_via_idp? + nextcloud_storage? && @model.authenticate_via_idp? + end + def nextcloud_storage? @model.is_a?(Storages::NextcloudStorage) end diff --git a/modules/storages/app/controllers/storages/admin/storages/project_storages_controller.rb b/modules/storages/app/controllers/storages/admin/storages/project_storages_controller.rb index 6db8c13ab714..14b117b3d804 100644 --- a/modules/storages/app/controllers/storages/admin/storages/project_storages_controller.rb +++ b/modules/storages/app/controllers/storages/admin/storages/project_storages_controller.rb @@ -79,7 +79,7 @@ def create # rubocop:disable Metrics/AbcSize create_service.on_success { update_project_list_via_turbo_stream(url_for_action: :index) } create_service.on_failure do - project_storage = create_service.result + project_storage = create_service.result.first project_storage.errors.merge!(create_service.errors) component = Storages::Admin::Storages::ProjectsStorageFormModalComponent.new(project_storage:) update_via_turbo_stream(component:, status: :bad_request) @@ -128,9 +128,7 @@ def destroy .call delete_service.on_success do - update_flash_message_via_turbo_stream( - message: I18n.t(:notice_successful_delete), scheme: :success - ) + render_success_flash_message_via_turbo_stream(message: I18n.t(:notice_successful_delete)) update_project_list_via_turbo_stream(url_for_action: :index) end diff --git a/modules/storages/app/models/storages/nextcloud_storage.rb b/modules/storages/app/models/storages/nextcloud_storage.rb index 29feae123673..51ddfb1f1f51 100644 --- a/modules/storages/app/models/storages/nextcloud_storage.rb +++ b/modules/storages/app/models/storages/nextcloud_storage.rb @@ -35,11 +35,15 @@ class NextcloudStorage < Storage username: "OpenProject" }.freeze + AUTHENTICATION_METHODS = %w[two_way_oauth2 oauth2_sso].freeze + store_attribute :provider_fields, :automatically_managed, :boolean store_attribute :provider_fields, :username, :string store_attribute :provider_fields, :password, :string store_attribute :provider_fields, :group, :string store_attribute :provider_fields, :group_folder, :string + store_attribute :provider_fields, :authentication_method, :string, default: "two_way_oauth2" + store_attribute :provider_fields, :nextcloud_audience, :string def oauth_configuration Peripherals::OAuthConfigurations::NextcloudConfiguration.new(self) @@ -62,6 +66,10 @@ def available_project_folder_modes end end + def authenticate_via_idp? + authentication_method == "oauth2_sso" + end + def configuration_checks { storage_oauth_client_configured: oauth_client.present?, diff --git a/modules/storages/app/services/storages/last_project_folders/bulk_create_service.rb b/modules/storages/app/services/storages/last_project_folders/bulk_create_service.rb index bd3ea5a26b06..2bb7a027114c 100644 --- a/modules/storages/app/services/storages/last_project_folders/bulk_create_service.rb +++ b/modules/storages/app/services/storages/last_project_folders/bulk_create_service.rb @@ -29,82 +29,25 @@ #++ module Storages::LastProjectFolders - class BulkCreateService < ::BaseServices::BaseCallable + class BulkCreateService < ::BulkServices::ProjectMappings::BaseCreateService + attr_reader :something + def initialize(user:, project_storages:) - super() - @user = user - @project_storages = project_storages + super(user:, mapping_context: ProjectStoragesMappingContext.new(project_storages)) end - def perform - service_call = validate_permissions - service_call = validate_contract(service_call) if service_call.success? - service_call = perform_bulk_create(service_call) if service_call.success? - - service_call - end + def permission = :manage_files_in_project private - def validate_permissions - return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty? - - if @user.allowed_in_project?(:manage_files_in_project, incoming_projects) - ServiceResult.success - else - ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized")) - end - end - - def validate_contract(service_call) - set_attributes_results = @project_storages.map do |project_storage| - set_attributes(project_storage_id: project_storage.id, origin_folder_id: project_storage.project_folder_id, - mode: project_storage.project_folder_mode) - end - - if (failures = set_attributes_results.select(&:failure?)).any? - service_call.success = false - service_call.errors = failures.map(&:errors) - else - service_call.result = set_attributes_results.map(&:result) - end - - service_call - end - def perform_bulk_create(service_call) - bulk_insertion = ::Storages::LastProjectFolder.insert_all( - service_call.result.map { |model| model.attributes.slice("project_storage_id", "origin_folder_id", "mode") }, + bulk_insertion = mapping_model_class.insert_all( + service_call.result.map { |model| model.attributes.compact }, returning: %w[id] ) - service_call.result = ::Storages::LastProjectFolder.where(id: bulk_insertion.rows.flatten) + service_call.result = mapping_model_class.where(id: bulk_insertion.rows.flatten) service_call end - - def incoming_projects - @incoming_projects ||= Project.where(id: @project_storages.pluck(:project_id)) - end - - def set_attributes(params) - attributes_service_class - .new(user: @user, - model: instance(params), - contract_class: default_contract_class, - contract_options: {}) - .call(params) - end - - def instance(params) - ::Storages::LastProjectFolder.new(params) - end - - def attributes_service_class - Storages::LastProjectFolders::SetAttributesService - end - - def default_contract_class - Storages::LastProjectFolders::CreateContract - end end end diff --git a/modules/storages/app/services/storages/last_project_folders/project_storages_mapping_context.rb b/modules/storages/app/services/storages/last_project_folders/project_storages_mapping_context.rb new file mode 100644 index 000000000000..74f9f5768430 --- /dev/null +++ b/modules/storages/app/services/storages/last_project_folders/project_storages_mapping_context.rb @@ -0,0 +1,56 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Storages + module LastProjectFolders + class ProjectStoragesMappingContext < BulkServices::ProjectMappings::MappingContextBase + attr_reader :project_storages + + def initialize(project_storages) + super(mapping_model_class: ::Storages::LastProjectFolder) + @project_storages = project_storages + end + + def mapping_attributes_for_all_projects(_params) + project_storages.map do |project_storage| + { + project_storage_id: project_storage.id, + origin_folder_id: project_storage.project_folder_id, + mode: project_storage.project_folder_mode + } + end + end + + def incoming_projects + @incoming_projects ||= Project.where(id: project_storages.pluck(:project_id)) + end + end + end +end diff --git a/modules/storages/app/services/storages/project_storages/bulk_create_service.rb b/modules/storages/app/services/storages/project_storages/bulk_create_service.rb index 23ab331e4d7e..e2f566a528a0 100644 --- a/modules/storages/app/services/storages/project_storages/bulk_create_service.rb +++ b/modules/storages/app/services/storages/project_storages/bulk_create_service.rb @@ -29,19 +29,22 @@ #++ module Storages::ProjectStorages - class BulkCreateService < ::BaseServices::BaseCallable + class BulkCreateService < ::BulkServices::ProjectMappings::BaseCreateService + attr_reader :storage + def initialize(user:, projects:, storage:, include_sub_projects: false) - super() - @user = user - @projects = projects + mapping_context = ::BulkServices::ProjectMappings::MappingContext.new( + mapping_model_class: ::Storages::ProjectStorage, + model: storage, + projects:, + model_foreign_key_id:, + include_sub_projects: + ) + super(user:, mapping_context:) @storage = storage - @include_sub_projects = include_sub_projects end - def perform(params = {}) - service_call = validate_permissions - service_call = validate_contract(service_call, incoming_activations_ids, params) if service_call.success? - service_call = perform_bulk_create(service_call) if service_call.success? + def after_perform(service_call, params) service_call = create_last_project_folders(service_call, params) if service_call.success? broadcast_project_storages_created(params) if service_call.success? @@ -50,30 +53,22 @@ def perform(params = {}) private - def validate_permissions - return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty? - - if @user.allowed_in_project?(:manage_files_in_project, incoming_projects) - ServiceResult.success - else - ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized")) - end - end + def permission = :manage_files_in_project + def model_foreign_key_id = :storage_id + def default_contract_class = ::Storages::ProjectStorages::CreateContract - def validate_contract(service_call, project_ids, params) - project_folder_params = params.slice(:project_folder_mode, :project_folder_id) + def validate_contract(service_call, params) + super_service_call = super - set_attributes_results = project_ids.map do |id| - set_attributes(project_id: id, storage_id: @storage.id, **project_folder_params) + super_service_call.on_failure do + super_service_call.errors = super_service_call.errors.first end - if (failures = set_attributes_results.select(&:failure?)).any? - service_call = failures.first - else - service_call.result = set_attributes_results.map(&:result) - end + super_service_call + end - service_call + def attributes_from_params(params) + params.slice(:project_folder_mode, :project_folder_id) end def perform_bulk_create(service_call) @@ -103,49 +98,8 @@ def broadcast_project_storages_created(params) event: :created, project_folder_mode: params[:project_folder_mode], project_folder_mode_previously_was: nil, - storage: @storage + storage: ) end - - def incoming_activations_ids - project_ids = incoming_projects.pluck(:id) - project_ids - existing_project_storages(project_ids) - end - - def incoming_projects - @projects.each_with_object(Set.new) do |project, projects_set| - next unless project.active? - - projects_set << project - projects_set.merge(project.active_subprojects.to_a) if @include_sub_projects - end.to_a - end - - def existing_project_storages(project_ids) - ::Storages::ProjectStorage - .where(storage_id: @storage.id, project_id: project_ids) - .pluck(:project_id) - end - - def set_attributes(params) - attributes_service_class - .new(user: @user, - model: instance(params), - contract_class: default_contract_class, - contract_options: {}) - .call(params) - end - - def instance(params) - ::Storages::ProjectStorage.new(params) - end - - def attributes_service_class - ::Storages::ProjectStorages::SetAttributesService - end - - def default_contract_class - ::Storages::ProjectStorages::CreateContract - end end end diff --git a/modules/storages/config/locales/crowdin/af.yml b/modules/storages/config/locales/crowdin/af.yml index 3e470c92b8bd..1bb69e9fbf8d 100644 --- a/modules/storages/config/locales/crowdin/af.yml +++ b/modules/storages/config/locales/crowdin/af.yml @@ -3,6 +3,8 @@ af: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ af: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/ar.yml b/modules/storages/config/locales/crowdin/ar.yml index 1757d6f83df3..f6b97af82e62 100644 --- a/modules/storages/config/locales/crowdin/ar.yml +++ b/modules/storages/config/locales/crowdin/ar.yml @@ -3,6 +3,8 @@ ar: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ ar: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/az.yml b/modules/storages/config/locales/crowdin/az.yml index 476a8be4e8e2..52a3b00a9764 100644 --- a/modules/storages/config/locales/crowdin/az.yml +++ b/modules/storages/config/locales/crowdin/az.yml @@ -3,6 +3,8 @@ az: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ az: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/be.yml b/modules/storages/config/locales/crowdin/be.yml index 6ffec4520eb5..f27fa94d2faa 100644 --- a/modules/storages/config/locales/crowdin/be.yml +++ b/modules/storages/config/locales/crowdin/be.yml @@ -3,6 +3,8 @@ be: attributes: storages/file_link: origin_id: Origin id + storages/project_storage: + storage: Storage storages/storage: creator: Стваральнік drive: Drive ID @@ -72,6 +74,7 @@ be: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/bg.yml b/modules/storages/config/locales/crowdin/bg.yml index 2e9b6e9665a3..19513fcbf80d 100644 --- a/modules/storages/config/locales/crowdin/bg.yml +++ b/modules/storages/config/locales/crowdin/bg.yml @@ -3,6 +3,8 @@ bg: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Създател drive: Drive ID @@ -72,6 +74,7 @@ bg: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/ca.yml b/modules/storages/config/locales/crowdin/ca.yml index 793b084facd6..e106e53edead 100644 --- a/modules/storages/config/locales/crowdin/ca.yml +++ b/modules/storages/config/locales/crowdin/ca.yml @@ -3,6 +3,8 @@ ca: attributes: storages/file_link: origin_id: ID d'origen + storages/project_storage: + storage: Storage storages/storage: creator: Autor drive: Drive ID @@ -72,6 +74,7 @@ ca: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/ckb-IR.yml b/modules/storages/config/locales/crowdin/ckb-IR.yml index dc142b1d361e..370364e3bd77 100644 --- a/modules/storages/config/locales/crowdin/ckb-IR.yml +++ b/modules/storages/config/locales/crowdin/ckb-IR.yml @@ -3,6 +3,8 @@ ckb-IR: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ ckb-IR: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/cs.yml b/modules/storages/config/locales/crowdin/cs.yml index d23f6f04da87..822a7905ead0 100644 --- a/modules/storages/config/locales/crowdin/cs.yml +++ b/modules/storages/config/locales/crowdin/cs.yml @@ -3,6 +3,8 @@ cs: attributes: storages/file_link: origin_id: Origin ID + storages/project_storage: + storage: Úložiště storages/storage: creator: Autor drive: ID disku @@ -72,6 +74,7 @@ cs: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Odstranit projekt z %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Odstranit projekt services: attributes: @@ -129,7 +132,7 @@ cs: insufficient_privileges: OpenProject does not have enough privileges to add %{user} to %{group}. Check you group settings in Nextcloud. not_allowed: Nextcloud blokuje požadavek. unauthorized: OpenProject nelze synchronizovat s Nextcloudem. Zkontrolujte prosím konfiguraci úložiště a Nextcloudu. - user_does_not_exist: "%{user} does not exist in Nextcloud." + user_does_not_exist: "%{user} neexistuje v Nextcloudu." one_drive_sync_service: attributes: create_folder: diff --git a/modules/storages/config/locales/crowdin/da.yml b/modules/storages/config/locales/crowdin/da.yml index 4e1994f430b2..7a0494ffd47d 100644 --- a/modules/storages/config/locales/crowdin/da.yml +++ b/modules/storages/config/locales/crowdin/da.yml @@ -3,6 +3,8 @@ da: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ da: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/de.yml b/modules/storages/config/locales/crowdin/de.yml index ab61032efdbf..06b3669855bd 100644 --- a/modules/storages/config/locales/crowdin/de.yml +++ b/modules/storages/config/locales/crowdin/de.yml @@ -3,6 +3,8 @@ de: attributes: storages/file_link: origin_id: Ursprungs-ID + storages/project_storage: + storage: Speicherung storages/storage: creator: Ersteller drive: Laufwerk ID @@ -72,6 +74,7 @@ de: confirmation_text: Bitte bestätigen Sie die Entfernung des Dateispeichers aus diesem Projekt heading_text: Projekt von %{storage} entfernen text: Diese Aktion ist unumkehrbar und entfernt alle Verknüpfungen von Arbeitspaketen dieses Projekts zu Dateien und Ordnern dieses Speichers. + title: Projekt von Speicherung abtrennen label: Projekt entfernen services: attributes: @@ -204,7 +207,7 @@ de: one_drive_oauth: Azure OAuth openproject_oauth: OpenProject OAuth project_folders: Projektordner - redirect_uri: URI umleiten + redirect_uri: Umleitungs-URI storage_provider: Speicheranbieter health: checked: Zuletzt geprüft %{datetime} @@ -309,7 +312,7 @@ de: label_openproject_oauth_application_secret: OpenProject OAuth geheimer Anwendungsschlüssel label_project_folder: Projektordner label_provider: Anbieter - label_redirect_uri: URI umleiten + label_redirect_uri: Umleitungs-URI label_show_storage_redirect_uri: Umleitungs-URI anzeigen label_status: Status label_storage: Speicher diff --git a/modules/storages/config/locales/crowdin/el.yml b/modules/storages/config/locales/crowdin/el.yml index e54f47af001a..935933084383 100644 --- a/modules/storages/config/locales/crowdin/el.yml +++ b/modules/storages/config/locales/crowdin/el.yml @@ -3,6 +3,8 @@ el: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Δημιουργός drive: Drive ID @@ -72,6 +74,7 @@ el: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/eo.yml b/modules/storages/config/locales/crowdin/eo.yml index 67dc4edb6344..fbcd8df507be 100644 --- a/modules/storages/config/locales/crowdin/eo.yml +++ b/modules/storages/config/locales/crowdin/eo.yml @@ -3,6 +3,8 @@ eo: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ eo: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/es.yml b/modules/storages/config/locales/crowdin/es.yml index 108e7a84fe59..2fef97ecd216 100644 --- a/modules/storages/config/locales/crowdin/es.yml +++ b/modules/storages/config/locales/crowdin/es.yml @@ -3,6 +3,8 @@ es: attributes: storages/file_link: origin_id: Id. de origen + storages/project_storage: + storage: Almacenamiento storages/storage: creator: Autor drive: ID de unidad @@ -72,6 +74,7 @@ es: confirmation_text: Confirme que entiende y desea eliminar este almacenamiento de archivos de este proyecto heading_text: Eliminar proyecto de %{storage} text: Esta acción es irreversible y eliminará todos los enlaces en los paquetes de trabajo de este proyecto a archivos y carpetas de ese almacenamiento. + title: Eliminar proyecto del almacenamiento label: Eliminar proyecto services: attributes: diff --git a/modules/storages/config/locales/crowdin/et.yml b/modules/storages/config/locales/crowdin/et.yml index 22a1c99c7073..a17cd0343a65 100644 --- a/modules/storages/config/locales/crowdin/et.yml +++ b/modules/storages/config/locales/crowdin/et.yml @@ -3,6 +3,8 @@ et: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ et: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/eu.yml b/modules/storages/config/locales/crowdin/eu.yml index 3096aee08bc4..b58605bcfa30 100644 --- a/modules/storages/config/locales/crowdin/eu.yml +++ b/modules/storages/config/locales/crowdin/eu.yml @@ -3,6 +3,8 @@ eu: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ eu: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/fa.yml b/modules/storages/config/locales/crowdin/fa.yml index e16bb90da87c..bed2abf2ad92 100644 --- a/modules/storages/config/locales/crowdin/fa.yml +++ b/modules/storages/config/locales/crowdin/fa.yml @@ -3,6 +3,8 @@ fa: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ fa: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/fi.yml b/modules/storages/config/locales/crowdin/fi.yml index 64982d851cfe..30b4e51bbfc4 100644 --- a/modules/storages/config/locales/crowdin/fi.yml +++ b/modules/storages/config/locales/crowdin/fi.yml @@ -3,6 +3,8 @@ fi: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ fi: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/fil.yml b/modules/storages/config/locales/crowdin/fil.yml index 74fd58e602fa..bec9cbfac706 100644 --- a/modules/storages/config/locales/crowdin/fil.yml +++ b/modules/storages/config/locales/crowdin/fil.yml @@ -3,6 +3,8 @@ fil: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ fil: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/fr.yml b/modules/storages/config/locales/crowdin/fr.yml index 9807cddf1c81..e97237a46918 100644 --- a/modules/storages/config/locales/crowdin/fr.yml +++ b/modules/storages/config/locales/crowdin/fr.yml @@ -3,6 +3,8 @@ fr: attributes: storages/file_link: origin_id: Id d'origine + storages/project_storage: + storage: Stockage storages/storage: creator: Créateur drive: ID du lecteur @@ -72,6 +74,7 @@ fr: confirmation_text: Veuillez confirmer que vous avez compris et que vous souhaitez supprimer cet espace de stockage de fichiers de ce projet. heading_text: Supprimer le projet de %{storage} text: Cette action est irréversible et supprimera tous les liens des lots de travaux de ce projet vers les fichiers et dossiers de cet espace de stockage. + title: Supprimer le projet de l'espace de stockage label: Supprimer le projet services: attributes: diff --git a/modules/storages/config/locales/crowdin/he.yml b/modules/storages/config/locales/crowdin/he.yml index e9a4f7108f9f..fe99987989a5 100644 --- a/modules/storages/config/locales/crowdin/he.yml +++ b/modules/storages/config/locales/crowdin/he.yml @@ -3,6 +3,8 @@ he: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ he: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/hi.yml b/modules/storages/config/locales/crowdin/hi.yml index 2bdbfc21ed8f..8cbcf4eabca7 100644 --- a/modules/storages/config/locales/crowdin/hi.yml +++ b/modules/storages/config/locales/crowdin/hi.yml @@ -3,6 +3,8 @@ hi: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ hi: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/hr.yml b/modules/storages/config/locales/crowdin/hr.yml index 9145d9211aaa..cfc710ba99f2 100644 --- a/modules/storages/config/locales/crowdin/hr.yml +++ b/modules/storages/config/locales/crowdin/hr.yml @@ -3,6 +3,8 @@ hr: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ hr: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/hu.yml b/modules/storages/config/locales/crowdin/hu.yml index 6b0125d68d67..dcf219714d78 100644 --- a/modules/storages/config/locales/crowdin/hu.yml +++ b/modules/storages/config/locales/crowdin/hu.yml @@ -3,6 +3,8 @@ hu: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Készítő drive: Drive ID @@ -72,6 +74,7 @@ hu: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/id.yml b/modules/storages/config/locales/crowdin/id.yml index a217547f55e0..6e0c229de7e6 100644 --- a/modules/storages/config/locales/crowdin/id.yml +++ b/modules/storages/config/locales/crowdin/id.yml @@ -3,6 +3,8 @@ id: attributes: storages/file_link: origin_id: Identifikasi Asli + storages/project_storage: + storage: Storage storages/storage: creator: Pembuat drive: Drive ID @@ -72,6 +74,7 @@ id: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/it.yml b/modules/storages/config/locales/crowdin/it.yml index ee604ed7ba52..e385db1a385b 100644 --- a/modules/storages/config/locales/crowdin/it.yml +++ b/modules/storages/config/locales/crowdin/it.yml @@ -3,6 +3,8 @@ it: attributes: storages/file_link: origin_id: ID origine + storages/project_storage: + storage: Archivio storages/storage: creator: Autore drive: ID Drive @@ -72,6 +74,7 @@ it: confirmation_text: Conferma di aver compreso e di voler rimuovere questo archivio di file da questo progetto heading_text: Rimuovi il progetto da %{storage} text: Questa azione è irreversibile e rimuoverà tutti i collegamenti dalle macro-attività di questo progetto ai file e alle cartelle di tale archivio. + title: Rimuovi il progetto dall'archivio label: Rimuovi il progetto services: attributes: diff --git a/modules/storages/config/locales/crowdin/ja.yml b/modules/storages/config/locales/crowdin/ja.yml index 096e3dbe0540..5f37d5ac0374 100644 --- a/modules/storages/config/locales/crowdin/ja.yml +++ b/modules/storages/config/locales/crowdin/ja.yml @@ -3,6 +3,8 @@ ja: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ ja: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/js-af.yml b/modules/storages/config/locales/crowdin/js-af.yml index b9600eec10f3..7323dd49dcfa 100644 --- a/modules/storages/config/locales/crowdin/js-af.yml +++ b/modules/storages/config/locales/crowdin/js-af.yml @@ -43,7 +43,7 @@ af: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ar.yml b/modules/storages/config/locales/crowdin/js-ar.yml index 2bd108aef2f7..c81ab40c3466 100644 --- a/modules/storages/config/locales/crowdin/js-ar.yml +++ b/modules/storages/config/locales/crowdin/js-ar.yml @@ -43,7 +43,7 @@ ar: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-az.yml b/modules/storages/config/locales/crowdin/js-az.yml index b10921ef30bb..a969009916c7 100644 --- a/modules/storages/config/locales/crowdin/js-az.yml +++ b/modules/storages/config/locales/crowdin/js-az.yml @@ -43,7 +43,7 @@ az: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-be.yml b/modules/storages/config/locales/crowdin/js-be.yml index 08f33f7199d6..d38f0cbe42a2 100644 --- a/modules/storages/config/locales/crowdin/js-be.yml +++ b/modules/storages/config/locales/crowdin/js-be.yml @@ -43,7 +43,7 @@ be: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-bg.yml b/modules/storages/config/locales/crowdin/js-bg.yml index 65a76a0be055..6b8adf34c3e0 100644 --- a/modules/storages/config/locales/crowdin/js-bg.yml +++ b/modules/storages/config/locales/crowdin/js-bg.yml @@ -43,7 +43,7 @@ bg: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Замени" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ca.yml b/modules/storages/config/locales/crowdin/js-ca.yml index d9f04f4e202e..e8c6fe64c43d 100644 --- a/modules/storages/config/locales/crowdin/js-ca.yml +++ b/modules/storages/config/locales/crowdin/js-ca.yml @@ -43,7 +43,7 @@ ca: Les carpetes gestionades automàticament no s'ha trobat encara. Si us plau, espera una mica i recarrega la pàgina per obtenir les dades més recents i prova-ho de nou. managed_project_folder_no_access: > Encara no tens access a la carpeta de projecte gestionada. Si us plau, espera un moment i prova-ho de nou. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Conserva els dos" upload_replace: "Substitueix" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ckb-IR.yml b/modules/storages/config/locales/crowdin/js-ckb-IR.yml index f1d70f7f8a8a..12c21d615ed4 100644 --- a/modules/storages/config/locales/crowdin/js-ckb-IR.yml +++ b/modules/storages/config/locales/crowdin/js-ckb-IR.yml @@ -43,7 +43,7 @@ ckb-IR: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-cs.yml b/modules/storages/config/locales/crowdin/js-cs.yml index c2ffd44480bc..7897279b2746 100644 --- a/modules/storages/config/locales/crowdin/js-cs.yml +++ b/modules/storages/config/locales/crowdin/js-cs.yml @@ -43,7 +43,7 @@ cs: Automaticky spravovaná složka projektu nebyla nalezena. Počkejte, prosím, znovu načtěte stránku pro načtení nejnovějších dat a zkuste to znovu. managed_project_folder_no_access: > Zatím nemáte přístup ke složce spravovaného projektu. Počkejte prosím trochu a zkuste to znovu. - cannot_create_folder: Nepodařilo se vytvořit složku. Nepoužívejte speciální znaky a symboly. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Zachovat obojí" upload_replace: "Nahradit" file_links: diff --git a/modules/storages/config/locales/crowdin/js-da.yml b/modules/storages/config/locales/crowdin/js-da.yml index e6ed1760e6e6..bf564ab9778a 100644 --- a/modules/storages/config/locales/crowdin/js-da.yml +++ b/modules/storages/config/locales/crowdin/js-da.yml @@ -43,7 +43,7 @@ da: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-de.yml b/modules/storages/config/locales/crowdin/js-de.yml index ef5a015edc9e..45369d6c4caf 100644 --- a/modules/storages/config/locales/crowdin/js-de.yml +++ b/modules/storages/config/locales/crowdin/js-de.yml @@ -43,7 +43,7 @@ de: Der automatisch verwaltete Projektordner wurde noch nicht gefunden. Bitte warten Sie, laden Sie die Seite neu, um die neuesten Daten abzurufen und versuchen Sie es erneut. managed_project_folder_no_access: > Sie haben noch keinen Zugriff auf den verwalteten Projektordner. Bitte warten Sie ein wenig und versuchen Sie es erneut. - cannot_create_folder: Der Ordner konnte nicht erstellt werden. Vermeiden Sie die Verwendung von Sonderzeichen und Symbolen. + cannot_create_folder: Ordner konnte nicht erstellt werden. Vermeiden Sie die Verwendung von Sonderzeichen und Symbolen und stellen Sie sicher, dass der Ordner nicht bereits existiert. upload_keep_both: "Beide behalten" upload_replace: "Ersetzen" file_links: diff --git a/modules/storages/config/locales/crowdin/js-el.yml b/modules/storages/config/locales/crowdin/js-el.yml index 8628860ed229..8e54fa676503 100644 --- a/modules/storages/config/locales/crowdin/js-el.yml +++ b/modules/storages/config/locales/crowdin/js-el.yml @@ -43,7 +43,7 @@ el: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Αντικατάσταση" file_links: diff --git a/modules/storages/config/locales/crowdin/js-eo.yml b/modules/storages/config/locales/crowdin/js-eo.yml index 1d9c594f52fe..265930379fab 100644 --- a/modules/storages/config/locales/crowdin/js-eo.yml +++ b/modules/storages/config/locales/crowdin/js-eo.yml @@ -43,7 +43,7 @@ eo: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Anstataŭigi" file_links: diff --git a/modules/storages/config/locales/crowdin/js-es.yml b/modules/storages/config/locales/crowdin/js-es.yml index 1d0475f66d52..2c536d9a7f29 100644 --- a/modules/storages/config/locales/crowdin/js-es.yml +++ b/modules/storages/config/locales/crowdin/js-es.yml @@ -43,7 +43,7 @@ es: Todavía no se ha encontrado la carpeta de proyecto administrada automáticamente. Espere un poco, vuelva a cargar la página para obtener los datos más recientes e inténtelo de nuevo. managed_project_folder_no_access: > Aún no tiene acceso a la carpeta del proyecto administrada. Espere un poco e inténtalo de nuevo. - cannot_create_folder: Error al crear la carpeta. Evite utilizar caracteres especiales y símbolos. + cannot_create_folder: Error al crear carpeta. Evite utilizar caracteres especiales y símbolos y asegúrese de que la carpeta no existe ya. upload_keep_both: "Mantener ambos" upload_replace: "Sustituir" file_links: diff --git a/modules/storages/config/locales/crowdin/js-et.yml b/modules/storages/config/locales/crowdin/js-et.yml index ba1c4196aa29..6b41a6a61873 100644 --- a/modules/storages/config/locales/crowdin/js-et.yml +++ b/modules/storages/config/locales/crowdin/js-et.yml @@ -43,7 +43,7 @@ et: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Asenda" file_links: diff --git a/modules/storages/config/locales/crowdin/js-eu.yml b/modules/storages/config/locales/crowdin/js-eu.yml index 438e54fa13bf..fad7d0434ab9 100644 --- a/modules/storages/config/locales/crowdin/js-eu.yml +++ b/modules/storages/config/locales/crowdin/js-eu.yml @@ -43,7 +43,7 @@ eu: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-fa.yml b/modules/storages/config/locales/crowdin/js-fa.yml index e64437e31660..0dc23fdf94cb 100644 --- a/modules/storages/config/locales/crowdin/js-fa.yml +++ b/modules/storages/config/locales/crowdin/js-fa.yml @@ -43,7 +43,7 @@ fa: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-fi.yml b/modules/storages/config/locales/crowdin/js-fi.yml index 8b471ac16f54..ab17c62f250c 100644 --- a/modules/storages/config/locales/crowdin/js-fi.yml +++ b/modules/storages/config/locales/crowdin/js-fi.yml @@ -43,7 +43,7 @@ fi: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Korvaa" file_links: diff --git a/modules/storages/config/locales/crowdin/js-fil.yml b/modules/storages/config/locales/crowdin/js-fil.yml index 06cf96d7fc61..0c475c968951 100644 --- a/modules/storages/config/locales/crowdin/js-fil.yml +++ b/modules/storages/config/locales/crowdin/js-fil.yml @@ -43,7 +43,7 @@ fil: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Palitan" file_links: diff --git a/modules/storages/config/locales/crowdin/js-fr.yml b/modules/storages/config/locales/crowdin/js-fr.yml index 1d11ab018fec..516a036a627a 100644 --- a/modules/storages/config/locales/crowdin/js-fr.yml +++ b/modules/storages/config/locales/crowdin/js-fr.yml @@ -43,7 +43,7 @@ fr: Le dossier de projet géré automatiquement n'a pas encore été trouvé. Veuillez patienter, rechargez la page pour récupérer les données les plus récentes, puis réessayez. managed_project_folder_no_access: > Vous n'avez pas encore accès au dossier de projet géré. Veuillez patienter un peu avant de réessayer. - cannot_create_folder: Échec de la création du dossier. Évitez d'utiliser des caractères spéciaux et des symboles. + cannot_create_folder: Échec de la création du dossier. Évitez d'utiliser des caractères spéciaux et des symboles, et assurez-vous que le dossier n'existe pas déjà. upload_keep_both: "Garder les deux" upload_replace: "Remplacer" file_links: diff --git a/modules/storages/config/locales/crowdin/js-he.yml b/modules/storages/config/locales/crowdin/js-he.yml index 7d56e25b4411..85ba080c0298 100644 --- a/modules/storages/config/locales/crowdin/js-he.yml +++ b/modules/storages/config/locales/crowdin/js-he.yml @@ -43,7 +43,7 @@ he: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-hi.yml b/modules/storages/config/locales/crowdin/js-hi.yml index d0092b39653b..b8dcb35d58e2 100644 --- a/modules/storages/config/locales/crowdin/js-hi.yml +++ b/modules/storages/config/locales/crowdin/js-hi.yml @@ -43,7 +43,7 @@ hi: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-hr.yml b/modules/storages/config/locales/crowdin/js-hr.yml index 586edbf07adb..22f9918809f3 100644 --- a/modules/storages/config/locales/crowdin/js-hr.yml +++ b/modules/storages/config/locales/crowdin/js-hr.yml @@ -43,7 +43,7 @@ hr: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Zamijeni" file_links: diff --git a/modules/storages/config/locales/crowdin/js-hu.yml b/modules/storages/config/locales/crowdin/js-hu.yml index d218b8b588da..f599efc16961 100644 --- a/modules/storages/config/locales/crowdin/js-hu.yml +++ b/modules/storages/config/locales/crowdin/js-hu.yml @@ -43,7 +43,7 @@ hu: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Csere" file_links: diff --git a/modules/storages/config/locales/crowdin/js-id.yml b/modules/storages/config/locales/crowdin/js-id.yml index 42a711d704dd..f5093dbcbd7e 100644 --- a/modules/storages/config/locales/crowdin/js-id.yml +++ b/modules/storages/config/locales/crowdin/js-id.yml @@ -43,7 +43,7 @@ id: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Ganti" file_links: diff --git a/modules/storages/config/locales/crowdin/js-it.yml b/modules/storages/config/locales/crowdin/js-it.yml index 07afc48d27ea..69af412528a7 100644 --- a/modules/storages/config/locales/crowdin/js-it.yml +++ b/modules/storages/config/locales/crowdin/js-it.yml @@ -43,7 +43,7 @@ it: La cartella del progetto gestita automaticamente non è stata ancora trovata. Attendi un po', ricarica la pagina per recuperare i dati più recenti e riprova. managed_project_folder_no_access: > Non hai ancora accesso alla cartella del progetto gestito. Aspetta un po' e riprova. - cannot_create_folder: Impossibile creare la cartella. Evita di usare caratteri e simboli speciali. + cannot_create_folder: Impossibile creare la cartella. Evita di usare caratteri e simboli speciali e assicurati che la cartella non esista già. upload_keep_both: "Mantieni entrambi" upload_replace: "Sostituisci" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ja.yml b/modules/storages/config/locales/crowdin/js-ja.yml index f3cfdc1718c0..0b28880b5701 100644 --- a/modules/storages/config/locales/crowdin/js-ja.yml +++ b/modules/storages/config/locales/crowdin/js-ja.yml @@ -43,7 +43,7 @@ ja: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: フォルダの作成に失敗しました。特殊な文字や記号の使用を避けてください。 + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "置き換え" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ka.yml b/modules/storages/config/locales/crowdin/js-ka.yml index 3da3b72b1705..77c42297924e 100644 --- a/modules/storages/config/locales/crowdin/js-ka.yml +++ b/modules/storages/config/locales/crowdin/js-ka.yml @@ -43,7 +43,7 @@ ka: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "ორივეს შენარჩუნება" upload_replace: "ჩანაცვლება" file_links: diff --git a/modules/storages/config/locales/crowdin/js-kk.yml b/modules/storages/config/locales/crowdin/js-kk.yml index f7526ee51bef..d9fcb64eda2b 100644 --- a/modules/storages/config/locales/crowdin/js-kk.yml +++ b/modules/storages/config/locales/crowdin/js-kk.yml @@ -43,7 +43,7 @@ kk: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ko.yml b/modules/storages/config/locales/crowdin/js-ko.yml index 79ac637b5f58..02e8419a1f3d 100644 --- a/modules/storages/config/locales/crowdin/js-ko.yml +++ b/modules/storages/config/locales/crowdin/js-ko.yml @@ -43,7 +43,7 @@ ko: 자동으로 관리되는 프로젝트 폴더를 아직 찾지 못했습니다. 잠시 기다렸다가 페이지를 다시 로드하고 최신 데이터를 가져온 후에 다시 시도하세요. managed_project_folder_no_access: > 관리되는 프로젝트 폴더에 대한 액세스 권한이 아직 없습니다. 잠시 후 다시 시도하세요. - cannot_create_folder: 폴더를 만들지 못했습니다. 특수 문자 및 기호를 사용하지 마세요. + cannot_create_folder: 폴더를 만들지 못했습니다. 특수 문자 및 기호를 사용하지 말고 폴더가 이미 존재하지 않는지 확인하세요. upload_keep_both: "모두 유지" upload_replace: "바꾸기" file_links: diff --git a/modules/storages/config/locales/crowdin/js-lt.yml b/modules/storages/config/locales/crowdin/js-lt.yml index 883be4cb7b07..47a0eaebd40d 100644 --- a/modules/storages/config/locales/crowdin/js-lt.yml +++ b/modules/storages/config/locales/crowdin/js-lt.yml @@ -43,7 +43,7 @@ lt: Automatiškai tvarkomas projekto aplankas dar nerastas. Prašome truputį palaukti, iš naujo įkelti puslapį, kad atsisiųstumėte naujausius duomenis, ir pabandyti dar kartą. managed_project_folder_no_access: > Jūs dar neturite prieigos prie tvarkomo projekto aplanko. Prašome truputį palaukti ir bandyti dar kartą. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Pasilikti abu" upload_replace: "Pakeisti" file_links: diff --git a/modules/storages/config/locales/crowdin/js-lv.yml b/modules/storages/config/locales/crowdin/js-lv.yml index 9706581d6202..00853c9c1e5d 100644 --- a/modules/storages/config/locales/crowdin/js-lv.yml +++ b/modules/storages/config/locales/crowdin/js-lv.yml @@ -43,7 +43,7 @@ lv: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-mn.yml b/modules/storages/config/locales/crowdin/js-mn.yml index 37ab76676d78..ad78cc16052e 100644 --- a/modules/storages/config/locales/crowdin/js-mn.yml +++ b/modules/storages/config/locales/crowdin/js-mn.yml @@ -43,7 +43,7 @@ mn: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ms.yml b/modules/storages/config/locales/crowdin/js-ms.yml index 3441573f54d1..29371b9215f7 100644 --- a/modules/storages/config/locales/crowdin/js-ms.yml +++ b/modules/storages/config/locales/crowdin/js-ms.yml @@ -43,7 +43,7 @@ ms: Folder yang dikendalikan secara automatik masih belum ditemui. Sila tunggu sebentar, muat semula halaman untuk dapatkan data terkini, dan cuba lagi. managed_project_folder_no_access: > Anda masih belum mempunyai akses ke folder projek yang dikendalikan. Sila tunggu sebentar dan cuba lagi. - cannot_create_folder: Gagal membuat folder. Elakkan menggunakan aksara dan simbol khas. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Simpan kedua-duanya" upload_replace: "Gantikan" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ne.yml b/modules/storages/config/locales/crowdin/js-ne.yml index fdd7b3609ce3..6bcb332de33e 100644 --- a/modules/storages/config/locales/crowdin/js-ne.yml +++ b/modules/storages/config/locales/crowdin/js-ne.yml @@ -43,7 +43,7 @@ ne: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-nl.yml b/modules/storages/config/locales/crowdin/js-nl.yml index 0be26c12ff78..4b7bb757d719 100644 --- a/modules/storages/config/locales/crowdin/js-nl.yml +++ b/modules/storages/config/locales/crowdin/js-nl.yml @@ -43,7 +43,7 @@ nl: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > U hebt nog geen toegang tot de beheerde projectmap. Wacht even en probeer het opnieuw. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Beide behouden" upload_replace: "Vervang" file_links: diff --git a/modules/storages/config/locales/crowdin/js-no.yml b/modules/storages/config/locales/crowdin/js-no.yml index eeb3e59d4976..56a810cb1e5a 100644 --- a/modules/storages/config/locales/crowdin/js-no.yml +++ b/modules/storages/config/locales/crowdin/js-no.yml @@ -43,7 +43,7 @@ Den automatisk administrerte prosjektmappen ble ikke funnet ennå. Vent litt, last siden på nytt for å hente nyeste data, og prøv på nytt. managed_project_folder_no_access: > Du har ikke tilgang til den administrerte prosjektmappen. Vennligst vent litt og prøv igjen. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Behold begge" upload_replace: "Erstatt" file_links: diff --git a/modules/storages/config/locales/crowdin/js-pl.yml b/modules/storages/config/locales/crowdin/js-pl.yml index b125132a277b..9194a0d4515a 100644 --- a/modules/storages/config/locales/crowdin/js-pl.yml +++ b/modules/storages/config/locales/crowdin/js-pl.yml @@ -43,7 +43,7 @@ pl: Jeszcze nie znaleziono automatycznie zarządzanego folderu projektu. Zaczekaj chwilę, odśwież stronę, aby pobrać najnowsze dane i spróbuj ponownie. managed_project_folder_no_access: > Nie masz jeszcze dostępu do zarządzanego folderu projektu. Poczekaj chwilę i spróbuj ponownie. - cannot_create_folder: Nie udało się utworzyć folderu. Unikaj używania znaków specjalnych i symboli. + cannot_create_folder: Nie udało się utworzyć folderu. Unikaj używania znaków specjalnych i symboli oraz upewnij się, że folder jeszcze nie istnieje. upload_keep_both: "Zachowaj oba" upload_replace: "Zastąp" file_links: diff --git a/modules/storages/config/locales/crowdin/js-pt-BR.yml b/modules/storages/config/locales/crowdin/js-pt-BR.yml index 86c9894fc48f..0355e4d3a5e2 100644 --- a/modules/storages/config/locales/crowdin/js-pt-BR.yml +++ b/modules/storages/config/locales/crowdin/js-pt-BR.yml @@ -43,7 +43,7 @@ pt-BR: A pasta do projeto gerenciado automaticamente ainda não foi encontrada. Aguarde um pouco, recarregue a página para obter os dados mais recentes e tente novamente. managed_project_folder_no_access: > Você ainda não possui acesso à pasta do projeto gerenciado. Aguarde um pouco e tente novamente. - cannot_create_folder: Falha ao criar a pasta. Evite usar caracteres especiais e símbolos. + cannot_create_folder: Falha ao criar a pasta. Evite o uso de caracteres especiais e símbolos e certifique-se de que a pasta não exista mais. upload_keep_both: "Manter ambos" upload_replace: "Substituir" file_links: diff --git a/modules/storages/config/locales/crowdin/js-pt-PT.yml b/modules/storages/config/locales/crowdin/js-pt-PT.yml index 9e85845713c4..b0cdf4237af9 100644 --- a/modules/storages/config/locales/crowdin/js-pt-PT.yml +++ b/modules/storages/config/locales/crowdin/js-pt-PT.yml @@ -43,7 +43,7 @@ pt-PT: A pasta do projeto gerido automaticamente ainda não foi encontrada. Aguarde um pouco, recarregue a página para obter os dados mais recentes e tente novamente. managed_project_folder_no_access: > Ainda não tem acesso à pasta do projeto gerido. Aguarde um pouco e tente novamente. - cannot_create_folder: Não foi possível criar a pasta. Evite utilizar caracteres especiais e símbolos. + cannot_create_folder: Não foi possível criar a pasta. Evite utilizar caracteres especiais e símbolos, e certifique-se de que a pasta ainda não existe. upload_keep_both: "Manter ambos" upload_replace: "Substituir" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ro.yml b/modules/storages/config/locales/crowdin/js-ro.yml index d0a24b05183a..7c472d5249c9 100644 --- a/modules/storages/config/locales/crowdin/js-ro.yml +++ b/modules/storages/config/locales/crowdin/js-ro.yml @@ -43,7 +43,7 @@ ro: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Păstrați ambele" upload_replace: "Înlocuiește" file_links: diff --git a/modules/storages/config/locales/crowdin/js-ru.yml b/modules/storages/config/locales/crowdin/js-ru.yml index bcd70bace482..27072247a058 100644 --- a/modules/storages/config/locales/crowdin/js-ru.yml +++ b/modules/storages/config/locales/crowdin/js-ru.yml @@ -43,7 +43,7 @@ ru: Автоматически управляемая папка проекта еще не найдена. Подождите немного, перезагрузите страницу, чтобы получить последние данные, и повторите попытку. managed_project_folder_no_access: > У вас пока нет доступа к управляемой папке проекта. Пожалуйста, подождите немного и повторите попытку. - cannot_create_folder: Не удалось создать папку. Избегайте использования специальных символов и знаков. + cannot_create_folder: Не удалось создать папку. Избегайте использования специальных знаков и символов и убедитесь, что папка еще не существует. upload_keep_both: "Оставить оба" upload_replace: "Заменить" file_links: diff --git a/modules/storages/config/locales/crowdin/js-rw.yml b/modules/storages/config/locales/crowdin/js-rw.yml index 547d6f62d3d9..ae848ffc7589 100644 --- a/modules/storages/config/locales/crowdin/js-rw.yml +++ b/modules/storages/config/locales/crowdin/js-rw.yml @@ -43,7 +43,7 @@ rw: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-si.yml b/modules/storages/config/locales/crowdin/js-si.yml index 0784ff950467..5885e89508d9 100644 --- a/modules/storages/config/locales/crowdin/js-si.yml +++ b/modules/storages/config/locales/crowdin/js-si.yml @@ -43,7 +43,7 @@ si: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "ප්රතිස්ථාපනය කරන්න" file_links: diff --git a/modules/storages/config/locales/crowdin/js-sk.yml b/modules/storages/config/locales/crowdin/js-sk.yml index 4a1635e449ce..eb45f490767a 100644 --- a/modules/storages/config/locales/crowdin/js-sk.yml +++ b/modules/storages/config/locales/crowdin/js-sk.yml @@ -43,7 +43,7 @@ sk: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Nahradiť" file_links: diff --git a/modules/storages/config/locales/crowdin/js-sl.yml b/modules/storages/config/locales/crowdin/js-sl.yml index 1dd98afadbfb..c24f5fb1cc1e 100644 --- a/modules/storages/config/locales/crowdin/js-sl.yml +++ b/modules/storages/config/locales/crowdin/js-sl.yml @@ -43,7 +43,7 @@ sl: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Zamenjaj" file_links: diff --git a/modules/storages/config/locales/crowdin/js-sr.yml b/modules/storages/config/locales/crowdin/js-sr.yml index 6dd193e5a860..ca12c7b8baba 100644 --- a/modules/storages/config/locales/crowdin/js-sr.yml +++ b/modules/storages/config/locales/crowdin/js-sr.yml @@ -43,7 +43,7 @@ sr: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-sv.yml b/modules/storages/config/locales/crowdin/js-sv.yml index a58bef8f44ec..0104bba30481 100644 --- a/modules/storages/config/locales/crowdin/js-sv.yml +++ b/modules/storages/config/locales/crowdin/js-sv.yml @@ -43,7 +43,7 @@ sv: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Ersätt" file_links: diff --git a/modules/storages/config/locales/crowdin/js-th.yml b/modules/storages/config/locales/crowdin/js-th.yml index 1455922c6d23..f34e8860a131 100644 --- a/modules/storages/config/locales/crowdin/js-th.yml +++ b/modules/storages/config/locales/crowdin/js-th.yml @@ -43,7 +43,7 @@ th: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-tr.yml b/modules/storages/config/locales/crowdin/js-tr.yml index 5cf6f3d58d2a..6ecd88d5372c 100644 --- a/modules/storages/config/locales/crowdin/js-tr.yml +++ b/modules/storages/config/locales/crowdin/js-tr.yml @@ -43,7 +43,7 @@ tr: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Klasör oluşturulamadı. Özel karakterler ve semboller kullanmaktan kaçının. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Değiştir" file_links: diff --git a/modules/storages/config/locales/crowdin/js-uk.yml b/modules/storages/config/locales/crowdin/js-uk.yml index e4224ac2a320..eebb153ec74a 100644 --- a/modules/storages/config/locales/crowdin/js-uk.yml +++ b/modules/storages/config/locales/crowdin/js-uk.yml @@ -43,7 +43,7 @@ uk: Папку проєкту з автоматичним керуванням поки не знайдено. Трохи зачекайте, перезапустіть сторінку, отримайте найновіші дані й повторіть спробу. managed_project_folder_no_access: > У вас немає доступу до керованої папки проєкту. Трохи зачекайте й повторіть спробу. - cannot_create_folder: Не вдалося створити папку. Не використовуйте спеціальні знаки й символи. + cannot_create_folder: Не вдалося створити папку. Не використовуйте спеціальні знаки й символи та переконайтеся, що назва папки унікальна. upload_keep_both: "Зберегти обидва" upload_replace: "Замінити" file_links: diff --git a/modules/storages/config/locales/crowdin/js-uz.yml b/modules/storages/config/locales/crowdin/js-uz.yml index e9e3200512f9..8a7f26351e92 100644 --- a/modules/storages/config/locales/crowdin/js-uz.yml +++ b/modules/storages/config/locales/crowdin/js-uz.yml @@ -43,7 +43,7 @@ uz: The automatically managed project folder was not yet found. Please wait a bit, reload the page to fetch the newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" file_links: diff --git a/modules/storages/config/locales/crowdin/js-vi.yml b/modules/storages/config/locales/crowdin/js-vi.yml index 7137fe23e2f6..f757b28d1691 100644 --- a/modules/storages/config/locales/crowdin/js-vi.yml +++ b/modules/storages/config/locales/crowdin/js-vi.yml @@ -43,7 +43,7 @@ vi: Thư mục dự án được quản lý tự động chưa được tìm thấy. Vui lòng đợi một chút, tải lại trang để lấy dữ liệu mới nhất, và thử lại. managed_project_folder_no_access: > Bạn chưa có quyền truy cập vào thư mục dự án được quản lý. Vui lòng đợi một chút và thử lại. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Giữ cả hai" upload_replace: "Thay thế" file_links: diff --git a/modules/storages/config/locales/crowdin/js-zh-CN.yml b/modules/storages/config/locales/crowdin/js-zh-CN.yml index b7558789c439..2e03cd7b51a6 100644 --- a/modules/storages/config/locales/crowdin/js-zh-CN.yml +++ b/modules/storages/config/locales/crowdin/js-zh-CN.yml @@ -43,7 +43,7 @@ zh-CN: 尚未找到自动托管的项目文件夹。请稍等片刻，重新加载页面以获取最新数据，然后重试。 managed_project_folder_no_access: > 您目前还无法访问托管项目文件夹。请稍等片刻，然后重试。 - cannot_create_folder: 创建文件夹失败。请避免使用特殊字符和符号。 + cannot_create_folder: 创建文件夹失败。避免使用特殊字符和符号，并确保该文件夹尚不存在。 upload_keep_both: "保留两者" upload_replace: "替换" file_links: diff --git a/modules/storages/config/locales/crowdin/js-zh-TW.yml b/modules/storages/config/locales/crowdin/js-zh-TW.yml index f3ad9f93e42d..695337edc65a 100644 --- a/modules/storages/config/locales/crowdin/js-zh-TW.yml +++ b/modules/storages/config/locales/crowdin/js-zh-TW.yml @@ -43,7 +43,7 @@ zh-TW: 尚未找到自動管理的專案資料夾。 請稍等一下，重新加載頁面以獲取最新數據，然後重試。 managed_project_folder_no_access: > 您尚無權存取託管專案資料夾。 請稍等一下，然後重試。 - cannot_create_folder: 建立資料夾失敗。避免使用特殊字符和符號。 + cannot_create_folder: 建立資料夾失敗。避免使用特殊字符和符號，並確保資料夾不存在。 upload_keep_both: "兩者都保留" upload_replace: "取代" file_links: diff --git a/modules/storages/config/locales/crowdin/ka.yml b/modules/storages/config/locales/crowdin/ka.yml index e3aa93a52b45..f31ce2c7b90d 100644 --- a/modules/storages/config/locales/crowdin/ka.yml +++ b/modules/storages/config/locales/crowdin/ka.yml @@ -3,6 +3,8 @@ ka: attributes: storages/file_link: origin_id: საწყისის id + storages/project_storage: + storage: Storage storages/storage: creator: შემქმნელი drive: Drive ID @@ -72,6 +74,7 @@ ka: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/kk.yml b/modules/storages/config/locales/crowdin/kk.yml index 8a276ffad9e6..62c678fb83d5 100644 --- a/modules/storages/config/locales/crowdin/kk.yml +++ b/modules/storages/config/locales/crowdin/kk.yml @@ -3,6 +3,8 @@ kk: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ kk: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/ko.yml b/modules/storages/config/locales/crowdin/ko.yml index cea4e3b36611..63fb6a9150ed 100644 --- a/modules/storages/config/locales/crowdin/ko.yml +++ b/modules/storages/config/locales/crowdin/ko.yml @@ -3,6 +3,8 @@ ko: attributes: storages/file_link: origin_id: 원본 ID + storages/project_storage: + storage: 저장소 storages/storage: creator: 생성자 drive: 드라이브 ID @@ -72,6 +74,7 @@ ko: confirmation_text: 해당 사항을 이해하며 이 프로젝트에서 이 파일 저장소를 제거할 것인지 확인해 주세요 heading_text: '%{storage}에서 프로젝트 제거' text: 이 작업은 되돌릴 수 없으며 이 프로젝트의 작업 패키지에서 해당 저장소의 파일 및 폴더에 대한 모든 링크를 제거합니다. + title: 저장소에서 프로젝트 제거 label: 프로젝트 제거 services: attributes: diff --git a/modules/storages/config/locales/crowdin/lt.yml b/modules/storages/config/locales/crowdin/lt.yml index 7d5c9668b7b2..2666051e4007 100644 --- a/modules/storages/config/locales/crowdin/lt.yml +++ b/modules/storages/config/locales/crowdin/lt.yml @@ -3,6 +3,8 @@ lt: attributes: storages/file_link: origin_id: Kilmės Id + storages/project_storage: + storage: Storage storages/storage: creator: Kūrėjas drive: Disko ID @@ -72,6 +74,7 @@ lt: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/lv.yml b/modules/storages/config/locales/crowdin/lv.yml index 8962dd4e6d8e..be62cc69d161 100644 --- a/modules/storages/config/locales/crowdin/lv.yml +++ b/modules/storages/config/locales/crowdin/lv.yml @@ -3,6 +3,8 @@ lv: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ lv: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/mn.yml b/modules/storages/config/locales/crowdin/mn.yml index c112e58f222c..d0e3de760fb7 100644 --- a/modules/storages/config/locales/crowdin/mn.yml +++ b/modules/storages/config/locales/crowdin/mn.yml @@ -3,6 +3,8 @@ mn: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ mn: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/ms.yml b/modules/storages/config/locales/crowdin/ms.yml index 41ca17540ddb..c5d43cdfe5b4 100644 --- a/modules/storages/config/locales/crowdin/ms.yml +++ b/modules/storages/config/locales/crowdin/ms.yml @@ -3,6 +3,8 @@ ms: attributes: storages/file_link: origin_id: ID Asal + storages/project_storage: + storage: Penyimpanan storages/storage: creator: Pencipta drive: ID Pemacu @@ -72,6 +74,7 @@ ms: confirmation_text: Sila sahkan bahawa anda faham dan ingin memadam storan fail ini daripada projek ini heading_text: Alih keluar projek daripada %{storage} text: Aksi ini tidak dapat dipulihkan dan akan padamkan semua pautan daripada pakej kerja projek ini ke fail dan folder storan itu. + title: Remove project from storage label: Keluarkan projek services: attributes: diff --git a/modules/storages/config/locales/crowdin/ne.yml b/modules/storages/config/locales/crowdin/ne.yml index 02e788678b48..1f11b361cba5 100644 --- a/modules/storages/config/locales/crowdin/ne.yml +++ b/modules/storages/config/locales/crowdin/ne.yml @@ -3,6 +3,8 @@ ne: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ ne: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/nl.yml b/modules/storages/config/locales/crowdin/nl.yml index 6aca5c545d7c..b3a9d79b22ac 100644 --- a/modules/storages/config/locales/crowdin/nl.yml +++ b/modules/storages/config/locales/crowdin/nl.yml @@ -3,6 +3,8 @@ nl: attributes: storages/file_link: origin_id: Oorsprong ID + storages/project_storage: + storage: Storage storages/storage: creator: Maker drive: Drive ID @@ -72,6 +74,7 @@ nl: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/no.yml b/modules/storages/config/locales/crowdin/no.yml index 3dc2cc7e5b78..7202257fc8d4 100644 --- a/modules/storages/config/locales/crowdin/no.yml +++ b/modules/storages/config/locales/crowdin/no.yml @@ -3,6 +3,8 @@ attributes: storages/file_link: origin_id: Opprinnelses ID + storages/project_storage: + storage: Storage storages/storage: creator: Skaper drive: Stasjon ID @@ -72,6 +74,7 @@ confirmation_text: Vennligst bekreft at du forstår og ønsker å fjerne fillagringen fra dette prosjektet heading_text: Fjern prosjektet fra %{storage} text: Denne handlingen er irreversibel, og vil fjerne alle koblinger fra arbeidspakker i dette prosjektet til filer og mapper i denne lagringen. + title: Remove project from storage label: Slett prosjekt services: attributes: @@ -258,7 +261,7 @@ application_link_text: applikasjon "Integrasjon OpenProject" integration: Nextcloud administrasjon / OpenProject oauth_configuration: Kopier disse verdiene fra %{application_link_text}. - provider_configuration: Kontroller at du har administrasjonsrettigheter i din NextCloud-instans og %{application_link_text} er installert før du utfører oppsettet. + provider_configuration: Kontroller at du har administrasjonsrettigheter i din Nextcloud-instans og %{application_link_text} er installert før du utfører oppsettet. no_specific_folder: Som standard starter hver bruker på sin egen hjem-mappe når vedkommende laster opp en fil. no_storage_set_up: Det er ingen fillagring satt opp ennå. not_logged_into_storage: Du må logge inn først for å velge en prosjektmappe. @@ -281,7 +284,7 @@ setting_up_additional_storages_non_admin: Administratorer kan sette opp flere fillagre i Administrasjon/fillagre. setting_up_storages: For å sette opp fillagre, vennligst besøk setting_up_storages_non_admin: Administratorer kan sette opp fillagring i Administrasjon-/fillagre. - type: 'Sørg for at du har administrasjonsrettigheter i din NextCloud-instans og har følgende applikasjon installert før du utfører oppsettet:' + type: 'Sørg for at du har administrasjonsrettigheter i din Nextcloud-instans og har følgende applikasjon installert før du utfører oppsettet:' type_link_text: "«Integrasjon OpenProject»" label_active: Aktiv label_add_new_storage: Legg til nytt lagringssted diff --git a/modules/storages/config/locales/crowdin/pl.yml b/modules/storages/config/locales/crowdin/pl.yml index 7bb4f973e9cc..014ac8fb3b49 100644 --- a/modules/storages/config/locales/crowdin/pl.yml +++ b/modules/storages/config/locales/crowdin/pl.yml @@ -3,6 +3,8 @@ pl: attributes: storages/file_link: origin_id: Identyfikator pochodzenia + storages/project_storage: + storage: Magazyn danych storages/storage: creator: Twórca drive: Identyfikator dysku @@ -72,6 +74,7 @@ pl: confirmation_text: Potwierdź, że rozumiesz i chcesz usunąć ten magazyn plików z tego projektu. heading_text: Usuń projekt z %{storage} text: To działanie jest nieodwracalne i spowoduje usunięcie wszystkich linków do plików i folderów tego magazynu z pakietów roboczych tego projektu. + title: Usuń projekt z magazynu label: Usuń projekt services: attributes: diff --git a/modules/storages/config/locales/crowdin/pt-BR.yml b/modules/storages/config/locales/crowdin/pt-BR.yml index 5a4c3fc6473f..b81159dbd2e4 100644 --- a/modules/storages/config/locales/crowdin/pt-BR.yml +++ b/modules/storages/config/locales/crowdin/pt-BR.yml @@ -3,6 +3,8 @@ pt-BR: attributes: storages/file_link: origin_id: Id da origem + storages/project_storage: + storage: Armazenamento storages/storage: creator: Criador drive: Drive ID @@ -72,6 +74,7 @@ pt-BR: confirmation_text: Confirme se você entende e deseja remover este armazenamento de arquivos do projeto heading_text: Remover projeto de %{storage} text: Esta ação é permanente e removerá todos os links entre os pacotes de trabalho deste projeto e os arquivos e pastas desse armazenamento. + title: Remover projeto do armazenamento label: Remover projeto services: attributes: diff --git a/modules/storages/config/locales/crowdin/pt-PT.yml b/modules/storages/config/locales/crowdin/pt-PT.yml index fb28d997f01c..9af36367b956 100644 --- a/modules/storages/config/locales/crowdin/pt-PT.yml +++ b/modules/storages/config/locales/crowdin/pt-PT.yml @@ -3,6 +3,8 @@ pt-PT: attributes: storages/file_link: origin_id: ID de Origem + storages/project_storage: + storage: Armazenamento storages/storage: creator: Criador drive: ID da unidade @@ -72,6 +74,7 @@ pt-PT: confirmation_text: Confirme que compreende e pretende remover este armazenamento de ficheiros deste projeto heading_text: Remover projeto de %{storage} text: Esta ação é irreversível e irá remover todas as ligações dos pacotes de trabalho deste projeto aos ficheiros e pastas desse armazenamento. + title: Remover projeto do armazenamento label: Remover projeto services: attributes: diff --git a/modules/storages/config/locales/crowdin/ro.yml b/modules/storages/config/locales/crowdin/ro.yml index 560a8cb77459..7451f6be0542 100644 --- a/modules/storages/config/locales/crowdin/ro.yml +++ b/modules/storages/config/locales/crowdin/ro.yml @@ -3,6 +3,8 @@ ro: attributes: storages/file_link: origin_id: Id de origine + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ ro: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/ru.yml b/modules/storages/config/locales/crowdin/ru.yml index a5cdc12fc493..feec8908ef16 100644 --- a/modules/storages/config/locales/crowdin/ru.yml +++ b/modules/storages/config/locales/crowdin/ru.yml @@ -3,6 +3,8 @@ ru: attributes: storages/file_link: origin_id: ID оригинала + storages/project_storage: + storage: Хранилище storages/storage: creator: Создатель drive: ID диска @@ -72,6 +74,7 @@ ru: confirmation_text: Пожалуйста, подтвердите, что Вы понимаете и хотите удалить это файловое хранилище из данного проекта heading_text: Удалить проект из %{storage} text: Это действие необратимо и удалит все ссылки из пакетов работ этого проекта на файлы и папки этого хранилища. + title: Удалить проект из хранилища label: Удалить проект services: attributes: @@ -256,7 +259,7 @@ ru: new_storage: Прочтите нашу документацию по настройке интеграции файлового хранилища %{provider_name} для получения дополнительной информации. nextcloud: application_link_text: Приложение «Интеграция OpenProject» - integration: Администрирование NextCloud / OpenProject + integration: Администрирование Nextcloud / OpenProject oauth_configuration: Скопируйте эти значения из %{application_link_text}. provider_configuration: Пожалуйста, убедитесь, что у вас есть права администрирования в копии Nextcloud, и перед установкой настроен %{application_link_text}. no_specific_folder: По умолчанию каждый пользователь при загрузке файла начинает работу со своей собственной домашней папки. diff --git a/modules/storages/config/locales/crowdin/rw.yml b/modules/storages/config/locales/crowdin/rw.yml index bff1b259b695..1f2e13fbc66a 100644 --- a/modules/storages/config/locales/crowdin/rw.yml +++ b/modules/storages/config/locales/crowdin/rw.yml @@ -3,6 +3,8 @@ rw: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ rw: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/si.yml b/modules/storages/config/locales/crowdin/si.yml index c54c64840158..55a5b85d70c6 100644 --- a/modules/storages/config/locales/crowdin/si.yml +++ b/modules/storages/config/locales/crowdin/si.yml @@ -3,6 +3,8 @@ si: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ si: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/sk.yml b/modules/storages/config/locales/crowdin/sk.yml index 5f1aac3427ba..d954d39bc462 100644 --- a/modules/storages/config/locales/crowdin/sk.yml +++ b/modules/storages/config/locales/crowdin/sk.yml @@ -3,6 +3,8 @@ sk: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ sk: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/sl.yml b/modules/storages/config/locales/crowdin/sl.yml index dd2d385c4753..d162a5fd5acc 100644 --- a/modules/storages/config/locales/crowdin/sl.yml +++ b/modules/storages/config/locales/crowdin/sl.yml @@ -3,6 +3,8 @@ sl: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ sl: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/sr.yml b/modules/storages/config/locales/crowdin/sr.yml index 84d047a95a86..160ec47ace63 100644 --- a/modules/storages/config/locales/crowdin/sr.yml +++ b/modules/storages/config/locales/crowdin/sr.yml @@ -3,6 +3,8 @@ sr: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ sr: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/sv.yml b/modules/storages/config/locales/crowdin/sv.yml index 48dd76254a6e..2415a815fb85 100644 --- a/modules/storages/config/locales/crowdin/sv.yml +++ b/modules/storages/config/locales/crowdin/sv.yml @@ -3,6 +3,8 @@ sv: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ sv: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/th.yml b/modules/storages/config/locales/crowdin/th.yml index 6fb5b764ff8b..07c0301acc15 100644 --- a/modules/storages/config/locales/crowdin/th.yml +++ b/modules/storages/config/locales/crowdin/th.yml @@ -3,6 +3,8 @@ th: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ th: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/tr.yml b/modules/storages/config/locales/crowdin/tr.yml index fc2b69e67bb3..aa4c1ead6f27 100644 --- a/modules/storages/config/locales/crowdin/tr.yml +++ b/modules/storages/config/locales/crowdin/tr.yml @@ -3,6 +3,8 @@ tr: attributes: storages/file_link: origin_id: Kaynak kimliği + storages/project_storage: + storage: Depolama storages/storage: creator: Oluşturan drive: Drive ID @@ -72,6 +74,7 @@ tr: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: @@ -146,7 +149,7 @@ tr: set_folders_permissions: permission_not_set: could not set permissions on %{path}. error: An unexpected error occurred. Please ensure that OneDrive/SharePoint is reachable and check OpenProject worker logs for more information - not_allowed: OpenProject wasn't allowed to access your OneDrive drive. Please check the permissions set on the Azure Application. + not_allowed: OpenProject'in OneDrive sürücünüze erişmesine izin verilmedi. Lütfen Azure Uygulamasında ayarlanan izinleri kontrol edin. unauthorized: OpenProject OneDrive ile eşitlenemedi. Lütfen depolama alanınızı ve Azure Uygulaması yapılandırmanızı kontrol edin. user_does_not_exist: "%{user} does not exist in Nextcloud." upload_link_service: @@ -154,24 +157,24 @@ tr: storages: buttons: complete_without_setup: Complete without it - done_complete_setup: Done, complete setup - done_continue: Done, continue - open_storage: Open file storage + done_complete_setup: Bitti, kurulumu tamamlayın + done_continue: Bitti, devam et + open_storage: Dosya depolamayı aç replace_oauth_application: OpenProject OAuth'u değiştirin replace_oauth_client: '%{provider_type} OAuth''u değiştirin' - save_and_continue: Save and continue - select_folder: Select folder + save_and_continue: Kaydet ve devam et + select_folder: Klasör seç configuration_checks: oauth_client_incomplete: - nextcloud: Allow OpenProject to access Nextcloud data using OAuth. - one_drive: Allow OpenProject to access Azure data using OAuth to connect OneDrive/Sharepoint. + nextcloud: OpenProject'in OAuth kullanarak Nextcloud verilerine erişmesine izin verin. + one_drive: OpenProject'in OneDrive/Sharepoint'e bağlanmak için OAuth kullanarak Azure verilerine erişmesine izin verin. redirect_uri_incomplete: - one_drive: Complete the setup with the correct URI redirection. + one_drive: Doğru adres yönlendirmesi ile kurulumu tamamlayın. confirm_replace_oauth_application: This action will reset the current OAuth credentials. After confirming you will have to reenter the credentials at the storage provider and all remote users will have to authorize against OpenProject again. Are you sure you want to proceed? confirm_replace_oauth_client: This action will reset the current OAuth credentials. After confirming you will have to enter new credentials from the storage provider and all users will have to authorize against %{provider_type} again. Are you sure you want to proceed? delete_warning: - input_delete_confirmation: Enter the file storage name %{file_storage} to confirm deletion. - irreversible_notice: Deleting a file storage is an irreversible action. + input_delete_confirmation: Silme işlemini onaylamak için dosya depolama adını %{file_storage} girin. + irreversible_notice: Bir dosya deposunun silinmesi geri döndürülemez bir eylemdir. project_storage: 'Are you sure you want to delete %{file_storage} from this project? To confirm this action please introduce the storage name in the field below, this will:' project_storage_delete_result_1: Remove all links from work packages of this project to files and folders of that storage. project_storage_delete_result_2: In case this storage has an automatically managed project folder, this and its files will be deleted forever. @@ -181,35 +184,35 @@ tr: storage_delete_result_3: In case this storage has automatically managed project folders, those and their contained files will be deleted forever. dependencies: nextcloud: - group_folders_app: Group folders + group_folders_app: Grup klasörleri integration_app: Integration OpenProject enabled_in_projects: setup_incomplete_description: This storage has an incomplete setup. Please, complete the setup before enabling it in multiple projects. setup_incomplete_header: Storage setup incomplete - error_invalid_provider_type: Please select a valid storage provider. + error_invalid_provider_type: Lütfen geçerli bir depolama sağlayıcısı seçin. file_storage_view: access_management: automatic_management: Automatically managed access and folders automatic_management_description: Let OpenProject create folders per project automatically and manage its user access. This is recommended as it ensures that every team member has always the correct access permissions. description: Select the type of management of user access and folder creation. We recommend to use the Automatically managed access to have a more organised structure and guarantee access to all relevant users. - manual_management: Manually managed access and folders + manual_management: Elle yönetilen erişim ve klasörler manual_management_description: Create and manage folders per project manually on your own. You will need to manually ensure relevant users have access. setup_incomplete: Select the type of management of user access and folder creation. - subtitle: Access management - title: Access and project folders - automatically_managed_folders: Automatically managed folders - general_information: General information + subtitle: Erişim yönetimi + title: Erişim ve proje klasörleri + automatically_managed_folders: Otomatik olarak yönetilen klasörler + general_information: Genel bilgi nextcloud_oauth: Nextcloud OAuth oauth_applications: OAuth uygulamaları one_drive_oauth: Azure OAuth openproject_oauth: OpenProject OAuth - project_folders: Project folders + project_folders: Proje klasörleri redirect_uri: Yönlendirme URL'si - storage_provider: Storage provider + storage_provider: Depolama sağlayıcısı health: - checked: Last checked %{datetime} + checked: Son kontrol %{datetime} connection_validation: - action: Recheck connection + action: Bağlantıyı tekrar kontrol edin app_version_mismatch: Entegrasyon OpenProject uygulama sürümü desteklenmiyor. Lütfen Nextcloud sunucunuzu güncelleyin. client_id_wrong: The configured OAuth 2 client id is invalid. Please check the configuration. client_secret_wrong: The configured OAuth 2 client secret is invalid. Please check the configuration. @@ -219,7 +222,7 @@ tr: host_not_found: No Nextcloud server found at the configured host url. Please check the configuration. missing_dependencies: 'A required dependency is missing on the file storage. Please add the following dependency: %{dependency}.' not_configured: The connection could not be validated. Please finish configuration first. - placeholder: Check your connection against the server. + placeholder: Sunucuyla olan bağlantıyı kontrol edin. subtitle: Connection validation tenant_id_wrong: The configured directory (tenant) id is invalid. Please check the configuration. unexpected_content: @@ -228,20 +231,20 @@ tr: unknown_error: The connection could not be validated. An unknown error occurred. Please check the server logs for further information. userless_access_denied: The configured app password is invalid. label_error: Hata - label_healthy: Healthy + label_healthy: Sağlıklı label_pending: Bekliyor label_warning: Uyarı project_folders: subtitle: Automatically managed project folders - since: since %{datetime} - title: Health status + since: '%{datetime} tarihinden beri' + title: Sağlık durumu health_email_notifications: - description_subscribed: All administrators receive health status email notifications for this storage. - description_unsubscribed: Health status email notifications for this storage have been turned off for all administrators. + description_subscribed: Tüm yöneticiler bu depolama alanı için sistem durumu e-posta bildirimleri alır. + description_unsubscribed: Bu depolama alanı için sağlık durumu e-posta bildirimleri tüm yöneticiler için kapatıldı. error_could_not_be_saved: Email notification settings could not be saved. Please try again. subscribe: Abone ol title: E-posta bildirimleri - unsubscribe: Unsubscribe + unsubscribe: Aboneliği iptal et help_texts: project_folder: The project folder is the default folder for file uploads for this project. Users can nevertheless still upload files to other locations. project_folder_bulk: The project folder is the default folder for file uploads for all the projects selected. You can modify this individually in each project settings. Users can nevertheless still upload files to other locations. @@ -253,7 +256,7 @@ tr: host: 'Lütfen https dahil olmak üzere depolama alanınızın ana bilgisayar adresini ekleyin:' managed_project_folders_application_password_caption: 'Enable automatic managed folders by copying this value from: %{provider_type_link}.' name: Kullanıcıların birden fazla depolama alanı arasında ayrım yapabilmesi için depolama alanınıza bir ad verin. - new_storage: Read our documentation on setting up a %{provider_name} file storage integration for more information. + new_storage: Daha fazla bilgi için %{provider_name} dosya depolama entegrasyonu kurma hakkındaki belgelerimizi okuyun. nextcloud: application_link_text: application “Integration OpenProject” integration: Nextcloud Yönetimi / OpenProject @@ -268,13 +271,13 @@ tr: application_link_text: Azure portalı copy_redirect_uri: Copy redirect URI documentation_link_text: OneDrive/SharePoint dosya depoları belgeleri - drive_id: Please copy the ID from the desired drive by following the steps in the %{drive_id_link_text}. + drive_id: Lütfen %{drive_id_link_text} adresindeki adımları izleyerek kimliği istediğiniz sürücüden kopyalayın. integration: OneDrive/SharePoint missing_client_id_for_redirect_uri: Please fill the OAuth values to generate a URI oauth_client_redirect_uri: Please copy this value to a new Web redirect URI under Redirect URIs. oauth_client_secret: İstemci kimlik bilgileri altında uygulama istemci sırrı yoksa, lütfen yeni bir tane oluşturun. - oauth_configuration: Copy these values from the desired application in the %{application_link_text}. - provider_configuration: Please make sure you have administration privileges in the %{application_link_text} or contact your Microsoft administrator before doing the setup. In the portal, you also need to register an Azure application or use an existing one for authentication. + oauth_configuration: Bu değerleri %{application_link_text} adresindeki istenen uygulamadan kopyalayın. + provider_configuration: Lütfen kurulumu yapmadan önce %{application_link_text} adresinde yönetim ayrıcalıklarına sahip olduğunuzdan emin olun veya Microsoft yöneticinize başvurun. Portalda ayrıca bir Azure uygulaması kaydetmeniz veya kimlik doğrulaması için mevcut bir uygulamayı kullanmanız gerekir. tenant_id: Please copy the Directory (tenant) ID from the desired application and App registrations in the %{application_link_text}. tenant_id_placeholder: Name or UUID setting_up_additional_storages: Ek dosya depoları ayarlamak için lütfen adresi ziyaret edin. @@ -288,8 +291,8 @@ tr: label_automatic_folder: New folder with automatically managed permissions label_creation_time: Creation time label_creator: Oluşturan - label_delete_storage: Delete storage - label_edit_storage_access_management: Edit storage access management + label_delete_storage: Depolamayı sil + label_edit_storage_access_management: Depolama erişim yönetimini düzenleme label_edit_storage_automatically_managed_folders: Edit storage automatically managed folders label_edit_storage_host: Edit storage host label_existing_manual_folder: Existing folder with manually managed permissions @@ -300,7 +303,7 @@ tr: application_password: Application password automatically_managed_folders: Otomatik olarak yönetilen klasörler label_name: İsim - label_new_file_storage: New %{provider} storage + label_new_file_storage: Yeni %{provider} depolama label_new_storage: Yeni depolama label_no_selected_folder: Seçili klasör yok label_no_specific_folder: Belirli bir klasör yok @@ -308,7 +311,7 @@ tr: label_openproject_oauth_application_id: OpenProject OAuth Client ID label_openproject_oauth_application_secret: OpenProject OAuth Client Secret label_project_folder: Proje klasörü - label_provider: Provider + label_provider: Sağlayıcı label_redirect_uri: Yönlendirme URL'si label_show_storage_redirect_uri: Show redirect URI label_status: Durum @@ -321,18 +324,18 @@ tr: members_no_results: No members to display. no_results: Henüz ayarlanmış depolama alanı yok. oauth_access_granted_modal: - access_granted: Access granted + access_granted: Erişim izni verildi project_settings: - access_granted_screen_reader: Access granted. You are now ready to use %{storage} - storage_ready: You are now ready to use %{storage} + access_granted_screen_reader: Erişim izni verildi. Artık %{storage} depolamasını kullanmaya hazırsınız + storage_ready: Artık %{storage} depolamasını kullanmaya hazırsınız storage_admin: - access_granted_screen_reader: Access granted. You are now ready to add projects to %{storage} - storage_ready: You are now ready to add projects to %{storage} + access_granted_screen_reader: Erişim izni verildi. Artık %{storage} depolamasına proje eklemeye hazırsınız + storage_ready: Artık %{storage} depolamasına proje eklemeye hazırsınız oauth_grant_nudge_modal: cancel_button_label: Daha sonra yapacağım - heading: Login to %{provider_type} required + heading: '%{provider_type} adresine giriş gerekli' login_button_aria_label: Login to %{storage} - login_button_label: "%{provider_type} log in" + login_button_label: "%{provider_type} sağlayıcısına giriş yap" project_settings: description: To get access to the project folder you need to login to %{storage}. requesting_access_to: Requesting access to %{storage} @@ -351,12 +354,12 @@ tr: page_titles: file_storages: delete: Delete file storage - subtitle: Add an external file storage in order to upload, link and manage files in work packages. + subtitle: İş paketlerindeki dosyaları yüklemek, bağlamak ve yönetmek için harici bir dosya depolama alanı ekleyin. managed_project_folders: subtitle: |- - Let OpenProject create folders per project automatically. This is recommended as it ensures that every team - member always has the correct access permissions. - subtitle_short: Let OpenProject create folders per project automatically. + OpenProject'in her proje için klasörleri otomatik olarak oluşturmasına izin verin. Bu, her ekip + üyesinin her zaman doğru erişim izinlerine sahip olmasını sağladığı için önerilir. + subtitle_short: OpenProject'in her proje için otomatik olarak klasör oluşturmasına izin verin. title: Automatically managed project folders project_settings: delete: Dosya depolama alanını sil @@ -385,7 +388,7 @@ tr: storage_list_blank_slate: description: Add a storage to see them here. heading: You don't have any storages yet. - successful_storage_connection: Storage connected successfully! Remember to activate the storage in the Projects tab for each desired project to use it. + successful_storage_connection: Depolama başarıyla bağlandı! Kullanmak istediğiniz her proje için Projeler sekmesinde depolamayı etkinleştirmeyi unutmayın. upsale: description: |- Integrate your OneDrive/SharePoint as a file storage with OpenProject. Upload files and link them directly to diff --git a/modules/storages/config/locales/crowdin/uk.yml b/modules/storages/config/locales/crowdin/uk.yml index 94bb7f31df4a..62286b957b7b 100644 --- a/modules/storages/config/locales/crowdin/uk.yml +++ b/modules/storages/config/locales/crowdin/uk.yml @@ -3,6 +3,8 @@ uk: attributes: storages/file_link: origin_id: Код джерела + storages/project_storage: + storage: Сховище storages/storage: creator: Автор drive: ID диску @@ -72,6 +74,7 @@ uk: confirmation_text: Підтвердьте, що ви розумієте наслідки й хочете вилучити цей проєкт із файлового сховища heading_text: Вилучити проєкт із %{storage} text: Буде вилучено всі посилання з пакетів робіт цього проєкту на файли й папки, що зберігаються в цьому сховищі. Це незворотна дія. + title: Вилучити проєкт зі сховища label: Вилучити проєкт services: attributes: diff --git a/modules/storages/config/locales/crowdin/uz.yml b/modules/storages/config/locales/crowdin/uz.yml index 3ed2c9d7b791..d396c3fde00f 100644 --- a/modules/storages/config/locales/crowdin/uz.yml +++ b/modules/storages/config/locales/crowdin/uz.yml @@ -3,6 +3,8 @@ uz: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -72,6 +74,7 @@ uz: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/crowdin/vi.yml b/modules/storages/config/locales/crowdin/vi.yml index 9512a1372b83..7c9a9c7d9808 100644 --- a/modules/storages/config/locales/crowdin/vi.yml +++ b/modules/storages/config/locales/crowdin/vi.yml @@ -3,6 +3,8 @@ vi: attributes: storages/file_link: origin_id: ID Nguồn + storages/project_storage: + storage: Storage storages/storage: creator: Người tạo drive: ID Ổ đĩa @@ -72,6 +74,7 @@ vi: confirmation_text: Vui lòng xác nhận bạn hiểu và muốn xóa bộ lưu trữ tệp này khỏi dự án này heading_text: Xóa dự án khỏi %{storage} text: Hành động này là không thể đảo ngược và sẽ xóa tất cả các liên kết từ các gói công việc của dự án này tới các tệp và thư mục của bộ lưu trữ đó. + title: Remove project from storage label: Xóa dự án services: attributes: diff --git a/modules/storages/config/locales/crowdin/zh-CN.yml b/modules/storages/config/locales/crowdin/zh-CN.yml index a4e7e6885bce..907c9567ed75 100644 --- a/modules/storages/config/locales/crowdin/zh-CN.yml +++ b/modules/storages/config/locales/crowdin/zh-CN.yml @@ -3,6 +3,8 @@ zh-CN: attributes: storages/file_link: origin_id: 来源 ID + storages/project_storage: + storage: 存储 storages/storage: creator: 创建者 drive: 驱动器 ID @@ -72,6 +74,7 @@ zh-CN: confirmation_text: 请确认您已理解并要从此项目中删除此文件存储 heading_text: 从 %{storage} 中删除项目 text: 此操作不可逆，将从此项目的工作包中删除所有链接到该存储的文件和文件夹。 + title: 从存储中删除项目 label: 删除项目 services: attributes: diff --git a/modules/storages/config/locales/crowdin/zh-TW.yml b/modules/storages/config/locales/crowdin/zh-TW.yml index aee1ddfa02b6..eee9390fe6c8 100644 --- a/modules/storages/config/locales/crowdin/zh-TW.yml +++ b/modules/storages/config/locales/crowdin/zh-TW.yml @@ -3,6 +3,8 @@ zh-TW: attributes: storages/file_link: origin_id: 來源 ID + storages/project_storage: + storage: 儲存空間 storages/storage: creator: 建立者 drive: Drive ID @@ -72,6 +74,7 @@ zh-TW: confirmation_text: 請確認您瞭解並希望從本專案中移除此檔案儲存空間 heading_text: 從 %{storage} 移除專案 text: 此動作是不可逆轉的，並會移除此專案的工作項目到該儲存的檔案和資料夾的所有連結。 + title: 從儲存庫中移除專案 label: 移除專案 services: attributes: diff --git a/modules/storages/config/locales/en.yml b/modules/storages/config/locales/en.yml index ceb25c753efb..2ddc071ed569 100644 --- a/modules/storages/config/locales/en.yml +++ b/modules/storages/config/locales/en.yml @@ -4,6 +4,8 @@ en: attributes: storages/file_link: origin_id: Origin Id + storages/project_storage: + storage: Storage storages/storage: creator: Creator drive: Drive ID @@ -73,6 +75,7 @@ en: confirmation_text: Please, confirm you understand and want to remove this file storage from this project heading_text: Remove project from %{storage} text: This action is irreversible and will remove all links from work packages of this project to files and folders of that storage. + title: Remove project from storage label: Remove project services: attributes: diff --git a/modules/storages/config/locales/js-en.yml b/modules/storages/config/locales/js-en.yml index 8d82b0ef9d33..cf576c0844d1 100644 --- a/modules/storages/config/locales/js-en.yml +++ b/modules/storages/config/locales/js-en.yml @@ -50,7 +50,7 @@ en: newest data, and try again. managed_project_folder_no_access: > You have no access yet to the managed project folder. Please wait a bit and try again. - cannot_create_folder: Failed to create folder. Avoid using special characters and symbols. + cannot_create_folder: Failed to create folder. Avoid using special characters and symbols and make sure the folder does not exist already. upload_keep_both: "Keep both" upload_replace: "Replace" diff --git a/modules/storages/db/migrate/20250115100336_set_default_authentication_method.rb b/modules/storages/db/migrate/20250115100336_set_default_authentication_method.rb new file mode 100644 index 000000000000..e1d05e7f5564 --- /dev/null +++ b/modules/storages/db/migrate/20250115100336_set_default_authentication_method.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class SetDefaultAuthenticationMethod < ActiveRecord::Migration[7.1] + def up + update_sql = <<~SQL.squish + UPDATE storages + SET provider_fields = provider_fields || '{ "authentication_method": "two_way_oauth2" }'::jsonb + WHERE provider_type = 'Storages::NextcloudStorage' AND NOT provider_fields ? 'authentication_method' + SQL + + ActiveRecord::Base.connection.execute(update_sql) + end + + def down + # up-direction is backwards-compatible, no need to restrict a migration rollback + # but also nothing to do in case of a rollback + end +end diff --git a/modules/storages/lib/open_project/storages/engine.rb b/modules/storages/lib/open_project/storages/engine.rb index c98483d74a86..5cb7411a33bb 100644 --- a/modules/storages/lib/open_project/storages/engine.rb +++ b/modules/storages/lib/open_project/storages/engine.rb @@ -188,21 +188,21 @@ def self.external_file_permissions menu :admin_menu, :files, { controller: "/storages/admin/storages", action: :index }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :project_module_storages, icon: "file-directory" menu :admin_menu, :external_file_storages, { controller: "/storages/admin/storages", action: :index }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :external_file_storages, parent: :files menu :admin_menu, :attachments, { controller: "/admin/settings/attachments_settings", action: :show }, - if: Proc.new { User.current.admin? }, + if: ->(_) { User.current.admin? }, caption: :"attributes.attachments", parent: :files diff --git a/modules/storages/spec/common/storages/peripherals/storage_interaction/inputs/set_permissions_spec.rb b/modules/storages/spec/common/storages/peripherals/storage_interaction/inputs/set_permissions_spec.rb index 55cd0482cafd..e2fd2f518cee 100644 --- a/modules/storages/spec/common/storages/peripherals/storage_interaction/inputs/set_permissions_spec.rb +++ b/modules/storages/spec/common/storages/peripherals/storage_interaction/inputs/set_permissions_spec.rb @@ -34,7 +34,7 @@ describe ".new" do it "discourages direct instantiation" do expect { described_class.new(file_id: "file_id", user_permissions: []) } - .to raise_error(NoMethodError, /private method `new'/) + .to raise_error(NoMethodError, /private method 'new'/) end end diff --git a/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb b/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb index c80c457f3033..a21df99f0a51 100644 --- a/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb +++ b/modules/storages/spec/common/storages/peripherals/storage_interaction/one_drive/set_permissions_command_spec.rb @@ -137,7 +137,7 @@ def current_remote_permissions .with( error_code: :error, message: nil, - data: %r{/lib/httpx/response.rb:262:in `full_message': timed out while waiting on select \(HTTPX::ConnectTimeoutError\)\n$} + data: %r{/lib/httpx/response.rb:262:in 'full_message': timed out while waiting on select \(HTTPX::ConnectTimeoutError\)\n$} ).once # rubocop:enable Layout/LineLength end diff --git a/modules/storages/spec/contracts/storages/storages/nextcloud_contract_spec.rb b/modules/storages/spec/contracts/storages/storages/nextcloud_contract_spec.rb index 147626b4055d..8499a238cba2 100644 --- a/modules/storages/spec/contracts/storages/storages/nextcloud_contract_spec.rb +++ b/modules/storages/spec/contracts/storages/storages/nextcloud_contract_spec.rb @@ -33,16 +33,17 @@ RSpec.describe Storages::Storages::NextcloudContract, :storage_server_helpers, :webmock do let(:current_user) { create(:admin) } - let(:storage_host) { "https://host1.example.com" } - let(:storage) { build(:nextcloud_storage, host: storage_host) } + let(:storage) { build(:nextcloud_storage) } + let(:mocked_host) { storage.host } + + let!(:capabilities_request) { mock_server_capabilities_response(mocked_host) } + let!(:host_request) { mock_server_config_check_response(mocked_host) } # As the NextcloudContract is selected by the BaseContract to make writable attributes available, # the BaseContract needs to be instantiated here. subject { Storages::Storages::BaseContract.new(storage, current_user) } it "checks the storage url only when changed" do - capabilities_request = mock_server_capabilities_response(storage_host) - host_request = mock_server_config_check_response(storage_host) subject.validate expect(capabilities_request).to have_been_made.once expect(host_request).to have_been_made.once @@ -58,11 +59,6 @@ context "with valid credentials" do let(:storage) { build(:nextcloud_storage, :as_automatically_managed) } - before do - mock_server_capabilities_response(storage.host) - mock_server_config_check_response(storage.host) - end - it "passes validation" do credentials_request = mock_nextcloud_application_credentials_validation(storage.host) @@ -137,6 +133,7 @@ context "when the storage host is nil" do let(:storage) { build(:nextcloud_storage, :as_automatically_managed, host: nil) } + let(:mocked_host) { "https://example.com/unrelated" } before do allow(NextcloudApplicationCredentialsValidator).to receive(:new).and_call_original @@ -149,4 +146,67 @@ end end end + + describe "authentication_method validation" do + let(:storage) { build(:nextcloud_storage, :as_not_automatically_managed, authentication_method:) } + let(:authentication_method) { "two_way_oauth2" } + + it { is_expected.to be_valid } + + context "when the authentication method is oauth2_sso" do + let(:authentication_method) { "oauth2_sso" } + + it { is_expected.to be_valid } + end + + context "when the authentication method is unknown" do + let(:authentication_method) { "magic_unicorns" } + + it { is_expected.not_to be_valid } + end + + context "when the authentication method is missing" do + let(:authentication_method) { nil } + + it { is_expected.not_to be_valid } + end + end + + describe "nextcloud_audience validation" do + let(:storage) do + build(:nextcloud_storage, :as_not_automatically_managed, authentication_method:, nextcloud_audience:) + end + + context "when authentication happens through bidirectional OAuth 2.0" do + let(:authentication_method) { "two_way_oauth2" } + + context "and there is no nextcloud_audience" do + let(:nextcloud_audience) { nil } + + it { is_expected.to be_valid } + end + + context "and there is a nextcloud_audience" do + let(:nextcloud_audience) { "nextcloud" } + + it { is_expected.to be_valid } + end + end + + context "when authentication happens through a common IDP" do + let(:authentication_method) { "oauth2_sso" } + + context "and there is no nextcloud_audience" do + let(:nextcloud_audience) { nil } + + it { is_expected.not_to be_valid } + end + + context "and there is a nextcloud_audience" do + let(:nextcloud_audience) { "nextcloud" } + + it { is_expected.to be_valid } + end + end + end end diff --git a/modules/storages/spec/contracts/storages/storages/shared_contract_examples.rb b/modules/storages/spec/contracts/storages/storages/shared_contract_examples.rb index ee4f284a5d96..4ffb31a273ff 100644 --- a/modules/storages/spec/contracts/storages/storages/shared_contract_examples.rb +++ b/modules/storages/spec/contracts/storages/storages/shared_contract_examples.rb @@ -294,8 +294,7 @@ context "when not automatically managed, no username or password" do before do - storage.provider_fields = {} - storage.assign_attributes(automatic_management_enabled: false) + storage.assign_attributes(automatic_management_enabled: false, username: nil, password: nil) end it_behaves_like "contract is valid" diff --git a/modules/storages/spec/factories/storage_factory.rb b/modules/storages/spec/factories/storage_factory.rb index f31ed752dd2b..8dae7ab07147 100644 --- a/modules/storages/spec/factories/storage_factory.rb +++ b/modules/storages/spec/factories/storage_factory.rb @@ -91,6 +91,8 @@ class: "::Storages::NextcloudStorage" do provider_type { Storages::Storage::PROVIDER_TYPE_NEXTCLOUD } sequence(:host) { |n| "https://host#{n}.example.com/" } + authentication_method { "two_way_oauth2" } + nextcloud_audience { "nextcloud" } trait :as_automatically_managed do automatic_management_enabled { true } diff --git a/modules/storages/spec/features/delete_project_storage_and_file_links_spec.rb b/modules/storages/spec/features/delete_project_storage_and_file_links_spec.rb index 449864b85625..ee455bcb96bf 100644 --- a/modules/storages/spec/features/delete_project_storage_and_file_links_spec.rb +++ b/modules/storages/spec/features/delete_project_storage_and_file_links_spec.rb @@ -33,7 +33,7 @@ # Test if the deletion of a ProjectStorage actually deletes related FileLink # objects. -RSpec.describe "Delete ProjectStorage with FileLinks", :js, :webmock, :with_cuprite do +RSpec.describe "Delete ProjectStorage with FileLinks", :js, :webmock do let(:user) { create(:user) } let(:role) { create(:project_role, permissions: [:manage_files_in_project]) } let(:project) do diff --git a/modules/storages/spec/features/hide_attachments_spec.rb b/modules/storages/spec/features/hide_attachments_spec.rb index 42eb4f3bfdae..33b28bf7e2bb 100644 --- a/modules/storages/spec/features/hide_attachments_spec.rb +++ b/modules/storages/spec/features/hide_attachments_spec.rb @@ -31,7 +31,7 @@ require "spec_helper" require_module_spec_helper -RSpec.describe "Hide attachments", :js, :with_cuprite do +RSpec.describe "Hide attachments", :js do let(:permissions) do %i(add_work_packages manage_files_in_project diff --git a/modules/storages/spec/features/manage_project_storage_spec.rb b/modules/storages/spec/features/manage_project_storage_spec.rb index 0c8207c6440a..133e12ff797e 100644 --- a/modules/storages/spec/features/manage_project_storage_spec.rb +++ b/modules/storages/spec/features/manage_project_storage_spec.rb @@ -38,7 +38,10 @@ # We decrease the notification polling interval because some portions of the JS code rely on something triggering # the Angular change detection. This is usually done by the notification polling, but we don't want to wait RSpec.describe("Activation of storages in projects", - :js, :oauth_connection_helpers, :storage_server_helpers, :webmock, :with_cuprite, + :js, + :oauth_connection_helpers, + :storage_server_helpers, + :webmock, with_settings: { notifications_polling_interval: 1_000 }) do let(:user) { create(:user) } # The first page is the Project -> Settings -> General page, so we need diff --git a/modules/storages/spec/features/storages/admin/create_storage_spec.rb b/modules/storages/spec/features/storages/admin/create_storage_spec.rb index f95d5625a443..cbea8ca87e4b 100644 --- a/modules/storages/spec/features/storages/admin/create_storage_spec.rb +++ b/modules/storages/spec/features/storages/admin/create_storage_spec.rb @@ -33,6 +33,7 @@ RSpec.describe "Admin Create a new file storage", :js, + :selenium, :storage_server_helpers do shared_let(:admin) { create(:admin, preferences: { time_zone: "Etc/UTC" }) } diff --git a/modules/storages/spec/features/storages/admin/edit_storage_spec.rb b/modules/storages/spec/features/storages/admin/edit_storage_spec.rb index b5e1833bfa8a..86bc6a3d86d5 100644 --- a/modules/storages/spec/features/storages/admin/edit_storage_spec.rb +++ b/modules/storages/spec/features/storages/admin/edit_storage_spec.rb @@ -33,6 +33,7 @@ RSpec.describe "Admin Edit File storage", :js, + :selenium, :storage_server_helpers do shared_let(:admin) { create(:admin, preferences: { time_zone: "Etc/UTC" }) } diff --git a/modules/storages/spec/features/storages/admin/index_storages_spec.rb b/modules/storages/spec/features/storages/admin/index_storages_spec.rb index ecc90dde96d5..7423d3d12e36 100644 --- a/modules/storages/spec/features/storages/admin/index_storages_spec.rb +++ b/modules/storages/spec/features/storages/admin/index_storages_spec.rb @@ -33,6 +33,7 @@ RSpec.describe "Admin List File storages", :js, + :selenium, :storage_server_helpers do shared_let(:admin) { create(:admin, preferences: { time_zone: "Etc/UTC" }) } diff --git a/modules/storages/spec/features/storages/admin/project_storages_spec.rb b/modules/storages/spec/features/storages/admin/project_storages_spec.rb index b7d727f4eeb3..4c2258a1395b 100644 --- a/modules/storages/spec/features/storages/admin/project_storages_spec.rb +++ b/modules/storages/spec/features/storages/admin/project_storages_spec.rb @@ -34,8 +34,7 @@ # We decrease the notification polling interval because some portions of the JS code rely on something triggering # the Angular change detection. This is usually done by the notification polling, but we don't want to wait RSpec.describe "Admin lists project mappings for a storage", - :js, :storage_server_helpers, :webmock, :with_cuprite, - with_settings: { notifications_polling_interval: 1_000 } do + :js, :storage_server_helpers, :webmock, with_settings: { notifications_polling_interval: 1_000 } do shared_let(:admin) { create(:admin, preferences: { time_zone: "Etc/UTC" }) } shared_let(:non_admin) { create(:user) } @@ -365,7 +364,7 @@ def call page.within("dialog") do expect(page).to have_text("Remove project from #{storage.name}") expect(page).to have_text("this storage has an automatically managed project folder") - click_on "Close" + click_on "Cancel" end expect(page).to have_text(project.name) @@ -394,7 +393,7 @@ def call page.within("dialog") do expect(page).to have_button("Remove", disabled: true) Retryable.repeat_until_success do - check "Please, confirm you understand and want to remove this file storage from this project" + check "Please, confirm you understand and want to remove this file storage from this project", allow_label_click: true expect(page).to have_button("Remove", disabled: false) # ensure button is clickable click_on "Remove" end diff --git a/modules/storages/spec/features/storages/project_settings/oauth_access_grant_spec.rb b/modules/storages/spec/features/storages/project_settings/oauth_access_grant_spec.rb index c46f77211e7b..caaa6bd30528 100644 --- a/modules/storages/spec/features/storages/project_settings/oauth_access_grant_spec.rb +++ b/modules/storages/spec/features/storages/project_settings/oauth_access_grant_spec.rb @@ -33,6 +33,7 @@ RSpec.describe "OAuth Access Grant Nudge upon adding a storage to a project", :js, + :selenium, :webmock do shared_let(:user) { create(:user, preferences: { time_zone: "Etc/UTC" }) } diff --git a/modules/storages/spec/services/storages/project_storages/bulk_create_service_spec.rb b/modules/storages/spec/services/storages/project_storages/bulk_create_service_spec.rb index ce36f350d4f3..4896de5b2d18 100644 --- a/modules/storages/spec/services/storages/project_storages/bulk_create_service_spec.rb +++ b/modules/storages/spec/services/storages/project_storages/bulk_create_service_spec.rb @@ -239,6 +239,10 @@ expect(result).to be_failure expect(result.errors.messages).to eq({ project_folder_id: ["Please select a folder."] }) end + + aggregate_failures "returns the built unsaved project storages" do + expect(result.result.first).to be_a(Storages::ProjectStorage) & be_new_record + end end end end diff --git a/modules/storages/spec/workers/storages/manage_storage_integrations_job_spec.rb b/modules/storages/spec/workers/storages/manage_storage_integrations_job_spec.rb index e76ed531522a..663f9b022ee5 100644 --- a/modules/storages/spec/workers/storages/manage_storage_integrations_job_spec.rb +++ b/modules/storages/spec/workers/storages/manage_storage_integrations_job_spec.rb @@ -76,11 +76,15 @@ expect(good_job_setting.key).to eq("cron_keys_disabled") expect(good_job_setting.value).to eq(["Storages::ManageStorageIntegrationsJob"]) - expect { described_class.disable_cron_job_if_needed }.not_to change(GoodJob::Setting, :count).from(1) + expect { described_class.disable_cron_job_if_needed }.to change(GoodJob::Setting, :count).from(1).to(2) good_job_setting.reload expect(good_job_setting.key).to eq("cron_keys_disabled") expect(good_job_setting.value).to eq([]) + + good_job_setting = GoodJob::Setting.second + expect(good_job_setting.key).to eq("cron_keys_enabled") + expect(good_job_setting.value).to eq(["Storages::ManageStorageIntegrationsJob"]) end it "does nothing if the cron_job is not disabled" do diff --git a/modules/team_planner/config/locales/crowdin/js-tr.yml b/modules/team_planner/config/locales/crowdin/js-tr.yml index 542cc035d618..273bd1fa7cc2 100644 --- a/modules/team_planner/config/locales/crowdin/js-tr.yml +++ b/modules/team_planner/config/locales/crowdin/js-tr.yml @@ -7,13 +7,13 @@ tr: create_label: 'Takım planlayıcısı' create_title: 'Yeni takım planlayıcısı oluştur' unsaved_title: 'İsimsiz takım planlayıcısı' - no_data: 'Ekip planlayıcınızı ayarlamak için atanan kişileri ekleyin.' + no_data: 'Takım planlayıcınızı ayarlamak için atanan kişileri ekleyin.' add_assignee: 'Atanan' remove_assignee: 'Atananı kaldır' two_weeks: '2 hafta' one_week: '1 hafta' - four_weeks: '4 haftalık' - eight_weeks: '8 haftalık' + four_weeks: '4 hafta' + eight_weeks: '8 hafta' work_week: 'Çalışma Haftası' today: 'Bugün' drag_here_to_remove: 'Atanan kişiyi ve başlangıç ve bitiş tarihlerini kaldırmak için buraya sürükleyin.' diff --git a/modules/team_planner/config/locales/crowdin/tr.yml b/modules/team_planner/config/locales/crowdin/tr.yml index 799e713e9033..6ab6db15cf57 100644 --- a/modules/team_planner/config/locales/crowdin/tr.yml +++ b/modules/team_planner/config/locales/crowdin/tr.yml @@ -14,4 +14,4 @@ tr: label_assignees: "Atananlar" upsale: title: "Takım planlayıcısı" - description: "Team Planner ile ekibinizin planlamasına ilişkin eksiksiz bir genel bakış elde edin. Tarihleri değiştirmek, taşımak veya atananları değiştirmek için iş paketlerini genişletin, kısaltın ve sürükleyip bırakın." + description: "Takım Planlayıcısı ile ekibinizin planlamasına ilişkin eksiksiz bir genel bakış elde edin. Tarihleri değiştirmek, taşımak veya atananları değiştirmek için iş paketlerini genişletin, kısaltın ve sürükleyip bırakın." diff --git a/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb b/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb index 3ce40c33f4c3..711b96a5744f 100644 --- a/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb +++ b/modules/team_planner/spec/features/onboarding/team_planner_onboarding_tour_spec.rb @@ -31,7 +31,7 @@ RSpec.describe "team planner onboarding tour", :js, - with_cuprite: false, + :selenium, with_ee: %i[team_planner_view], # We decrease the notification polling interval because some portions # of the JS code rely on something triggering the Angular change detection. diff --git a/modules/team_planner/spec/features/query_handling_spec.rb b/modules/team_planner/spec/features/query_handling_spec.rb index 3a9b71757b7c..348cc84ecd79 100644 --- a/modules/team_planner/spec/features/query_handling_spec.rb +++ b/modules/team_planner/spec/features/query_handling_spec.rb @@ -32,7 +32,7 @@ require_relative "../support/pages/team_planner" require_relative "../../../../spec/features/views/shared_examples" -RSpec.describe "Team planner query handling", :js, :with_cuprite, with_ee: %i[team_planner_view] do +RSpec.describe "Team planner query handling", :js, with_ee: %i[team_planner_view] do shared_let(:standard) { create(:standard_global_role) } shared_let(:type_task) { create(:type_task) } shared_let(:type_bug) { create(:type_bug) } diff --git a/modules/team_planner/spec/features/team_planner_add_existing_work_packages_spec.rb b/modules/team_planner/spec/features/team_planner_add_existing_work_packages_spec.rb index 16ed55fdd885..6102d8fb701a 100644 --- a/modules/team_planner/spec/features/team_planner_add_existing_work_packages_spec.rb +++ b/modules/team_planner/spec/features/team_planner_add_existing_work_packages_spec.rb @@ -30,7 +30,9 @@ require_relative "shared_context" require_relative "../support/components/add_existing_pane" -RSpec.describe "Team planner add existing work packages", :js do +RSpec.describe "Team planner add existing work packages", + :js, + :selenium do include_context "with team planner full access" let(:closed_status) { create(:status, is_closed: true) } diff --git a/modules/team_planner/spec/features/team_planner_context_menu_spec.rb b/modules/team_planner/spec/features/team_planner_context_menu_spec.rb index 45cb6f9b1a99..6e76984d89b0 100644 --- a/modules/team_planner/spec/features/team_planner_context_menu_spec.rb +++ b/modules/team_planner/spec/features/team_planner_context_menu_spec.rb @@ -4,6 +4,7 @@ RSpec.describe "Work package table context menu", :js, + :selenium, with_ee: %i[team_planner_view], with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_create_spec.rb b/modules/team_planner/spec/features/team_planner_create_spec.rb index 2f2e55409d33..c84b87b9e561 100644 --- a/modules/team_planner/spec/features/team_planner_create_spec.rb +++ b/modules/team_planner/spec/features/team_planner_create_spec.rb @@ -29,7 +29,10 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner create new work package", :js, with_ee: %i[team_planner_view] do +RSpec.describe "Team planner create new work package", + :js, + :selenium, + with_ee: %i[team_planner_view] do include_context "with team planner full access" let(:type_task) { create(:type_task) } diff --git a/modules/team_planner/spec/features/team_planner_dates_spec.rb b/modules/team_planner/spec/features/team_planner_dates_spec.rb index 27ff76fbedbf..1f653a368f82 100644 --- a/modules/team_planner/spec/features/team_planner_dates_spec.rb +++ b/modules/team_planner/spec/features/team_planner_dates_spec.rb @@ -29,7 +29,9 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner working days", :js, +RSpec.describe "Team planner working days", + :js, + :selenium, with_ee: %i[team_planner_view], with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_error_handling_spec.rb b/modules/team_planner/spec/features/team_planner_error_handling_spec.rb index 3cc19da17095..11f89981f74e 100644 --- a/modules/team_planner/spec/features/team_planner_error_handling_spec.rb +++ b/modules/team_planner/spec/features/team_planner_error_handling_spec.rb @@ -29,7 +29,9 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner error handling", :js, +RSpec.describe "Team planner error handling", + :js, + :selenium, with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_global_create_spec.rb b/modules/team_planner/spec/features/team_planner_global_create_spec.rb index 91ac826a7c21..7cc3b2755d1a 100644 --- a/modules/team_planner/spec/features/team_planner_global_create_spec.rb +++ b/modules/team_planner/spec/features/team_planner_global_create_spec.rb @@ -34,7 +34,7 @@ RSpec.describe "Team Planner", "Creating a view from a Global Context", :js, - :with_cuprite, + :selenium, with_ee: %i[team_planner_view] do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_index_spec.rb b/modules/team_planner/spec/features/team_planner_index_spec.rb index 6e4994fe72ea..d368554f89cb 100644 --- a/modules/team_planner/spec/features/team_planner_index_spec.rb +++ b/modules/team_planner/spec/features/team_planner_index_spec.rb @@ -29,7 +29,10 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner index", :js, :with_cuprite, with_ee: %i[team_planner_view] do +RSpec.describe "Team planner index", + :js, + :selenium, + with_ee: %i[team_planner_view] do shared_let(:project) do create(:project) end diff --git a/modules/team_planner/spec/features/team_planner_menu_spec.rb b/modules/team_planner/spec/features/team_planner_menu_spec.rb index 543a7721928e..90663c40fb43 100644 --- a/modules/team_planner/spec/features/team_planner_menu_spec.rb +++ b/modules/team_planner/spec/features/team_planner_menu_spec.rb @@ -28,7 +28,9 @@ require "spec_helper" -RSpec.describe "Team planner Menu Item", :js, :with_cuprite do +RSpec.describe "Team planner Menu Item", + :js, + :selenium do shared_let(:project) do create(:project, enabled_module_names: %w[work_package_tracking team_planner_view]) end diff --git a/modules/team_planner/spec/features/team_planner_overview_spec.rb b/modules/team_planner/spec/features/team_planner_overview_spec.rb index 7301813570db..38a55af6ca30 100644 --- a/modules/team_planner/spec/features/team_planner_overview_spec.rb +++ b/modules/team_planner/spec/features/team_planner_overview_spec.rb @@ -33,7 +33,8 @@ require_relative "shared_context" RSpec.describe "Team planner overview", - :with_cuprite, + :js, + :selenium, with_ee: %i[team_planner_view] do # The order the Projects are created in is important. By naming `project` alphanumerically # after `other_project`, we can ensure that subsequent specs that assert sorting is diff --git a/modules/team_planner/spec/features/team_planner_project_include_spec.rb b/modules/team_planner/spec/features/team_planner_project_include_spec.rb index ab0ff0cf7ce3..c3b388e9a15d 100644 --- a/modules/team_planner/spec/features/team_planner_project_include_spec.rb +++ b/modules/team_planner/spec/features/team_planner_project_include_spec.rb @@ -30,7 +30,10 @@ require "features/work_packages/project_include/project_include_shared_examples" require_relative "../support/pages/team_planner" -RSpec.describe "Team planner project include", :js, with_ee: %i[team_planner_view] do +RSpec.describe "Team planner project include", + :js, + :selenium, + with_ee: %i[team_planner_view] do shared_let(:enabled_modules) { %w[work_package_tracking team_planner_view] } shared_let(:permissions) do %w[view_work_packages edit_work_packages add_work_packages diff --git a/modules/team_planner/spec/features/team_planner_remove_event_spec.rb b/modules/team_planner/spec/features/team_planner_remove_event_spec.rb index d721790bf889..359a6fc57838 100644 --- a/modules/team_planner/spec/features/team_planner_remove_event_spec.rb +++ b/modules/team_planner/spec/features/team_planner_remove_event_spec.rb @@ -32,6 +32,7 @@ RSpec.describe "Team planner remove event", :js, + :selenium, with_ee: %i[team_planner_view], with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_spec.rb b/modules/team_planner/spec/features/team_planner_spec.rb index b29c0e4304a9..986447e8ed7b 100644 --- a/modules/team_planner/spec/features/team_planner_spec.rb +++ b/modules/team_planner/spec/features/team_planner_spec.rb @@ -31,6 +31,7 @@ RSpec.describe "Team planner", :js, + :selenium, with_ee: %i[team_planner_view], with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_split_view_spec.rb b/modules/team_planner/spec/features/team_planner_split_view_spec.rb index 25f0ae4d7bb6..8e640829d994 100644 --- a/modules/team_planner/spec/features/team_planner_split_view_spec.rb +++ b/modules/team_planner/spec/features/team_planner_split_view_spec.rb @@ -29,7 +29,10 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner split view navigation", :js, with_ee: %i[team_planner_view] do +RSpec.describe "Team planner split view navigation", + :js, + :selenium, + with_ee: %i[team_planner_view] do include_context "with team planner full access" let!(:view) { create(:view_team_planner, query:) } diff --git a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb index 3322014b6469..f2edf7e04475 100644 --- a/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb +++ b/modules/team_planner/spec/features/team_planner_subproject_constraints_spec.rb @@ -31,6 +31,7 @@ RSpec.describe "Team planner constraints for a subproject", :js, + :selenium, with_ee: %i[team_planner_view], with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_upsale_spec.rb b/modules/team_planner/spec/features/team_planner_upsale_spec.rb index 81bf688aa86e..f749e01aa914 100644 --- a/modules/team_planner/spec/features/team_planner_upsale_spec.rb +++ b/modules/team_planner/spec/features/team_planner_upsale_spec.rb @@ -29,7 +29,9 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner index", :js, :with_cuprite do +RSpec.describe "Team planner index", + :js, + :selenium do include_context "with team planner full access" let(:current_user) { user } diff --git a/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb b/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb index 6e2ce202f32e..416f2800db9b 100644 --- a/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb +++ b/modules/team_planner/spec/features/team_planner_user_interaction_spec.rb @@ -31,6 +31,7 @@ RSpec.describe "Team planner drag&dop and resizing", :js, + :selenium, with_ee: %i[team_planner_view], with_settings: { start_of_week: 1 } do include_context "with team planner full access" diff --git a/modules/team_planner/spec/features/team_planner_view_modes_spec.rb b/modules/team_planner/spec/features/team_planner_view_modes_spec.rb index ac1a83a201a4..c7e19f938989 100644 --- a/modules/team_planner/spec/features/team_planner_view_modes_spec.rb +++ b/modules/team_planner/spec/features/team_planner_view_modes_spec.rb @@ -29,7 +29,10 @@ require "spec_helper" require_relative "shared_context" -RSpec.describe "Team planner", :js, with_ee: %i[team_planner_view] do +RSpec.describe "Team planner", + :js, + :selenium, + with_ee: %i[team_planner_view] do include_context "with team planner full access" it "allows switching of view modes", with_settings: { working_days: [1, 2, 3, 4, 5] } do diff --git a/modules/two_factor_authentication/config/locales/crowdin/js-tr.yml b/modules/two_factor_authentication/config/locales/crowdin/js-tr.yml index 361d11d117f3..6387a12d8b9b 100644 --- a/modules/two_factor_authentication/config/locales/crowdin/js-tr.yml +++ b/modules/two_factor_authentication/config/locales/crowdin/js-tr.yml @@ -23,4 +23,4 @@ tr: js: two_factor_authentication: errors: - aborted: "The authentication was cancelled. Please try again." + aborted: "Kimlik doğrulama iptal edildi. Lütfen tekrar deneyin." diff --git a/modules/two_factor_authentication/config/locales/crowdin/tr.yml b/modules/two_factor_authentication/config/locales/crowdin/tr.yml index 2000835bb3e9..2cf3856e8a3b 100644 --- a/modules/two_factor_authentication/config/locales/crowdin/tr.yml +++ b/modules/two_factor_authentication/config/locales/crowdin/tr.yml @@ -1,9 +1,9 @@ #English strings go here for Rails i18n tr: plugin_openproject_two_factor_authentication: - name: "OpenProject Two-factor authentication" + name: "OpenProject İki faktörlü kimlik doğrulama" description: >- - This OpenProject plugin authenticates your users using two-factor authentication by means of one-time password through the TOTP standard (Google Authenticator) or sent to the user's cell phone via SMS or voice call. + Bu OpenProject eklentisi, TOTP standardı (Google Authenticator) kullanılarak tek seferlik şifre aracılığıyla veya SMS veya sesli arama yoluyla kullanıcının cep telefonuna gönderilen iki faktörlü kimlik doğrulama kullanarak kullanıcılarınızın kimliğini doğrular. activerecord: attributes: two_factor_authentication/device: @@ -26,7 +26,7 @@ tr: two_factor_authentication/device/webauthn: "WebAuthn" two_factor_authentication: error_2fa_disabled: "2FA teslimi devre dışı bırakıldı." - notice_not_writable: "2FA Settings were provided through environment variables and cannot be overwritten." + notice_not_writable: "2FA Ayarları ortam değişkenleri aracılığıyla sağlanmıştır ve üzerine yazılamaz." error_no_device: "Bu örnek için gerekli olmasına rağmen, bu kullanıcı için kayıtlı 2FA cihazı bulunamadı." error_no_matching_strategy: "Bu kullanıcı için eşleşen 2FA stratejisi yok. Lütfen yöneticinize başvurun." error_is_enforced_not_active: "Yapılandırma hatası: İki faktörlü kimlik doğrulama zorlandı, ancak etkin stratejiler mevcut değil." @@ -75,9 +75,9 @@ tr: delete_all_are_you_sure: "Bu kullanıcı için tüm 2FA cihazlarını silmek istediğinize emin misiniz?" button_delete_all_devices: "Kayıtlı 2FA cihazlarını sil" button_register_mobile_phone_for_user: "Cep telefonunu kaydet" - text_2fa_enabled: "Upon every login, this user will be requested to enter a OTP token from their default 2FA device." + text_2fa_enabled: "Her girişte bu kullanıcının varsayılan 2FA cihazından bir OTP belirtecini girmesi istenir." text_2fa_disabled: "Kullanıcı 'Hesabım sayfası' üzerinden bir 2FA cihazı ayarlamadı" - only_sms_allowed: "Only SMS delivery can be set up for other users." + only_sms_allowed: "Diğer kullanıcılar için yalnızca SMS gönderimi ayarlanabilir." upsale: title: "İki aşamalı kimlik doğrulama" description: "Tüm proje üyelerine iki faktörlü kimlik doğrulama sunarak (veya zorunlu kılarak) OpenProject bulut sunucunuzun güvenliğini güçlendirin." @@ -115,14 +115,14 @@ tr: failed_to_delete: "2FA cihazı silinemedi." is_default_cannot_delete: "Cihaz varsayılan olarak işaretlenmiştir ve aktif bir güvenlik politikası nedeniyle silinemez. Silmeden önce başka bir cihazı varsayılan olarak işaretleyin." not_existing: "Hesabınız için 2FA cihazı kayıtlı değil." - 2fa_from_input: Please enter the code from your %{device_name} to verify your identity. - 2fa_from_webauthn: Please provide the WebAuthn device %{device_name}. If it is USB based make sure to plug it in and touch it. Then click the sign in button. + 2fa_from_input: Kimliğinizi doğrulamak için lütfen %{device_name} cihazından kod girin. + 2fa_from_webauthn: Lütfen WebAuthn cihazını %{device_name} sağlayın. USB tabanlı ise cihazınız taktığınızdan ve dokunduğunuzdan emin olun. Ardından oturum açma düğmesine tıklayın. webauthn: title: "WebAuthn" description: Register a FIDO2 device (like YubiKey) or the secure encalve of your mobile device. - further_steps: After you have chosen a name, you can click the Continue button. Your browser will prompt you to present your WebAuthn device. When you have done so, you are done registering the device. + further_steps: Bir isim seçtikten sonra Devam düğmesine tıklayabilirsiniz. Tarayıcınız sizden WebAuthn cihazınızı göstermenizi isteyecektir. Bunu yaptığınızda, cihazın kaydını tamamlamış olursunuz. totp: - title: "App-based authenticator" + title: "Uygulama tabanlı kimlik doğrulayıcı" provisioning_uri: "Kurulum adresi" secret_key: "Gizli anahtar" time_based: "Zaman bazlı" @@ -137,11 +137,11 @@ tr: description: | Authy veya Google Authenticator gibi bir kimlik doğrulayıcı tarafından oluşturulan tek seferlik bir kod kullanın. sms: - title: "Mobile device" + title: "Mobil cihaz" redacted_identifier: "Mobil cihaz (%{redacted_number})" request_2fa_identifier: "%{redacted_identifier}, size %{delivery_channel} üzerinden bir kimlik doğrulama kodu gönderdik " description: | - Receive 2FA code via a text message on your phone each time you log in. + Her oturum açtığınızda telefonunuza kısa mesaj yoluyla 2FA kodu alın. sns: delivery_failed: "SNS teslimi başarısız oldu:" message_bird: diff --git a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec index c0cb74181ac2..727bd204b1df 100644 --- a/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec +++ b/modules/two_factor_authentication/openproject-two_factor_authentication.gemspec @@ -14,6 +14,6 @@ Gem::Specification.new do |s| s.add_dependency "rotp", "~> 6.1" s.add_dependency "webauthn", "~> 3.0" - s.add_dependency "aws-sdk-sns", "~> 1.92.0" + s.add_dependency "aws-sdk-sns", "~> 1.94.0" s.metadata["rubygems_mfa_required"] = "true" end diff --git a/modules/two_factor_authentication/spec/features/account_activation_spec.rb b/modules/two_factor_authentication/spec/features/account_activation_spec.rb index a9a2a406c0c8..5f48bd397108 100644 --- a/modules/two_factor_authentication/spec/features/account_activation_spec.rb +++ b/modules/two_factor_authentication/spec/features/account_activation_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "activating an invited account", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => [:developer] } } do diff --git a/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb b/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb index 1166c3987a9f..5fe4bad5d5f0 100644 --- a/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb +++ b/modules/two_factor_authentication/spec/features/admin_edit_two_factor_devices_spec.rb @@ -1,6 +1,6 @@ require_relative "../spec_helper" -RSpec.describe "Admin 2FA management", :js, with_settings: { +RSpec.describe "Admin 2FA management", :js, :selenium, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => %i[developer totp] } } do let(:dialog) { Components::PasswordConfirmationDialog.new } diff --git a/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb b/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb index f858e7f7aae1..49f20c26e90b 100644 --- a/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb +++ b/modules/two_factor_authentication/spec/features/backup_codes/login_with_backup_code_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login with 2FA backup code", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => [:developer] } } do diff --git a/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb b/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb index 1e2dc96b06c7..01cb543d5250 100644 --- a/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb +++ b/modules/two_factor_authentication/spec/features/login/login_enforced_2fa_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login with enforced 2FA", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => [:developer], diff --git a/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb b/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb index 3b38562cad37..0e0b099067f4 100644 --- a/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb +++ b/modules/two_factor_authentication/spec/features/login/login_with_2fa_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login with 2FA device", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => [:developer] diff --git a/modules/two_factor_authentication/spec/features/login/login_with_deleted_2fa_spec.rb b/modules/two_factor_authentication/spec/features/login/login_with_deleted_2fa_spec.rb index 6eed2c36addc..56a3b7487396 100644 --- a/modules/two_factor_authentication/spec/features/login/login_with_deleted_2fa_spec.rb +++ b/modules/two_factor_authentication/spec/features/login/login_with_deleted_2fa_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login after 2FA deleted 2FA was deleted (REGRESSION)", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => %i[developer totp] diff --git a/modules/two_factor_authentication/spec/features/login/login_without_2fa_spec.rb b/modules/two_factor_authentication/spec/features/login/login_without_2fa_spec.rb index f68745efbd87..6ae5091bce34 100644 --- a/modules/two_factor_authentication/spec/features/login/login_without_2fa_spec.rb +++ b/modules/two_factor_authentication/spec/features/login/login_without_2fa_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login with no required OTP", :js, - :with_cuprite, with_config: { "2fa": { active_strategies: [:developer] } } do include SharedTwoFactorExamples let(:user_password) { "bob!" * 4 } diff --git a/modules/two_factor_authentication/spec/features/login/switch_available_devices_spec.rb b/modules/two_factor_authentication/spec/features/login/switch_available_devices_spec.rb index a5ff551ac6ce..070f751864e9 100644 --- a/modules/two_factor_authentication/spec/features/login/switch_available_devices_spec.rb +++ b/modules/two_factor_authentication/spec/features/login/switch_available_devices_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login by switching 2FA device", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => %i[developer totp] } } do diff --git a/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb b/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb index ae343baaa2a2..e14e3c8e7b4b 100644 --- a/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb +++ b/modules/two_factor_authentication/spec/features/my_two_factor_devices_spec.rb @@ -2,7 +2,6 @@ RSpec.describe "My Account 2FA configuration", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { "active_strategies" => %i[developer totp] } } do diff --git a/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb b/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb index c936c8d58c9c..60a0a7c928ef 100644 --- a/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb +++ b/modules/two_factor_authentication/spec/features/remember_cookie/login_with_remember_cookie_spec.rb @@ -3,7 +3,6 @@ RSpec.describe "Login with 2FA remember cookie", :js, - :with_cuprite, with_settings: { plugin_openproject_two_factor_authentication: { active_strategies: [:developer], diff --git a/modules/two_factor_authentication/spec/features/shared_two_factor_examples.rb b/modules/two_factor_authentication/spec/features/shared_two_factor_examples.rb index 3ef56d75a8af..4e9d97989b27 100644 --- a/modules/two_factor_authentication/spec/features/shared_two_factor_examples.rb +++ b/modules/two_factor_authentication/spec/features/shared_two_factor_examples.rb @@ -24,8 +24,8 @@ def two_factor_step(token) end def expect_logged_in - visit my_account_path wait_for_network_idle + visit my_account_path expect(page).to have_css(".form--field-container", text: user.login) end @@ -84,7 +84,7 @@ def expect_not_logged_in expect_flash(type: :error, message: I18n.t("two_factor_authentication.devices.registration_failed_token_invalid")) SeleniumHubWaiter.wait - # Fill in wrong token + # Fill in correct token fill_in "otp", with: sms_token click_button I18n.t(:button_continue) diff --git a/modules/webhooks/config/locales/crowdin/af.yml b/modules/webhooks/config/locales/crowdin/af.yml index 6a03e2d40c2f..5afda875f9d3 100644 --- a/modules/webhooks/config/locales/crowdin/af.yml +++ b/modules/webhooks/config/locales/crowdin/af.yml @@ -8,6 +8,7 @@ af: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/ar.yml b/modules/webhooks/config/locales/crowdin/ar.yml index 8abf55004011..c5eac74f7d81 100644 --- a/modules/webhooks/config/locales/crowdin/ar.yml +++ b/modules/webhooks/config/locales/crowdin/ar.yml @@ -8,6 +8,7 @@ ar: url: 'Payload URL' secret: 'Signature secret' events: 'الأحداث' + enabled: 'Enabled' projects: 'المشاريع الممكنة' webhooks/log: event_name: 'اسم الحدث' diff --git a/modules/webhooks/config/locales/crowdin/az.yml b/modules/webhooks/config/locales/crowdin/az.yml index b9962a4577b5..81bdd102b27d 100644 --- a/modules/webhooks/config/locales/crowdin/az.yml +++ b/modules/webhooks/config/locales/crowdin/az.yml @@ -8,6 +8,7 @@ az: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/be.yml b/modules/webhooks/config/locales/crowdin/be.yml index f94242b750b7..0f4c22613eca 100644 --- a/modules/webhooks/config/locales/crowdin/be.yml +++ b/modules/webhooks/config/locales/crowdin/be.yml @@ -8,6 +8,7 @@ be: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/bg.yml b/modules/webhooks/config/locales/crowdin/bg.yml index b512e03b7345..0f41790c493f 100644 --- a/modules/webhooks/config/locales/crowdin/bg.yml +++ b/modules/webhooks/config/locales/crowdin/bg.yml @@ -8,6 +8,7 @@ bg: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Активирани проекти' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/ca.yml b/modules/webhooks/config/locales/crowdin/ca.yml index 0c44bfc05ada..807d1cfbc90d 100644 --- a/modules/webhooks/config/locales/crowdin/ca.yml +++ b/modules/webhooks/config/locales/crowdin/ca.yml @@ -8,6 +8,7 @@ ca: url: 'URL de càrrega' secret: 'Signatura secreta' events: 'Esdeveniments' + enabled: 'Enabled' projects: 'Projectes habilitats' webhooks/log: event_name: 'Nom de l''esdeveniment' diff --git a/modules/webhooks/config/locales/crowdin/ckb-IR.yml b/modules/webhooks/config/locales/crowdin/ckb-IR.yml index 4b4a35817fec..bb567ee17605 100644 --- a/modules/webhooks/config/locales/crowdin/ckb-IR.yml +++ b/modules/webhooks/config/locales/crowdin/ckb-IR.yml @@ -8,6 +8,7 @@ ckb-IR: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/cs.yml b/modules/webhooks/config/locales/crowdin/cs.yml index 81aa48fffca7..2fa72cdc0dd0 100644 --- a/modules/webhooks/config/locales/crowdin/cs.yml +++ b/modules/webhooks/config/locales/crowdin/cs.yml @@ -8,6 +8,7 @@ cs: url: "Payload URL\n" secret: 'Tajný podpis' events: 'Události' + enabled: 'Zapnuto' projects: 'Povolené projekty' webhooks/log: event_name: 'Název události' diff --git a/modules/webhooks/config/locales/crowdin/da.yml b/modules/webhooks/config/locales/crowdin/da.yml index 47b6972f8a73..3d4f49920176 100644 --- a/modules/webhooks/config/locales/crowdin/da.yml +++ b/modules/webhooks/config/locales/crowdin/da.yml @@ -8,6 +8,7 @@ da: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/de.yml b/modules/webhooks/config/locales/crowdin/de.yml index 34dd2558fc1c..e206f66cf920 100644 --- a/modules/webhooks/config/locales/crowdin/de.yml +++ b/modules/webhooks/config/locales/crowdin/de.yml @@ -8,6 +8,7 @@ de: url: 'Payload-URL' secret: 'Schlüssel für Signatur' events: 'Ereignisse' + enabled: 'Aktiviert' projects: 'Aktivierte Projekte' webhooks/log: event_name: 'Ereignisname' diff --git a/modules/webhooks/config/locales/crowdin/el.yml b/modules/webhooks/config/locales/crowdin/el.yml index dcca51e0da9d..fd4b55023850 100644 --- a/modules/webhooks/config/locales/crowdin/el.yml +++ b/modules/webhooks/config/locales/crowdin/el.yml @@ -8,6 +8,7 @@ el: url: 'Payload URL' secret: 'Κρυφή υπογραφή' events: 'Συμβάντα' + enabled: 'Enabled' projects: 'Ενεργοποιημένα έργα' webhooks/log: event_name: 'Όνομα συμβάντος' diff --git a/modules/webhooks/config/locales/crowdin/eo.yml b/modules/webhooks/config/locales/crowdin/eo.yml index 9ad576de09ab..086cd2343c02 100644 --- a/modules/webhooks/config/locales/crowdin/eo.yml +++ b/modules/webhooks/config/locales/crowdin/eo.yml @@ -8,6 +8,7 @@ eo: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Ŝaltitaj projektoj' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/es.yml b/modules/webhooks/config/locales/crowdin/es.yml index 3edd79a756d3..5f9db72caa69 100644 --- a/modules/webhooks/config/locales/crowdin/es.yml +++ b/modules/webhooks/config/locales/crowdin/es.yml @@ -8,6 +8,7 @@ es: url: 'URL de carga' secret: 'Secreto de firma' events: 'Eventos' + enabled: 'Activado' projects: 'Proyectos habilitados' webhooks/log: event_name: 'Nombre del evento' diff --git a/modules/webhooks/config/locales/crowdin/et.yml b/modules/webhooks/config/locales/crowdin/et.yml index ac207b2d0414..2716c61660a3 100644 --- a/modules/webhooks/config/locales/crowdin/et.yml +++ b/modules/webhooks/config/locales/crowdin/et.yml @@ -8,6 +8,7 @@ et: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Lubatud projektid' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/eu.yml b/modules/webhooks/config/locales/crowdin/eu.yml index 3e7ae9486ba1..cbe7656220b2 100644 --- a/modules/webhooks/config/locales/crowdin/eu.yml +++ b/modules/webhooks/config/locales/crowdin/eu.yml @@ -8,6 +8,7 @@ eu: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/fa.yml b/modules/webhooks/config/locales/crowdin/fa.yml index 78ed4b9a17d9..6f61cc7544a3 100644 --- a/modules/webhooks/config/locales/crowdin/fa.yml +++ b/modules/webhooks/config/locales/crowdin/fa.yml @@ -8,6 +8,7 @@ fa: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/fi.yml b/modules/webhooks/config/locales/crowdin/fi.yml index 573bbf096611..d62dd8f08044 100644 --- a/modules/webhooks/config/locales/crowdin/fi.yml +++ b/modules/webhooks/config/locales/crowdin/fi.yml @@ -8,6 +8,7 @@ fi: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/fil.yml b/modules/webhooks/config/locales/crowdin/fil.yml index 3db1dd960b08..42a39195dbf5 100644 --- a/modules/webhooks/config/locales/crowdin/fil.yml +++ b/modules/webhooks/config/locales/crowdin/fil.yml @@ -8,6 +8,7 @@ fil: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Paganahin ang mga proyekto' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/fr.yml b/modules/webhooks/config/locales/crowdin/fr.yml index c9c4d3144364..228a258fe8e5 100644 --- a/modules/webhooks/config/locales/crowdin/fr.yml +++ b/modules/webhooks/config/locales/crowdin/fr.yml @@ -8,6 +8,7 @@ fr: url: 'URL de payload' secret: 'Secret de la signature' events: 'Événements' + enabled: 'Activé' projects: 'Projets activés' webhooks/log: event_name: 'Nom de l''événement' diff --git a/modules/webhooks/config/locales/crowdin/he.yml b/modules/webhooks/config/locales/crowdin/he.yml index daf56443bdfb..f205cf9847d7 100644 --- a/modules/webhooks/config/locales/crowdin/he.yml +++ b/modules/webhooks/config/locales/crowdin/he.yml @@ -8,6 +8,7 @@ he: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/hi.yml b/modules/webhooks/config/locales/crowdin/hi.yml index d90b06cb83a2..e64ee9127ad5 100644 --- a/modules/webhooks/config/locales/crowdin/hi.yml +++ b/modules/webhooks/config/locales/crowdin/hi.yml @@ -8,6 +8,7 @@ hi: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/hr.yml b/modules/webhooks/config/locales/crowdin/hr.yml index aa1a6cad731f..181f7750d9fb 100644 --- a/modules/webhooks/config/locales/crowdin/hr.yml +++ b/modules/webhooks/config/locales/crowdin/hr.yml @@ -8,6 +8,7 @@ hr: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Omogućeni projekti' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/hu.yml b/modules/webhooks/config/locales/crowdin/hu.yml index 552c3b69ccee..e726fbc482b1 100644 --- a/modules/webhooks/config/locales/crowdin/hu.yml +++ b/modules/webhooks/config/locales/crowdin/hu.yml @@ -8,6 +8,7 @@ hu: url: 'Tartalom URL-címe' secret: 'titkos aláírás' events: 'Események' + enabled: 'Enabled' projects: 'Engedélyezett projektek' webhooks/log: event_name: 'Esemény neve' diff --git a/modules/webhooks/config/locales/crowdin/id.yml b/modules/webhooks/config/locales/crowdin/id.yml index a64a12a33a93..b719693c8c8c 100644 --- a/modules/webhooks/config/locales/crowdin/id.yml +++ b/modules/webhooks/config/locales/crowdin/id.yml @@ -8,6 +8,7 @@ id: url: 'URL muatan' secret: 'Rahasia tanda tangan' events: 'Acara' + enabled: 'Enabled' projects: 'Proyek-proyek yang diaktifkan' webhooks/log: event_name: 'Nama acara' diff --git a/modules/webhooks/config/locales/crowdin/it.yml b/modules/webhooks/config/locales/crowdin/it.yml index f540b0a04783..c8dcb71fada1 100644 --- a/modules/webhooks/config/locales/crowdin/it.yml +++ b/modules/webhooks/config/locales/crowdin/it.yml @@ -8,6 +8,7 @@ it: url: 'URL Payload' secret: 'Firma segreta' events: 'Eventi' + enabled: 'Abilitato' projects: 'Progetti abilitati' webhooks/log: event_name: 'Nome dell''evento' diff --git a/modules/webhooks/config/locales/crowdin/ja.yml b/modules/webhooks/config/locales/crowdin/ja.yml index 2138cf869cea..40a4d249d917 100644 --- a/modules/webhooks/config/locales/crowdin/ja.yml +++ b/modules/webhooks/config/locales/crowdin/ja.yml @@ -8,6 +8,7 @@ ja: url: 'ペイロード URL' secret: '署名シークレット' events: 'イベント' + enabled: 'Enabled' projects: '有効なプロジェクト' webhooks/log: event_name: 'イベント名' diff --git a/modules/webhooks/config/locales/crowdin/ka.yml b/modules/webhooks/config/locales/crowdin/ka.yml index fde07e70e794..57b0b968d16d 100644 --- a/modules/webhooks/config/locales/crowdin/ka.yml +++ b/modules/webhooks/config/locales/crowdin/ka.yml @@ -8,6 +8,7 @@ ka: url: 'ჩასატვირთი URL' secret: 'Signature secret' events: 'მოვლენები' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'მოვლენის სახელი' diff --git a/modules/webhooks/config/locales/crowdin/kk.yml b/modules/webhooks/config/locales/crowdin/kk.yml index 4930daca38b2..8df2e195e94f 100644 --- a/modules/webhooks/config/locales/crowdin/kk.yml +++ b/modules/webhooks/config/locales/crowdin/kk.yml @@ -8,6 +8,7 @@ kk: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/ko.yml b/modules/webhooks/config/locales/crowdin/ko.yml index cec81dac639c..276a545d4011 100644 --- a/modules/webhooks/config/locales/crowdin/ko.yml +++ b/modules/webhooks/config/locales/crowdin/ko.yml @@ -8,6 +8,7 @@ ko: url: '페이로드 URL' secret: '서명 비밀번호' events: '이벤트' + enabled: '활성화됨' projects: '활성화 된 프로젝트' webhooks/log: event_name: '이벤트 이름' diff --git a/modules/webhooks/config/locales/crowdin/lt.yml b/modules/webhooks/config/locales/crowdin/lt.yml index 0aa7e2f0ac29..da96be6f976b 100644 --- a/modules/webhooks/config/locales/crowdin/lt.yml +++ b/modules/webhooks/config/locales/crowdin/lt.yml @@ -8,6 +8,7 @@ lt: url: '„Krovinio“ URL' secret: 'Parašo paslaptis' events: 'Įvykiai' + enabled: 'Enabled' projects: 'Įgalinti projektai' webhooks/log: event_name: 'Įvykio pavadinimas' diff --git a/modules/webhooks/config/locales/crowdin/lv.yml b/modules/webhooks/config/locales/crowdin/lv.yml index c8185428efda..fa2e9262378f 100644 --- a/modules/webhooks/config/locales/crowdin/lv.yml +++ b/modules/webhooks/config/locales/crowdin/lv.yml @@ -8,6 +8,7 @@ lv: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/mn.yml b/modules/webhooks/config/locales/crowdin/mn.yml index f91847701381..bd524bd53ff4 100644 --- a/modules/webhooks/config/locales/crowdin/mn.yml +++ b/modules/webhooks/config/locales/crowdin/mn.yml @@ -8,6 +8,7 @@ mn: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/ms.yml b/modules/webhooks/config/locales/crowdin/ms.yml index bac876f94764..53992e2ea547 100644 --- a/modules/webhooks/config/locales/crowdin/ms.yml +++ b/modules/webhooks/config/locales/crowdin/ms.yml @@ -8,6 +8,7 @@ ms: url: 'Muatan URL' secret: 'Rahsia tandatangan' events: 'Peristiwa' + enabled: 'Didayakan' projects: 'Projek yang didayakan' webhooks/log: event_name: 'Nama peristiwa' diff --git a/modules/webhooks/config/locales/crowdin/ne.yml b/modules/webhooks/config/locales/crowdin/ne.yml index 7bab1dcaa33a..6c6b3cd8225d 100644 --- a/modules/webhooks/config/locales/crowdin/ne.yml +++ b/modules/webhooks/config/locales/crowdin/ne.yml @@ -8,6 +8,7 @@ ne: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/nl.yml b/modules/webhooks/config/locales/crowdin/nl.yml index 04fd1eda13a5..77562d474db2 100644 --- a/modules/webhooks/config/locales/crowdin/nl.yml +++ b/modules/webhooks/config/locales/crowdin/nl.yml @@ -8,6 +8,7 @@ nl: url: 'Payload URL' secret: 'Handtekening geheim' events: 'Evenementen' + enabled: 'Ingeschakeld' projects: 'Ingeschakelde projecten' webhooks/log: event_name: 'Naam van gebeurtenis' diff --git a/modules/webhooks/config/locales/crowdin/no.yml b/modules/webhooks/config/locales/crowdin/no.yml index 47bc3bb3c2fe..9089cb9d8e45 100644 --- a/modules/webhooks/config/locales/crowdin/no.yml +++ b/modules/webhooks/config/locales/crowdin/no.yml @@ -8,6 +8,7 @@ url: 'Nyttelast-URL' secret: 'Hemmelig signaturnøkkel' events: 'Hendelser' + enabled: 'Enabled' projects: 'Aktiverte prosjekter' webhooks/log: event_name: 'Navn på hendelse' diff --git a/modules/webhooks/config/locales/crowdin/pl.yml b/modules/webhooks/config/locales/crowdin/pl.yml index 4a137af1c42c..74ed474c7976 100644 --- a/modules/webhooks/config/locales/crowdin/pl.yml +++ b/modules/webhooks/config/locales/crowdin/pl.yml @@ -8,6 +8,7 @@ pl: url: 'URL do wywołania' secret: 'Tajny klucz podpisu' events: 'Zdarzenia' + enabled: 'Włączone' projects: 'Aktywne projekty' webhooks/log: event_name: 'Nazwa zdarzenia' diff --git a/modules/webhooks/config/locales/crowdin/pt-BR.yml b/modules/webhooks/config/locales/crowdin/pt-BR.yml index 0a3c5cba4673..8df34daaaf5c 100644 --- a/modules/webhooks/config/locales/crowdin/pt-BR.yml +++ b/modules/webhooks/config/locales/crowdin/pt-BR.yml @@ -8,6 +8,7 @@ pt-BR: url: 'URL do payload' secret: 'Assinatura secreta' events: 'Eventos' + enabled: 'Habilitada' projects: 'Projetos habilitados' webhooks/log: event_name: 'Nome do evento' diff --git a/modules/webhooks/config/locales/crowdin/pt-PT.yml b/modules/webhooks/config/locales/crowdin/pt-PT.yml index 1496aff7e003..7de0af5c974d 100644 --- a/modules/webhooks/config/locales/crowdin/pt-PT.yml +++ b/modules/webhooks/config/locales/crowdin/pt-PT.yml @@ -8,6 +8,7 @@ pt-PT: url: 'URL Payload' secret: 'Assinatura secreta' events: 'Eventos' + enabled: 'Ativada' projects: 'Projetos ativados' webhooks/log: event_name: 'Nome do evento' diff --git a/modules/webhooks/config/locales/crowdin/ro.yml b/modules/webhooks/config/locales/crowdin/ro.yml index b1a692b74937..e3a83d82ca49 100644 --- a/modules/webhooks/config/locales/crowdin/ro.yml +++ b/modules/webhooks/config/locales/crowdin/ro.yml @@ -8,6 +8,7 @@ ro: url: 'URL de încărcare utilă' secret: 'Secretul semnăturii' events: 'Evenimente' + enabled: 'Enabled' projects: 'Proiecte activate' webhooks/log: event_name: 'Numele evenimentului' diff --git a/modules/webhooks/config/locales/crowdin/ru.yml b/modules/webhooks/config/locales/crowdin/ru.yml index 781eee807797..42f38d16a861 100644 --- a/modules/webhooks/config/locales/crowdin/ru.yml +++ b/modules/webhooks/config/locales/crowdin/ru.yml @@ -8,6 +8,7 @@ ru: url: 'URL-адрес загрузки' secret: 'Секретный ключ-подпись' events: 'События' + enabled: 'Включено' projects: 'Доступные проекты' webhooks/log: event_name: 'Название события' diff --git a/modules/webhooks/config/locales/crowdin/rw.yml b/modules/webhooks/config/locales/crowdin/rw.yml index 3b1b1ea9c320..55646fc34b7a 100644 --- a/modules/webhooks/config/locales/crowdin/rw.yml +++ b/modules/webhooks/config/locales/crowdin/rw.yml @@ -8,6 +8,7 @@ rw: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/si.yml b/modules/webhooks/config/locales/crowdin/si.yml index ee9f1d570a60..6f9c395c1631 100644 --- a/modules/webhooks/config/locales/crowdin/si.yml +++ b/modules/webhooks/config/locales/crowdin/si.yml @@ -8,6 +8,7 @@ si: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'සබල කළ ව්‍යාපෘති' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/sk.yml b/modules/webhooks/config/locales/crowdin/sk.yml index fc9e185714de..53b8c461274a 100644 --- a/modules/webhooks/config/locales/crowdin/sk.yml +++ b/modules/webhooks/config/locales/crowdin/sk.yml @@ -8,6 +8,7 @@ sk: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Povolené projekty' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/sl.yml b/modules/webhooks/config/locales/crowdin/sl.yml index 174c1d3a9271..2f94d4e89799 100644 --- a/modules/webhooks/config/locales/crowdin/sl.yml +++ b/modules/webhooks/config/locales/crowdin/sl.yml @@ -8,6 +8,7 @@ sl: url: 'URL obremenitve' secret: 'Podpis skrivnost' events: 'Dogodki' + enabled: 'Enabled' projects: 'Omogočeni projekti' webhooks/log: event_name: 'Ime dogodka' diff --git a/modules/webhooks/config/locales/crowdin/sr.yml b/modules/webhooks/config/locales/crowdin/sr.yml index 2ede0dc8a3e6..53feedb2a75b 100644 --- a/modules/webhooks/config/locales/crowdin/sr.yml +++ b/modules/webhooks/config/locales/crowdin/sr.yml @@ -8,6 +8,7 @@ sr: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/sv.yml b/modules/webhooks/config/locales/crowdin/sv.yml index 1d72bb11beed..e93606de1af9 100644 --- a/modules/webhooks/config/locales/crowdin/sv.yml +++ b/modules/webhooks/config/locales/crowdin/sv.yml @@ -8,6 +8,7 @@ sv: url: 'Payload-URL' secret: 'Signeringshemlighet' events: 'Händelser' + enabled: 'Enabled' projects: 'Aktiverade projekt' webhooks/log: event_name: 'Händelsenamn' diff --git a/modules/webhooks/config/locales/crowdin/th.yml b/modules/webhooks/config/locales/crowdin/th.yml index 65b8be9591e3..847c77fc43c2 100644 --- a/modules/webhooks/config/locales/crowdin/th.yml +++ b/modules/webhooks/config/locales/crowdin/th.yml @@ -8,6 +8,7 @@ th: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/tr.yml b/modules/webhooks/config/locales/crowdin/tr.yml index d99c32420609..f42791f671f9 100644 --- a/modules/webhooks/config/locales/crowdin/tr.yml +++ b/modules/webhooks/config/locales/crowdin/tr.yml @@ -1,13 +1,14 @@ tr: plugin_openproject_webhooks: - name: "OpenProject Webhooks" - description: "Provides a plug-in API to support OpenProject webhooks for better 3rd party integration." + name: "OpenProject Webhookları" + description: "Daha iyi üçüncü parti entegrasyonu için OpenProject webhooklarını destekleyen bir eklenti API'si sağlar." activerecord: attributes: webhooks/webhook: url: 'Taşıma kapasitesi URL' secret: 'İmza sırrı' events: 'Etkinlikler' + enabled: 'Etkin' projects: 'Etkin projeler' webhooks/log: event_name: 'Etkinlik ismi' diff --git a/modules/webhooks/config/locales/crowdin/uk.yml b/modules/webhooks/config/locales/crowdin/uk.yml index c5e26f7a79c1..97ff83a988e1 100644 --- a/modules/webhooks/config/locales/crowdin/uk.yml +++ b/modules/webhooks/config/locales/crowdin/uk.yml @@ -8,6 +8,7 @@ uk: url: 'URL корисних даних' secret: 'Секретний ключ підпису' events: 'Події' + enabled: 'Увімкнено' projects: 'Включені проекти' webhooks/log: event_name: 'Назва події' diff --git a/modules/webhooks/config/locales/crowdin/uz.yml b/modules/webhooks/config/locales/crowdin/uz.yml index 583fe160df92..a386e16e463c 100644 --- a/modules/webhooks/config/locales/crowdin/uz.yml +++ b/modules/webhooks/config/locales/crowdin/uz.yml @@ -8,6 +8,7 @@ uz: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/config/locales/crowdin/vi.yml b/modules/webhooks/config/locales/crowdin/vi.yml index 0da66152319b..fb81bccb0568 100644 --- a/modules/webhooks/config/locales/crowdin/vi.yml +++ b/modules/webhooks/config/locales/crowdin/vi.yml @@ -8,6 +8,7 @@ vi: url: 'URL Payload' secret: 'Chữ ký bí mật' events: 'Sự kiện' + enabled: 'Đã kích hoạt' projects: 'Dự án được kích hoạt' webhooks/log: event_name: 'Tên sự kiện' diff --git a/modules/webhooks/config/locales/crowdin/zh-CN.yml b/modules/webhooks/config/locales/crowdin/zh-CN.yml index d304a1c78d41..e676a227480b 100644 --- a/modules/webhooks/config/locales/crowdin/zh-CN.yml +++ b/modules/webhooks/config/locales/crowdin/zh-CN.yml @@ -8,6 +8,7 @@ zh-CN: url: '有效载荷 URL' secret: '签名密钥' events: '事件' + enabled: '已启用' projects: '已启用的项目' webhooks/log: event_name: '事件名称' diff --git a/modules/webhooks/config/locales/crowdin/zh-TW.yml b/modules/webhooks/config/locales/crowdin/zh-TW.yml index 1d3a1f56a423..dcc2ed2f98ff 100644 --- a/modules/webhooks/config/locales/crowdin/zh-TW.yml +++ b/modules/webhooks/config/locales/crowdin/zh-TW.yml @@ -8,6 +8,7 @@ zh-TW: url: 'Payload URL' secret: '簽章金鑰' events: '事件' + enabled: '啟用' projects: '已啟用的專案' webhooks/log: event_name: '事件名稱' diff --git a/modules/webhooks/config/locales/en.yml b/modules/webhooks/config/locales/en.yml index 42aae29dc6e0..0031b174c4e9 100644 --- a/modules/webhooks/config/locales/en.yml +++ b/modules/webhooks/config/locales/en.yml @@ -9,6 +9,7 @@ en: url: 'Payload URL' secret: 'Signature secret' events: 'Events' + enabled: 'Enabled' projects: 'Enabled projects' webhooks/log: event_name: 'Event name' diff --git a/modules/webhooks/spec/features/manage_webhooks_spec.rb b/modules/webhooks/spec/features/manage_webhooks_spec.rb index 9df3b63b3488..03e68086d2d6 100644 --- a/modules/webhooks/spec/features/manage_webhooks_spec.rb +++ b/modules/webhooks/spec/features/manage_webhooks_spec.rb @@ -1,6 +1,6 @@ require "spec_helper" -RSpec.describe "Manage webhooks through UI", :js do +RSpec.describe "Manage webhooks through UI", :js, :selenium do before do login_as user end diff --git a/modules/xls_export/config/locales/crowdin/tr.yml b/modules/xls_export/config/locales/crowdin/tr.yml index 107b8ef7353e..482730583a84 100644 --- a/modules/xls_export/config/locales/crowdin/tr.yml +++ b/modules/xls_export/config/locales/crowdin/tr.yml @@ -1,7 +1,7 @@ tr: plugin_openproject_xls_export: - name: "OpenProject XLS Export" - description: "Export issue lists as Excel spreadsheets (.xls)." + name: "OpenProject XLS Dışa Aktarma" + description: "Sorun listelerini Excel elektronik tabloları (.xls) olarak dışa aktarın." export_to_excel: "XLS'yi dışa aktar" print_with_description: "Açıklama ile önizlemeyi yazdır" sentence_separator_or: "ya da" diff --git a/publiccode.yml b/publiccode.yml index ddb9056113ff..68fe59ac8436 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -7,21 +7,28 @@ name: OpenProject applicationSuite: openDesk url: 'https://github.com/opf/openproject' roadmap: 'https://www.openproject.org/roadmap' -releaseDate: '2025-02-05' -softwareVersion: '15.2.1' +releaseDate: '2025-02-19' +softwareVersion: '15.3.0' developmentStatus: stable softwareType: standalone/web +logo: '/app/assets/images/icon_logo.svg' platforms: - web usedBy: - - ZenDiS GmbH - - Stadt Köln - - Stadt Stuttgart - - Landtag Brandenburg + - Deutsches Museum - Europäische Kommission - Deutsche Bahn - FITKO + - Fraunhofer Institut + - Harvard University + - Helmholtz-Zentrum + - Landtag Brandenburg + - Mercedes-AMG - Stadt Chemnitz + - Stadt Köln + - Stadt Stuttgart + - ZenDiS GmbH + - ... categories: - agile-project-management - budgeting @@ -45,7 +52,7 @@ maintenance: email: sales@openproject.com phone: '+4928877707' legal: - license: LGPL-3.0-or-later + license: GPL-3.0-or-later mainCopyrightOwner: OpenProject GmbH repoOwner: OpenProject GmbH localisation: @@ -76,7 +83,7 @@ localisation: - lt - ms - nl - - no + - 'no' - pl - pt-BR - pt-PT @@ -97,93 +104,92 @@ description: localisedName: OpenProject documentation: 'https://www.openproject.org/docs' apiDocumentation: 'https://www.openproject.org/docs/api' - shortDescription: 'OpenProject is a web-based project management software' + shortDescription: Web-based project- and project portfolio management software screenshots: - - 'screenshots/opencode_openproject_file_storages.png' - - 'screenshots/opencode_openproject_gantt_chart.png' - - 'screenshots/opencode_openproject_gitlab-integration.png' - - 'screenshots/opencode_openproject_homepage.png' - - 'screenshots/opencode_openproject_meetings.png' - - 'screenshots/opencode_openproject_notifications_wp_reminder.png' - - 'screenshots/opencode_openproject_sharepoint_integration_details.png' - - 'screenshots/opencode_openproject_teamplanner.png' - - 'screenshots/opencode_openproject_work_package_detailed_view.png' + - screenshots/opencode_openproject_teamplanner.png + - screenshots/opencode_openproject_work_package_detailed_view.png + - screenshots/opencode_openproject_gantt_chart.png + - screenshots/opencode_openproject_meetings.png + - screenshots/opencode_openproject_notifications_wp_reminder.png + - screenshots/opencode_openproject_homepage.png + - screenshots/opencode_openproject_gitlab-integration.png + - screenshots/opencode_openproject_sharepoint_integration_details.png + - screenshots/opencode_openproject_file_storages.png features: - - Project planning + - Project planning and scheduling - Task management - - Agile workflows - - Meeting management - - Time and Cost tracking - - Collaboration + - Scrum and Kanban + - Meeting management (agenda and meeting minutes) + - Time and cost tracking - Gantt charts - - Agile boards - - Knowledge management - - Detailed reporting - - Customizable workflows - - Custom fields for projects, tasks, and more - - Baseline Comparison + - Wiki + - Project status reports + - Workflow management + - Baseline comparison - Integrations into Nextcloud and OneDrive/SharePoint - Integrations into GitHub and GitLab longDescription: > - OpenProject is the project management module of - [www.opendesk.eu](http://www.opendesk.eu/), an integrated office and - collaboration suite for the public sector. - - OpenProject supports project planning, task management, Agile workflows, - time tracking, and collaboration. Key features like Gantt charts, Scrum - and Kanban boards, and detailed reporting make it suitable for a variety - of projects and industries. + OpenProject is a web-based project management solution specifically + tailored to the needs of public administration. It supports project + planning, task management, Agile workflows, time tracking, and project + portfolio management. + The software can be deployed on an organization’s own infrastructure, ensuring that users retain full control over their data and systems. + + Additionally, the manufacturer offers hosting in a data center within the European Union in their [Enterprise Cloud](https://www.openproject.org/enterprise-edition/), which complies with the General Data Protection Regulation (GDPR). - OpenProject offers both cloud-based and self-hosted deployment options, - giving organizations flexibility in managing data security and operations. + OpenProject complies with the requirements of the [BSI IT-Grundschutz](https://www.bsi.bund.de/EN/Topics/ITGrundschutz/itgrundschutz_node.html) and is continuously tested against the WCAG 2.1 guidelines, as demonstrated in the [audit report](https://gitlab.opencode.de/bmi/opendesk/info/-/blob/main/24.03/Barrierefreiheit/Barrierefreiheitsbericht%20-%20Komponente%20Projekte.pdf). + OpenProject is fully compatible with the [German Administrative Cloud Strategy (DVS)](https://www.cio.bund.de/Webs/CIO/EN/digital-solutions/digital-sovereignty/german-administrative-cloud-strategy/german-administrative-cloud-strategy-node.html). - The software complies with BSI IT Grundschutz standards for accessibility - and security, making it reliable for industries with strict requirements. + OpenProject is part of the open-source office and collaboration suite + [openDesk](https://www.opendesk.eu). - - Its open-source nature ensures transparency and benefits from an active - community contributing to continuous improvement. + genericName: OpenProject de: localisedName: OpenProject documentation: 'https://www.openproject.org/de/docs/' apiDocumentation: 'https://www.openproject.org/de/docs/api' - shortDescription: 'OpenProject ist die führende Open Source Projektmanagement-Software' + shortDescription: Web-basierte Projekt-Management und Projektportfolio-Mangement Software screenshots: - - 'screenshots/opencode_openproject_file_storages.png' - - 'screenshots/opencode_openproject_gantt_chart.png' - - 'screenshots/opencode_openproject_gitlab-integration.png' - - 'screenshots/opencode_openproject_homepage.png' - - 'screenshots/opencode_openproject_meetings.png' - - 'screenshots/opencode_openproject_notifications_wp_reminder.png' - - 'screenshots/opencode_openproject_sharepoint_integration_details.png' - - 'screenshots/opencode_openproject_teamplanner.png' - - 'screenshots/opencode_openproject_work_package_detailed_view.png' + - screenshots/opencode_openproject_file_storages.png + - screenshots/opencode_openproject_gantt_chart.png + - screenshots/opencode_openproject_gitlab-integration.png + - screenshots/opencode_openproject_homepage.png + - screenshots/opencode_openproject_meetings.png + - screenshots/opencode_openproject_notifications_wp_reminder.png + - screenshots/opencode_openproject_sharepoint_integration_details.png + - screenshots/opencode_openproject_teamplanner.png + - screenshots/opencode_openproject_work_package_detailed_view.png features: - Projektplanung - Aufgabenverwaltung - - Agile Workflows - - Besprechungsmanagement + - Scrum und Kanban + - Besprechungsmanagement (Agenden und Protokolle) - Zeit- und Kostenverfolgung - - Online-Zusammenarbeit - Gantt-Diagramme - - Agile Boards - - Wissensmanagement - - Detaillierte Berichterstattung - - Anpassbare Workflows - - Selbstdefinierte Felder für Projekte, Aufgaben und mehr - - Grundlinie (Planungsvergleich) + - Wiki + - Projekt-Statusbereichte + - Workflows + - Planungsvergleiche und Baselines - Integration in Nextcloud sowie in OneDrive/SharePoint - Integration in GitHub und in GitLab longDescription: > - OpenProject ist das Projektmanagement-Modul von [www.opendesk.eu](http://www.opendesk.eu), einer integrierten Office- und Collaboration-Suite für den öffentlichen Sektor. - OpenProject unterstützt Ihre Projektplanung, Aufgabenmanagement, agile Workflows, Zeiterfassung und teamübergreifende Zusammenarbeit. Dank wichtiger Funktionen wie Gantt-Diagrammen, Scrum- und Kanban-Boards sowie detaillierter Berichterstellung eignet sich das Tool für eine Vielzahl von Projekten und Branchen. + OpenProject ist eine web-basierte Projektmanagement-Lösung, welche speziell auf die Anforderungen der öffentlichen Verwaltung zugeschnitten ist. Sie unterstützt Projektplanung, Aufgabenmanagement, agile Workflows, Zeiterfassung und Projektportfolio-Management. + + Die Software kann in der eigenen Infrastruktur betrieben werden, sodass einsetzende Organisationen die volle Kontrolle über ihre Daten behalten. + + Zusätzlich bietet der Hersteller in ihrer [Enterprise Cloud](https://www.openproject.org/de/enterprise-edition) ein Hosting in einem Rechenzentrum innerhalb der Europäischen Union an, das gemäß der Datenschutz-Grundverordnung (DS-GVO) erfolgt. - OpenProject bietet sowohl Cloud-basierte als auch selbst gehostete Bereitstellungsoptionen, wodurch Organisationen flexibel bei der Handhabung von Datensicherheit und -betrieb sind. + OpenProject entspricht den Anforderungen des [BSI + IT-Grundschutzes](https://www.bsi.bund.de/DE/Themen/ITGrundschutz/itgrundschutz_node.html) + und wird kontinuierlich auf Basis der WCAG 2.1-Richtlinien getestet, wie + im + [Prüfbericht](https://gitlab.opencode.de/bmi/opendesk/info/-/blob/main/24.03/Barrierefreiheit/Barrierefreiheitsbericht%20-%20Komponente%20Projekte.pdf) + dargestellt. - Die Software entspricht den BSI-IT-Grundschutz-Standards für Barrierefreiheit und Sicherheit und ist somit auch für Branchen mit besonders strengen Anforderungen geeignet. + OpenProject ist vollständig kompatibel mit der [Deutschen Verwaltungscloud-Strategie (DVS)](https://www.cio.bund.de/Webs/CIO/DE/digitale-loesungen/digitale-souveraenitaet/deutsche-verwaltungscloud-strategie/deutsche-verwaltungscloud-strategie-node.html). - Die Tatsache, dass es sich um eine Open Source Software handelt, sorgt für Transparenz und bietet den Vorteil einer aktiven Gemeinschaft, welche zur kontinuierlichen Produktverbesserung beiträgt. + OpenProject ist Teil der Open Source Office- und Kollaborationssuite [openDesk](https://www.opendesk.eu). diff --git a/script/check_same_primer_view_components_version_everywhere b/script/check_same_primer_view_components_version_everywhere new file mode 100755 index 000000000000..efa3253f42ad --- /dev/null +++ b/script/check_same_primer_view_components_version_everywhere @@ -0,0 +1,31 @@ +#!/bin/bash + +set -e + +VERSION_REGEXP='\d+\.\d+\.\d+(-[0-9A-Za-z-]+)?' + +echo "Checking for same primer view components version in Gemfile.lock and frontend/package.json" + +versions=$(grep --color=never primer.view.components frontend/package.json Gemfile.lock \ + | grep --extended-regexp --only-matching "$VERSION_REGEXP" \ + | sort --unique --version-sort) + +if [ -z "$versions" ] +then + echo "Skipping check. Unable to detect Primer view components version." + exit +fi + +version_count=$(echo "$versions" | wc -l) +if [ $version_count -eq 1 ] +then + echo "Ok. Primer view components version is $versions everywhere" + exit +fi + +grep --color=never primer.view.components frontend/package.json Gemfile.lock \ + | grep --color=always --extended-regexp "$VERSION_REGEXP" + +echo "Error. Different Primer view components versions are used ($(echo $versions))" +echo "Please use only one version in both Gemfile.lock and frontend/package.json" +exit 1 diff --git a/script/docs/check_links b/script/docs/check_links index 553eab0878a7..ccf1801e266b 100755 --- a/script/docs/check_links +++ b/script/docs/check_links @@ -1,4 +1,5 @@ #!/usr/bin/env ruby +# frozen_string_literal: true require "pathname" require "yaml" @@ -12,7 +13,7 @@ def parse_markdown(content) anchors = [] links = [] document.walk do |node| - if node.type == :link || node.type == :image + if %i[link image].include?(node.type) links.push({ url: node.url, pos: node.source_position, type: node.type }) elsif node.type == :header text = node.to_plaintext.delete("\n").tr(" ", " ") @@ -54,7 +55,7 @@ class APIChecker # adds infos for api pages which are generated out of the OpenAPI spec def api_pages - filename = Pathname(@root_path).join("api/apiv3/openapi-spec.yml") + filename = Pathname(@root_path).join("docs/api/apiv3/openapi-spec.yml") spec = YAML.load_file(filename) @operations = collect_operations_from_spec(spec) spec["tags"] @@ -71,18 +72,18 @@ class APIChecker def introduction_page(spec, filename) anchors, links = parse_markdown(spec["info"]["description"]) - { path: "#{@root_path}/api/introduction", anchors:, links:, filename: } + { path: "#{@root_path}/docs/api/introduction", anchors:, links:, filename: } end def markdown_page(path, destination) - filename = Pathname(@root_path).join(path).to_s + filename = Pathname(@root_path).join("docs/#{path}").to_s anchors, links = parse_markdown(File.read(filename)) - { path: "#{@root_path}/#{destination}", anchors:, links:, filename: } + { path: "#{@root_path}/docs/#{destination}", anchors:, links:, filename: } end def collect_operations_from_spec(spec) spec["paths"].map do |p| - path_obj_path = Pathname(@root_path).join("api/apiv3/", p[1]["$ref"]) + path_obj_path = Pathname(@root_path).join("docs/api/apiv3/", p[1]["$ref"]) path_obj = YAML.load_file(path_obj_path) path_obj.keys.map { |key| path_obj[key] } end.flatten @@ -95,13 +96,13 @@ class APIChecker end def api_page_by_tag(ref) - tag_source = Pathname(@root_path).join("api/apiv3", ref) + tag_source = Pathname(@root_path).join("docs/api/apiv3", ref) tag = YAML.load_file(tag_source) anchors, links, id_gen = parse_markdown(tag["description"]) anchors.concat(operation_ids_by_tag(tag, id_gen)) tag_path = ActiveSupport::Inflector.parameterize(tag["name"]) tag_path = "endpoints/#{tag_path}" unless PULLED_UP_TAG_PAGES.include?(tag_path) - { path: "#{@root_path}/api/#{tag_path}", anchors:, links:, filename: tag_source } + { path: "#{@root_path}/docs/api/#{tag_path}", anchors:, links:, filename: tag_source } end end @@ -127,7 +128,7 @@ class DocsChecker end def scan - @docs = Dir.glob("#{@root_path}/**/README.md") + @docs = Dir.glob("#{@root_path}/docs/**/README.md") .reject { |filename| filename.include?("/api/") } .map { |filename| build_doc(filename) } end @@ -139,11 +140,12 @@ class DocsChecker def add_virtual_pages # these pages are added by the website from other sources @docs.push( - { path: "#{@root_path}/api/v3/spec.json", anchors: [], links: [] }, - { path: "#{@root_path}/api/v3/spec.yml", anchors: [], links: [] }, - { path: "#{@root_path}/installation-and-operations/installation/docker-compose", anchors: [], links: [] }, - { path: "#{@root_path}/installation-and-operations/installation/helm-chart", anchors: [], links: [] }, - { path: "#{@root_path}/development/translate-openproject/fair-language", anchors: [], links: [] } + { path: "#{@root_path}/docs/api/v3/spec.json", anchors: [], links: [] }, + { path: "#{@root_path}/docs/api/v3/spec.yml", anchors: [], links: [] }, + { path: "#{@root_path}/docs/installation-and-operations/installation/docker-compose", anchors: [], links: [] }, + { path: "#{@root_path}/docs/installation-and-operations/installation/helm-chart", anchors: [], links: [] }, + { path: "#{@root_path}/docs/development/security", anchors: [], links: [] }, + { path: "#{@root_path}/docs/development/translate-openproject/fair-language", anchors: [], links: [] } ) end @@ -166,7 +168,7 @@ class DocsChecker def strip_external_link_to_doc(url, path) uri = URI(url) - full_path = File.expand_path(uri.path.sub("/docs", "."), @root_path) + full_path = File.expand_path(uri.path.sub("/docs", "./docs"), @root_path) relative_url = Pathname.new(full_path).relative_path_from("#{path}/").to_s return "#{relative_url}/##{uri.fragment}" unless uri.fragment.nil? @@ -195,6 +197,7 @@ class DocsChecker def check @errors = [] @docs.each { |doc| check_doc(doc) } + static_links.each { |link| check_static_link(link) } end def report @@ -210,6 +213,40 @@ class DocsChecker puts "Done. No broken references found." if @errors.empty? end + def static_links + yaml = File.read("#{@root_path}/config/static_links.yml") + link_map = YAML.safe_load(yaml, permitted_classes: [Symbol], symbolize_names: true) + extract_urls(link_map).map do |url| + { + url:, + pos: { + start_line: (yaml.lines.find_index { |l| l.match?(/#{url}(?:\s|\z|["'])/) } || 0) + 1, + start_column: 1 + }, + doc: { filename: "config/static_links.yml" } + } + end + end + + def extract_urls(nested_links) + nested_links.values.map do |h| + next h[:href] if h.key?(:href) + + extract_urls(h) + end.flatten + end + + def check_static_link(link) + uri = URI(link[:url]) + expected_path = File.expand_path(File.join(@root_path, uri.path)) + return if uri.host != "www.openproject.org" + return unless uri.path.start_with?("/docs/") # for now we can only test doc links + + target_doc = @docs.find { |d| d[:path] == expected_path } + + @errors.push({ error: "Page", link:, doc: link[:doc] }) if target_doc.nil? + end + def github_escape(str) str.gsub(/[%:\n\r]/, { "%" => "%25", "\n" => "%0A", "\r" => "%0D", ":" => "%3A" }).squeeze(" ") end @@ -243,5 +280,5 @@ class DocsChecker end exit 1 unless DocsChecker.new( - File.expand_path("../../docs/", __dir__) + File.expand_path("../../", __dir__) ).run diff --git a/script/pdf_export/generate_styles_doc b/script/pdf_export/generate_styles_doc index df4e7be55060..9c7fba9f58f3 100755 --- a/script/pdf_export/generate_styles_doc +++ b/script/pdf_export/generate_styles_doc @@ -5,6 +5,7 @@ require "md_to_pdf/style/schema_doc" require "yaml" require "json" +require "fileutils" root = File.expand_path("../../", __dir__) schema_file = File.join(root, "app", "models", "work_package", "pdf_export", "export", "schema.json") diff --git a/script/pdf_export/validate_styles b/script/pdf_export/validate_styles index 2f9d2af3a28a..0c70d044453e 100755 --- a/script/pdf_export/validate_styles +++ b/script/pdf_export/validate_styles @@ -10,8 +10,8 @@ class SchemaValidator def validate root = File.expand_path("../../", __dir__) - schema = JSON::load_file(File.join(root, "app", "models", "work_package", "pdf_export", "schema.json")) - styles_file = File.join(root, "app", "models", "work_package", "pdf_export", "standard.yml") + schema = JSON::load_file(File.join(root, "app", "models", "work_package", "pdf_export", "export", "schema.json")) + styles_file = File.join(root, "app", "models", "work_package", "pdf_export", "export", "standard.yml") styles = YAML.load_file(styles_file) validate_schema!(styles, schema) puts "Valid: #{styles_file}" diff --git a/spec/components/enterprise_edition/banner_component_spec.rb b/spec/components/enterprise_edition/banner_component_spec.rb index 4bdf58bb2692..a72eb6fce555 100644 --- a/spec/components/enterprise_edition/banner_component_spec.rb +++ b/spec/components/enterprise_edition/banner_component_spec.rb @@ -95,6 +95,7 @@ it "renders the component" do render_component_in_mo + expect(page).to have_test_selector("op-ee-banner-some-enterprise-feature") expect(page).to have_css ".op-ee-banner--title-container", text: title expect(page).to have_css ".op-ee-banner--description-container", text: description expect(page).to have_link link_title, href: diff --git a/spec/components/work_packages/activities_tab/journals/revision_component_spec.rb b/spec/components/work_packages/activities_tab/journals/revision_component_spec.rb new file mode 100644 index 000000000000..e982d7b84b05 --- /dev/null +++ b/spec/components/work_packages/activities_tab/journals/revision_component_spec.rb @@ -0,0 +1,85 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +# +require "spec_helper" + +RSpec.describe WorkPackages::ActivitiesTab::Journals::RevisionComponent, type: :component do + describe "#remove_email_addresses" do + let(:component) { described_class.new(changeset: build(:changeset), filter: nil) } + + def render_committer(committer) + component.remove_email_addresses(committer) + end + + it "escapes HTML tags" do + committer = "OP User " + result = render_committer(committer) + + expect(result.to_s).to eq("OP User") + expect(result.to_html).not_to include("