Maintenance: Improve source strings by using ellipsis rather than ...

2023-09-14 07:26:11 +02:00
parent 103714827c
commit 2a082f4d7e
12 changed files with 65 additions and 65 deletions
--- a/.github/workflows/ci/lint.sh
+++ b/.github/workflows/ci/lint.sh
@@ -8,21 +8,21 @@ source /etc/profile.d/rvm.sh
 # shellcheck disable=SC1091
 source .gitlab/environment.env

-echo "Checking .po file syntax..."
+echo "Checking .po file syntax…"
 for FILE in i18n/*.pot i18n/*.po; do echo "Checking $FILE"; msgfmt -o /dev/null -c "$FILE"; done
-echo "Checking .pot catalog consistency..."
+echo "Checking .pot catalog consistency…"
 bundle exec rails generate zammad:translation_catalog --check
-echo "Brakeman security check..."
+echo "Brakeman security check…"
 bundle exec brakeman -o /dev/stdout -o tmp/brakeman-report.html
-echo "Rails zeitwerk:check autoloader check..."
+echo "Rails zeitwerk:check autoloader check…"
 bundle exec rails zeitwerk:check
 .gitlab/check_graphql_api_consistency.sh
-echo "Rubocop check..."
+echo "Rubocop check…"
 bundle exec .rubocop/validate_todos.rb
 bundle exec rubocop --parallel
-echo "Coffeelint check..."
+echo "Coffeelint check…"
 coffeelint --rules ./.coffeelint/rules/* app/
-echo "Stylelint check..."
+echo "Stylelint check…"
 yarn lint:css
-echo "ESLint check..."
+echo "ESLint check…"
 yarn lint
--- a/.github/workflows/ci/test.sh
+++ b/.github/workflows/ci/test.sh
@@ -8,17 +8,17 @@ source /etc/profile.d/rvm.sh
 # shellcheck disable=SC1091
 source .gitlab/environment.env

-echo "Checking assets generation..."
+echo "Checking assets generation…"
 bundle exec rake assets:precompile

-echo "Running front end tests..."
+echo "Running front end tests…"
 yarn test
 yarn test:ci:ct

-echo "Running basic rspec tests..."
+echo "Running basic rspec tests…"
 bundle exec rake zammad:db:init
 bundle exec rspec --exclude-pattern "spec/system/**/*_spec.rb" -t ~searchindex -t ~integration -t ~required_envs

-echo "Running basic minitest tests..."
+echo "Running basic minitest tests…"
 bundle exec rake zammad:db:reset
 bundle exec rake test:units
--- a/.gitlab/check_database_migration_consistency.sh
+++ b/.gitlab/check_database_migration_consistency.sh
@@ -5,7 +5,7 @@ set -e
 TMP_FILE_BEFORE='./tmp/before-migration-dump.json'
 TMP_FILE_AFTER='./tmp/after-migration-dump.json'

-echo "Checking if data is still the same after migration..."
+echo "Checking if data is still the same after migration…"
 if ! cmp $TMP_FILE_BEFORE $TMP_FILE_AFTER
 then
  echo "Data mismatch after migration."
--- a/.gitlab/check_graphql_api_consistency.sh
+++ b/.gitlab/check_graphql_api_consistency.sh
@@ -15,7 +15,7 @@ function serialize_graphql_api() {
  cat $TYPES_FILE $API_FILES > $TARGET_FILE
 }

-echo "Checking if auto-generated GraphQL API is up-to-date..."
+echo "Checking if auto-generated GraphQL API is up-to-date…"
 serialize_graphql_api $TMP_FILE_BEFORE
 yarn generate-graphql-api
 serialize_graphql_api $TMP_FILE_AFTER
--- a/.gitlab/ci/lint.yml
+++ b/.gitlab/ci/lint.yml
@@ -39,15 +39,15 @@
    when: on_failure
  script:
    - !reference [.scripts, yarn_install]
-    - echo "Checking .po file syntax..."
+    - echo "Checking .po file syntax…"
    - for FILE in i18n/*.pot i18n/*.po; do echo "Checking $FILE"; msgfmt -o /dev/null -c $FILE; done
-    - echo "Checking .pot catalog consistency..."
+    - echo "Checking .pot catalog consistency…"
    - bundle exec rails generate zammad:translation_catalog --check
-    - echo "Checking consistency of Settings types file..."
+    - echo "Checking consistency of Settings types file…"
    - bundle exec rails generate zammad:setting_types --check
-    - echo "Brakeman security check..."
+    - echo "Brakeman security check…"
    - bundle exec brakeman -o /dev/stdout -o tmp/brakeman-report.html
-    - echo "Rails zeitwerk:check autoloader check..."
+    - echo "Rails zeitwerk:check autoloader check…"
    - bundle exec rails zeitwerk:check
    - .gitlab/check_graphql_api_consistency.sh

@@ -58,14 +58,14 @@
    - !reference [.scripts, source_rvm]
    - !reference [.scripts, bundle_install]
  script:
-    - echo "Rubocop check..."
+    - echo "Rubocop check…"
    - bundle exec .rubocop/validate_todos.rb
    - bundle exec rubocop --parallel
-    - echo "bundler-audit security check..."
+    - echo "bundler-audit security check…"
    - gem install bundler-audit
    - bundle-audit update
    - bundle-audit
-    - echo "Checking if chat assets need a rebuild..."
+    - echo "Checking if chat assets need a rebuild…"
    - echo "Please see public/assets/chat/README.md for build instructions."
    - cp public/assets/chat/chat.js tmp/chat.js
    - yarn install --cwd public/assets/chat
@@ -83,9 +83,9 @@
  before_script:
    - !reference [.scripts, yarn_install]
  script:
-    - echo "Coffeelint check..."
+    - echo "Coffeelint check…"
    - coffeelint --rules ./.coffeelint/rules/* app/
-    - echo "Stylelint check..."
+    - echo "Stylelint check…"
    - yarn lint:css

 'lint: js':
@@ -100,10 +100,10 @@
  script:
    - echo "Checking if yarn.lock is up-to-date"
    - "if ! diff yarn.lock tmp/yarn.lock; then echo 'Error: yarn.lock is not up-to-date'; exit 1; fi"
-    - echo "ESLint check..."
+    - echo "ESLint check…"
    - yarn lint
    # Currently unused, skip to save time...
-    # - echo "Histoire test build..."
+    # - echo "Histoire test build…"
    # - yarn story:build

 # Must be a separate job because it may fail and is only executed manually.
--- a/.gitlab/ci/test/frontend.yml
+++ b/.gitlab/ci/test/frontend.yml
@@ -7,7 +7,7 @@ frontend:vitest:
    - !reference [.scripts, yarn_install]
  script:
    - yarn test
-    - echo "Also test eslint-plugin-zammad..."
+    - echo "Also test eslint-plugin-zammad…"
    - cd .eslint-plugin-zammad
    - yarn install || yarn install || yarn install # retry on errors
    - yarn test
--- a/.overcommit.sh
+++ b/.overcommit.sh
@@ -5,10 +5,10 @@ set -eu
 # Don't require redis.
 export ZAMMAD_SAFE_MODE=1

-echo "Checking .pot catalog consistency..."
+echo "Checking .pot catalog consistency…"
 rails generate zammad:translation_catalog --check &

-echo "Checking consistency of Settings types file..."
+echo "Checking consistency of Settings types file…"
 rails generate zammad:setting_types --check &

 .gitlab/check_graphql_api_consistency.sh &
--- a/app/assets/javascripts/app/views/widget/two_factor_configuration/security_keys/register.jst.eco
+++ b/app/assets/javascripts/app/views/widget/two_factor_configuration/security_keys/register.jst.eco
@@ -1,4 +1,4 @@
 <div class="main two-factor-auth flex">
-  <p class="text-center"><%= @T('Getting key information from the browser...') %></p>
+  <p class="text-center"><%= @T('Getting key information from the browser…') %></p>
  <div class="loading icon"></div>
 </div>
--- a/app/assets/javascripts/app/views/widget/two_factor_login/security_keys.jst.eco
+++ b/app/assets/javascripts/app/views/widget/two_factor_login/security_keys.jst.eco
@@ -21,7 +21,7 @@
  <input name="two_factor_method" type="hidden" value="<%= @twoFactorMethodDetails.key %>" />

  <div class="double-spacer"></div>
-  <p class="text-center"><%= @T('Verifying key information...') %></p>
+  <p class="text-center"><%= @T('Verifying key information…') %></p>
  <div class="double-spacer"></div>
  <div class="centered">
    <div class="loading icon"></div>
--- a/i18n/zammad.pot
+++ b/i18n/zammad.pot
@@ -5487,7 +5487,7 @@ msgid "Getting an Access Token"
 msgstr ""

 #: app/assets/javascripts/app/views/widget/two_factor_configuration/security_keys/register.jst.eco
-msgid "Getting key information from the browser..."
+msgid "Getting key information from the browser…"
 msgstr ""

 #: app/assets/javascripts/app/controllers/_integration/github.coffee
@@ -13344,7 +13344,7 @@ msgid "Verify sending and receiving"
 msgstr ""

 #: app/assets/javascripts/app/views/widget/two_factor_login/security_keys.jst.eco
-msgid "Verifying key information..."
+msgid "Verifying key information…"
 msgstr ""

 #: app/assets/javascripts/app/views/channel/email_account_wizard.jst.eco
--- a/script/build/deploy_archives.sh
+++ b/script/build/deploy_archives.sh
@@ -32,7 +32,7 @@ script/build/cleanup.sh
  && find . -name ".gitkeep" \
  && find . -name ".gitmodules" ) | xargs rm -rf

-echo "Building archives..."
+echo "Building archives…"
 tar -czf "${TEMPDIR}/zammad-latest.tar.gz" . > /dev/null
 tar -cjf "${TEMPDIR}/zammad-latest.tar.bz2" . > /dev/null
 zip -r "${TEMPDIR}/zammad-latest.zip" ./* > /dev/null
--- a/spec/fixtures/files/pgp/generate/run.sh
+++ b/spec/fixtures/files/pgp/generate/run.sh
@@ -30,7 +30,7 @@ do

  # Support additional keys.
  PGP_UID=${PGP_UID%-*}
-  echo "  Using '$PGP_UID' as UID..."
+  echo "  Using '$PGP_UID' as UID…"

  KEY_EXPIRE_ARG=$KEY_EXPIRE

@@ -47,23 +47,23 @@ do
      DEFAULT_PREFERENCE_LIST_ARG=--default-preference-list="AES256,AES192,AES,CAST5,3DES,OCB,SHA512,SHA384,SHA256,SHA224,SHA1,ZLIB,BZIP2,ZIP,Uncompressed,MDC,AEAD"
    else
      echo "  ERROR: GnuPG too old, please update to v2.2.40 or later in order to generate OCB keys."
-      echo "  Skipping..."
+      echo "  Skipping…"
      continue
    fi
  fi

-  echo "  Generating key..."
+  echo "  Generating key…"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE $DEFAULT_PREFERENCE_LIST_ARG --quick-generate-key "$PGP_UID" $KEY_ALGO $KEY_USAGE $KEY_EXPIRE_ARG

-  echo "  Exporting public key..."
+  echo "  Exporting public key…"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --output "$KEY_DIR/$EMAIL_ADDRESS.pub.pgp" --export "$PGP_UID"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --output "$KEY_DIR/$EMAIL_ADDRESS.pub.asc" --armor --export "$PGP_UID"

-  echo "  Exporting private key..."
+  echo "  Exporting private key…"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --output "$KEY_DIR/$EMAIL_ADDRESS.pgp" --export-secret-key "$PGP_UID"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --output "$KEY_DIR/$EMAIL_ADDRESS.asc" --armor --export-secret-key "$PGP_UID"

-  echo "  Exporting key information..."
+  echo "  Exporting key information…"
  echo -n $KEY_PASSPHRASE > "$KEY_DIR/$EMAIL_ADDRESS.passphrase"

  KEY_INFO=$(gpg --batch --quiet --with-colons --with-fingerprint --fixed-list-mode --show-key "$KEY_DIR/$EMAIL_ADDRESS.pub.asc")
@@ -80,7 +80,7 @@ do
  echo -n $KEY_FINGERPRINT > "$KEY_DIR/$EMAIL_ADDRESS.fingerprint"

  # Cleanup.
-  echo "  Deleting keys from keyring..."
+  echo "  Deleting keys from keyring…"
  gpg --batch --quiet --yes --delete-secret-key $KEY_FINGERPRINT
  gpg --batch --quiet --yes --delete-key $KEY_FINGERPRINT
 done
@@ -98,7 +98,7 @@ do
    continue
  fi

-  echo "  Adding UID ${PGP_UIDS[$i]} to the same key..."
+  echo "  Adding UID ${PGP_UIDS[$i]} to the same key…"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --quick-add-uid "${PGP_UIDS[0]}" "${PGP_UIDS[$i]}"
 done

@@ -147,16 +147,16 @@ do
  echo "  Importing key for $EMAIL_ADDRESS"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --import < "$KEY_DIR/$EMAIL_ADDRESS.asc"

-  echo "  Computing current date header..."
+  echo "  Computing current date header…"
  echo "Date: $(date -R)" > "$MAIL_DIR/$TEST_MAIL.box"

  # Support expired keys.
  [[ $EMAIL_ADDRESS =~ ^expired ]] && echo "Date: $KEY_EXPIRATION_DATE" > "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Constructing mail body..."
+  echo "  Constructing mail body…"
  cat "$MAIL_DIR/$TEST_MAIL.part1.box" "$MAIL_DIR/$TEST_MAIL.part2.box" "$MAIL_DIR/$TEST_MAIL.part3.box" >> "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Appending message signature..."
+  echo "  Appending message signature…"

  # Support expired keys.
  if [[ $EMAIL_ADDRESS =~ ^expired ]]; then
@@ -165,7 +165,7 @@ do
    gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --armor --detach-sign --trust-model=always --default-key $KEY_FINGERPRINT --sign < "$MAIL_DIR/$TEST_MAIL.part2.box" >> "$MAIL_DIR/$TEST_MAIL.box"
  fi

-  echo "  Ending mail file..."
+  echo "  Ending mail file…"
  cat "$MAIL_DIR/$TEST_MAIL.part5.box" >> "$MAIL_DIR/$TEST_MAIL.box"
 done

@@ -211,31 +211,31 @@ do
        FORCE_OCB_ARG=--force-ocb
      else
        echo "  ERROR: GnuPG too old, please update to v2.3.0 or later in order to generate OCB keys."
-        echo "  Skipping..."
+        echo "  Skipping…"
        continue 2
      fi
    fi

    SANITIZED_EMAIL_ADDRESS=${RECIPIENT_EMAIL_ADDRESS%-*}
-    echo "    Using $SANITIZED_EMAIL_ADDRESS as recipient..."
+    echo "    Using $SANITIZED_EMAIL_ADDRESS as recipient…"

    RECIPIENTS_ARG="$RECIPIENTS_ARG --recipient $SANITIZED_EMAIL_ADDRESS"
  done

-  echo "  Computing current date header..."
+  echo "  Computing current date header…"
  echo "Date: $(date -R)" > "$MAIL_DIR/$TEST_MAIL.box"

  # Support expired keys.
  [[ ! -z $KEY_EXPIRATION_DATE ]] && echo "Date: $KEY_EXPIRATION_DATE" > "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Constructing mail body..."
+  echo "  Constructing mail body…"
  cat "$MAIL_DIR/$TEST_MAIL.part1.box" >> "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Encrypting message..."
+  echo "  Encrypting message…"

  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --armor --trust-model=always $FAKED_SYSTEM_TIME_ARG $FORCE_OCB_ARG $RECIPIENTS_ARG --encrypt < "$MAIL_DIR/$TEST_MAIL.message.box" >> "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Ending mail file..."
+  echo "  Ending mail file…"
  cat "$MAIL_DIR/$TEST_MAIL.part3.box" >> "$MAIL_DIR/$TEST_MAIL.box"
 done

@@ -265,11 +265,11 @@ do
  echo "  Importing key for $SENDER_EMAIL_ADDRESS"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --import < "$KEY_DIR/$SENDER_EMAIL_ADDRESS.asc"

-  echo "  Constructing signed message..."
+  echo "  Constructing signed message…"
  SIGNED_MESSAGE_DIR=$(mktemp -d)
  cat "$MAIL_DIR/$TEST_MAIL.message.part1.box" "$MAIL_DIR/$TEST_MAIL.message.part2.box" "$MAIL_DIR/$TEST_MAIL.message.part3.box" > "$SIGNED_MESSAGE_DIR/signed-message"

-  echo "  Signing message..."
+  echo "  Signing message…"

  DETACH_SIGN_ARG=--detach-sign

@@ -283,16 +283,16 @@ do
    gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --armor $DETACH_SIGN_ARG --trust-model=always --default-key $KEY_FINGERPRINT --sign < "$MAIL_DIR/$TEST_MAIL.message.part2.box" >> "$SIGNED_MESSAGE_DIR/signed-message"
  fi

-  echo "  Ending signed message..."
+  echo "  Ending signed message…"
  cat "$MAIL_DIR/$TEST_MAIL.message.part5.box" >> "$SIGNED_MESSAGE_DIR/signed-message"

-  echo "  Computing current date header..."
+  echo "  Computing current date header…"
  echo "Date: $(date -R)" > "$MAIL_DIR/$TEST_MAIL.box"

  # Support expired keys.
  [[ $SENDER_EMAIL_ADDRESS =~ ^expired ]] && echo "Date: $KEY_EXPIRATION_DATE" > "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Constructing mail body..."
+  echo "  Constructing mail body…"
  cat "$MAIL_DIR/$TEST_MAIL.part1.box" >> "$MAIL_DIR/$TEST_MAIL.box"

  unset RECIPIENTS_ARG
@@ -303,12 +303,12 @@ do
    gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --import < "$KEY_DIR/$RECIPIENT_EMAIL_ADDRESS.pub.asc"

    SANITIZED_EMAIL_ADDRESS=${RECIPIENT_EMAIL_ADDRESS%-*}
-    echo "    Using $SANITIZED_EMAIL_ADDRESS as recipient..."
+    echo "    Using $SANITIZED_EMAIL_ADDRESS as recipient…"

    RECIPIENTS_ARG="$RECIPIENTS_ARG --recipient $SANITIZED_EMAIL_ADDRESS"
  done

-  echo "  Encrypting message..."
+  echo "  Encrypting message…"

  # Support expired keys.
  if [[ $SENDER_EMAIL_ADDRESS =~ ^expired ]]; then
@@ -317,7 +317,7 @@ do
    gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --armor --trust-model=always $RECIPIENTS_ARG --encrypt < "$SIGNED_MESSAGE_DIR/signed-message" >> "$MAIL_DIR/$TEST_MAIL.box"
  fi

-  echo "  Ending mail file..."
+  echo "  Ending mail file…"
  cat "$MAIL_DIR/$TEST_MAIL.part3.box" >> "$MAIL_DIR/$TEST_MAIL.box"

  # Cleanup.
@@ -350,13 +350,13 @@ do
  echo "  Importing key for $SENDER_EMAIL_ADDRESS"
  gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --import < "$KEY_DIR/$SENDER_EMAIL_ADDRESS.asc"

-  echo "  Computing current date header..."
+  echo "  Computing current date header…"
  echo "Date: $(date -R)" > "$MAIL_DIR/$TEST_MAIL.box"

  # Support expired keys.
  [[ $SENDER_EMAIL_ADDRESS =~ ^expired ]] && echo "Date: $KEY_EXPIRATION_DATE" > "$MAIL_DIR/$TEST_MAIL.box"

-  echo "  Constructing mail body..."
+  echo "  Constructing mail body…"
  cat "$MAIL_DIR/$TEST_MAIL.part1.box" >> "$MAIL_DIR/$TEST_MAIL.box"

  for RECIPIENT_EMAIL_ADDRESS in "${RECIPIENT_EMAIL_ADDRESSES[@]}"
@@ -365,12 +365,12 @@ do
    gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --yes --import < "$KEY_DIR/$RECIPIENT_EMAIL_ADDRESS.pub.asc"

    SANITIZED_EMAIL_ADDRESS=${RECIPIENT_EMAIL_ADDRESS%-*}
-    echo "    Using $SANITIZED_EMAIL_ADDRESS as recipient..."
+    echo "    Using $SANITIZED_EMAIL_ADDRESS as recipient…"

    RECIPIENTS_ARG="$RECIPIENTS_ARG --recipient $SANITIZED_EMAIL_ADDRESS"
  done

-  echo "  Encrypting + signing message in one command..."
+  echo "  Encrypting + signing message in one command…"

  # Support expired keys.
  if [[ $SENDER_EMAIL_ADDRESS =~ ^expired ]]; then
@@ -379,7 +379,7 @@ do
    gpg --batch --quiet --pinentry=loopback --passphrase=$KEY_PASSPHRASE --armor --trust-model=always --default-key $KEY_FINGERPRINT --sign $RECIPIENTS_ARG --encrypt < "$MAIL_DIR/$TEST_MAIL.part2.box" >> "$MAIL_DIR/$TEST_MAIL.box"
  fi

-  echo "  Ending mail file..."
+  echo "  Ending mail file…"
  cat "$MAIL_DIR/$TEST_MAIL.part3.box" >> "$MAIL_DIR/$TEST_MAIL.box"
 done