From ce064a0b378a7f1dbf100868b933a30954cf2887 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Wed, 28 Jun 2023 16:00:11 +0200 Subject: [PATCH] Use symfony/ux-translator to translate password_strength_estimator badges --- .../password_strength_estimate_controller.js | 14 +- assets/translator.js | 16 ++ composer.json | 1 + composer.lock | 130 ++++++++++++---- config/bundles.php | 1 + config/packages/ux_translator.yaml | 3 + package.json | 2 + symfony.lock | 15 ++ translations/messages.de.xlf | 138 ++++------------- translations/messages.el.xlf | 6 - translations/messages.en.xlf | 141 ++++-------------- translations/messages.fr.xlf | 119 --------------- translations/messages.ja.xlf | 108 -------------- translations/messages.ru.xlf | 119 --------------- yarn.lock | 57 +++++++ 15 files changed, 269 insertions(+), 601 deletions(-) create mode 100644 assets/translator.js create mode 100644 config/packages/ux_translator.yaml diff --git a/assets/controllers/elements/password_strength_estimate_controller.js b/assets/controllers/elements/password_strength_estimate_controller.js index 08915af6..0fc9c578 100644 --- a/assets/controllers/elements/password_strength_estimate_controller.js +++ b/assets/controllers/elements/password_strength_estimate_controller.js @@ -25,6 +25,8 @@ import * as zxcvbnEnPackage from '@zxcvbn-ts/language-en'; import * as zxcvbnDePackage from '@zxcvbn-ts/language-de'; import * as zxcvbnFrPackage from '@zxcvbn-ts/language-fr'; import * as zxcvbnJaPackage from '@zxcvbn-ts/language-ja'; +import {trans, USER_PASSWORD_STRENGTH_VERY_WEAK, USER_PASSWORD_STRENGTH_WEAK, USER_PASSWORD_STRENGTH_MEDIUM, + USER_PASSWORD_STRENGTH_STRONG, USER_PASSWORD_STRENGTH_VERY_STRONG} from '../../translator.js'; /* stimulusFetch: 'lazy' */ export default class extends Controller { @@ -87,27 +89,27 @@ export default class extends Controller { switch (level) { case 0: - text = "Very weak"; + text = trans(USER_PASSWORD_STRENGTH_VERY_WEAK); classes = "bg-danger badge-danger"; break; case 1: - text = "Weak"; + text = trans(USER_PASSWORD_STRENGTH_WEAK); classes = "bg-warning badge-warning"; break; case 2: - text = "Medium"; + text = trans(USER_PASSWORD_STRENGTH_MEDIUM) classes = "bg-info badge-info"; break; case 3: - text = "Strong"; + text = trans(USER_PASSWORD_STRENGTH_STRONG); classes = "bg-primary badge-primary"; break; case 4: - text = "Very strong"; + text = trans(USER_PASSWORD_STRENGTH_VERY_STRONG); classes = "bg-success badge-success"; break; default: - text = "Unknown"; + text = "???"; classes = "bg-secondary badge-secondary"; } diff --git a/assets/translator.js b/assets/translator.js new file mode 100644 index 00000000..0d5ae86b --- /dev/null +++ b/assets/translator.js @@ -0,0 +1,16 @@ +import { localeFallbacks } from '../var/translations/configuration'; +import { trans, getLocale, setLocale, setLocaleFallbacks } from '@symfony/ux-translator'; +/* + * This file is part of the Symfony UX Translator package. + * + * If folder "../var/translations" does not exist, or some translations are missing, + * you must warmup your Symfony cache to refresh JavaScript translations. + * + * If you use TypeScript, you can rename this file to "translator.ts" to take advantage of types checking. + */ + +setLocaleFallbacks(localeFallbacks); + +export { trans }; + +export * from '../var/translations'; \ No newline at end of file diff --git a/composer.json b/composer.json index a9094483..44e7d21d 100644 --- a/composer.json +++ b/composer.json @@ -66,6 +66,7 @@ "symfony/serializer": "6.3.*", "symfony/translation": "6.3.*", "symfony/twig-bundle": "6.3.*", + "symfony/ux-translator": "2.x-dev", "symfony/ux-turbo": "^2.0", "symfony/validator": "6.3.*", "symfony/web-link": "6.3.*", diff --git a/composer.lock b/composer.lock index ca9d4692..95e058af 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "a8ee56e1ebdd203018f921be240029ca", + "content-hash": "28e49fed0a1eb5f33d7ca39a19ba2fff", "packages": [ { "name": "beberlei/assert", @@ -923,16 +923,16 @@ }, { "name": "doctrine/doctrine-bundle", - "version": "2.10.0", + "version": "2.10.1", "source": { "type": "git", "url": "https://github.com/doctrine/DoctrineBundle.git", - "reference": "b2ec6c2668f6dc514e8bf51257d19c7c19398afe" + "reference": "f9d59c90b6f525dfc2a2064a695cb56e0ab40311" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/b2ec6c2668f6dc514e8bf51257d19c7c19398afe", - "reference": "b2ec6c2668f6dc514e8bf51257d19c7c19398afe", + "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/f9d59c90b6f525dfc2a2064a695cb56e0ab40311", + "reference": "f9d59c90b6f525dfc2a2064a695cb56e0ab40311", "shasum": "" }, "require": { @@ -1019,7 +1019,7 @@ ], "support": { "issues": "https://github.com/doctrine/DoctrineBundle/issues", - "source": "https://github.com/doctrine/DoctrineBundle/tree/2.10.0" + "source": "https://github.com/doctrine/DoctrineBundle/tree/2.10.1" }, "funding": [ { @@ -1035,7 +1035,7 @@ "type": "tidelift" } ], - "time": "2023-06-05T14:43:41+00:00" + "time": "2023-06-28T07:47:41+00:00" }, { "name": "doctrine/doctrine-migrations-bundle", @@ -5972,16 +5972,16 @@ }, { "name": "spatie/db-dumper", - "version": "3.3.1", + "version": "3.4.0", "source": { "type": "git", "url": "https://github.com/spatie/db-dumper.git", - "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34" + "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spatie/db-dumper/zipball/3b9fd47899bf6a59d3452392121c9ce675d55d34", - "reference": "3b9fd47899bf6a59d3452392121c9ce675d55d34", + "url": "https://api.github.com/repos/spatie/db-dumper/zipball/bbd5ae0f331d47e6534eb307e256c11a65c8e24a", + "reference": "bbd5ae0f331d47e6534eb307e256c11a65c8e24a", "shasum": "" }, "require": { @@ -6019,7 +6019,7 @@ "spatie" ], "support": { - "source": "https://github.com/spatie/db-dumper/tree/3.3.1" + "source": "https://github.com/spatie/db-dumper/tree/3.4.0" }, "funding": [ { @@ -6031,7 +6031,7 @@ "type": "github" } ], - "time": "2023-05-02T11:05:31+00:00" + "time": "2023-06-27T08:34:52+00:00" }, { "name": "spomky-labs/cbor-bundle", @@ -11524,6 +11524,83 @@ ], "time": "2023-04-08T07:25:02+00:00" }, + { + "name": "symfony/ux-translator", + "version": "2.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/ux-translator.git", + "reference": "9f49e121558d7c1fab134031b878dfc884775da0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/ux-translator/zipball/9f49e121558d7c1fab134031b878dfc884775da0", + "reference": "9f49e121558d7c1fab134031b878dfc884775da0", + "shasum": "" + }, + "require": { + "php": ">=8.1", + "symfony/console": "^5.4|^6.0", + "symfony/filesystem": "^5.4|^6.0", + "symfony/string": "^5.4|^6.0", + "symfony/translation": "^5.4|^6.0" + }, + "require-dev": { + "symfony/framework-bundle": "^5.4|^6.0", + "symfony/phpunit-bridge": "^5.2|^6.0", + "symfony/var-dumper": "^5.4|^6.0" + }, + "default-branch": true, + "type": "symfony-bundle", + "extra": { + "thanks": { + "name": "symfony/ux", + "url": "https://github.com/symfony/ux" + } + }, + "autoload": { + "psr-4": { + "Symfony\\UX\\Translator\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Hugo Alliaume", + "email": "hugo@alliau.me" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Exposes Symfony Translations directly to JavaScript.", + "homepage": "https://symfony.com", + "keywords": [ + "symfony-ux" + ], + "support": { + "source": "https://github.com/symfony/ux-translator/tree/2.x" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-06-19T18:55:23+00:00" + }, { "name": "symfony/ux-turbo", "version": "v2.9.1", @@ -14675,17 +14752,17 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "237f1821ece806de66072813d8cbe5bdbc8f3117" + "reference": "3b77f2101068074f1c98977cc34ef939bbce3d19" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/237f1821ece806de66072813d8cbe5bdbc8f3117", - "reference": "237f1821ece806de66072813d8cbe5bdbc8f3117", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/3b77f2101068074f1c98977cc34ef939bbce3d19", + "reference": "3b77f2101068074f1c98977cc34ef939bbce3d19", "shasum": "" }, "conflict": { "3f/pygmentize": "<1.2", - "admidio/admidio": "<4.2.8", + "admidio/admidio": "<4.2.9", "adodb/adodb-php": "<=5.20.20|>=5.21,<=5.21.3", "aheinze/cockpit": "<=2.2.1", "akaunting/akaunting": "<2.1.13", @@ -14719,7 +14796,7 @@ "baserproject/basercms": "<4.7.5", "bassjobsen/bootstrap-3-typeahead": ">4.0.2", "bigfork/silverstripe-form-capture": ">=3,<3.1.1", - "billz/raspap-webgui": "<=2.6.6", + "billz/raspap-webgui": "<2.8.9", "bk2k/bootstrap-package": ">=7.1,<7.1.2|>=8,<8.0.8|>=9,<9.0.4|>=9.1,<9.1.3|>=10,<10.0.10|>=11,<11.0.3", "bmarshall511/wordpress_zero_spam": "<5.2.13", "bolt/bolt": "<3.7.2", @@ -14948,7 +15025,7 @@ "modx/revolution": "<= 2.8.3-pl|<2.8", "mojo42/jirafeau": "<4.4", "monolog/monolog": ">=1.8,<1.12", - "moodle/moodle": "<4.2-rc.2|= 3.11", + "moodle/moodle": "<4.2-rc.2|= 4.2.0|= 3.11", "mustache/mustache": ">=2,<2.14.1", "namshi/jose": "<2.2", "neoan3-apps/template": "<1.1.1", @@ -15283,7 +15360,7 @@ "type": "tidelift" } ], - "time": "2023-06-22T20:04:46+00:00" + "time": "2023-06-28T00:17:41+00:00" }, { "name": "sebastian/diff", @@ -15939,16 +16016,16 @@ }, { "name": "vimeo/psalm", - "version": "5.13.0", + "version": "5.13.1", "source": { "type": "git", "url": "https://github.com/vimeo/psalm.git", - "reference": "a0a9c27630bcf8301ee78cb06741d2907d8c9fef" + "reference": "086b94371304750d1c673315321a55d15fc59015" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/vimeo/psalm/zipball/a0a9c27630bcf8301ee78cb06741d2907d8c9fef", - "reference": "a0a9c27630bcf8301ee78cb06741d2907d8c9fef", + "url": "https://api.github.com/repos/vimeo/psalm/zipball/086b94371304750d1c673315321a55d15fc59015", + "reference": "086b94371304750d1c673315321a55d15fc59015", "shasum": "" }, "require": { @@ -16039,15 +16116,16 @@ ], "support": { "issues": "https://github.com/vimeo/psalm/issues", - "source": "https://github.com/vimeo/psalm/tree/5.13.0" + "source": "https://github.com/vimeo/psalm/tree/5.13.1" }, - "time": "2023-06-24T17:05:12+00:00" + "time": "2023-06-27T16:39:49+00:00" } ], "aliases": [], "minimum-stability": "stable", "stability-flags": { "florianv/swap-bundle": 20, + "symfony/ux-translator": 20, "roave/security-advisories": 20 }, "prefer-stable": false, diff --git a/config/bundles.php b/config/bundles.php index 91a5e88a..3e6c7dfe 100644 --- a/config/bundles.php +++ b/config/bundles.php @@ -28,4 +28,5 @@ return [ Webauthn\Bundle\WebauthnBundle::class => ['all' => true], Nbgrp\OneloginSamlBundle\NbgrpOneloginSamlBundle::class => ['all' => true], Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true], + Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true], ]; diff --git a/config/packages/ux_translator.yaml b/config/packages/ux_translator.yaml new file mode 100644 index 00000000..1c1c7060 --- /dev/null +++ b/config/packages/ux_translator.yaml @@ -0,0 +1,3 @@ +ux_translator: + # The directory where the JavaScript translations are dumped + dump_directory: '%kernel.project_dir%/var/translations' diff --git a/package.json b/package.json index 16f26265..2e328866 100644 --- a/package.json +++ b/package.json @@ -7,10 +7,12 @@ "@hotwired/turbo": "^7.0.1", "@popperjs/core": "^2.10.2", "@symfony/stimulus-bridge": "^3.2.0", + "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets", "@symfony/ux-turbo": "file:vendor/symfony/ux-turbo/assets", "@symfony/webpack-encore": "^4.1.0", "bootstrap": "^5.1.3", "core-js": "^3.23.0", + "intl-messageformat": "^10.2.5", "jquery": "^3.5.1", "popper.js": "^1.14.7", "regenerator-runtime": "^0.13.9", diff --git a/symfony.lock b/symfony.lock index cdd153ae..7572566b 100644 --- a/symfony.lock +++ b/symfony.lock @@ -731,6 +731,21 @@ "./config/packages/uid.yaml" ] }, + "symfony/ux-translator": { + "version": "2.9", + "recipe": { + "repo": "github.com/symfony/recipes", + "branch": "main", + "version": "2.9", + "ref": "bc396565cc4cab95692dd6df810553dc22e352e1" + }, + "files": [ + "./assets/translator.js", + "./config/packages/ux_translator.yaml", + "./var/translations/configuration.js", + "./var/translations/index.js" + ] + }, "symfony/ux-turbo": { "version": "v2.0.1" }, diff --git a/translations/messages.de.xlf b/translations/messages.de.xlf index b5456f02..31727d23 100644 --- a/translations/messages.de.xlf +++ b/translations/messages.de.xlf @@ -1484,28 +1484,6 @@ Subelemente werden beim Löschen nach oben verschoben. Forum - - - Part-DB1\templates\homepage.html.twig:36 - Part-DB1\templates\homepage.html.twig:36 - templates\homepage.html.twig:33 - - - homepage.basedOn - Basierend auf dem originale Part-DB von - - - - - Part-DB1\templates\homepage.html.twig:39 - Part-DB1\templates\homepage.html.twig:39 - templates\homepage.html.twig:36 - - - homepage.others - und anderen - - Part-DB1\templates\homepage.html.twig:45 @@ -6400,52 +6378,6 @@ Wenn Sie dies fehlerhafterweise gemacht haben oder ein Computer nicht mehr vertr Serverweites Theme - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - M - M - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - k - k - - - - - - - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - m - m - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - µ - µ - - Part-DB1\src\Services\LogSystem\LogEntryExtraFormatter.php:100 @@ -7527,17 +7459,6 @@ Element 3 Änderungen verwerfen - - - templates\Parts\show_part_info.html.twig:161 - obsolete - obsolete - - - part.withdraw.caption: - Bauteile entnehmen: - - templates\Parts\show_part_info.html.twig:166 @@ -7648,26 +7569,6 @@ Element 3 z.B. 10 - - - obsolete - obsolete - - - homepage.basedOn - basierend auf Arbeit von - - - - - obsolete - obsolete - - - homepage.others - und anderen - - obsolete @@ -8780,15 +8681,6 @@ Element 3 Alte Versionsstände anzeigen (Zeitreisen) - - - obsolete - - - log.type. - __log.type. - - obsolete @@ -11447,5 +11339,35 @@ Element 3 Auto (decided on system settings) + + + user.password_strength.very_weak + Sehr schwach + + + + + user.password_strength.weak + Schwach + + + + + user.password_strength.medium + Mittel + + + + + user.password_strength.strong + Stark + + + + + user.password_strength.very_strong + Sehr stark + + diff --git a/translations/messages.el.xlf b/translations/messages.el.xlf index 8deb6a3a..cc17d9be 100644 --- a/translations/messages.el.xlf +++ b/translations/messages.el.xlf @@ -1535,11 +1535,5 @@ Επεξεργασία - - - - - - diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf index 11358786..8d7b5170 100644 --- a/translations/messages.en.xlf +++ b/translations/messages.en.xlf @@ -731,7 +731,7 @@ user.edit.tfa.disable_tfa_message - all active two-factor authentication methods of the user and delete the backup codes! + all active two-factor authentication methods of the user and delete the backup codes!
The user will have to set up all two-factor authentication methods again and print new backup codes!

Only do this if you are absolutely sure about the identity of the user (seeking help), otherwise the account could be compromised by an attacker!]]> @@ -1485,28 +1485,6 @@ Sub elements will be moved upwards.]]> Forum - - - Part-DB1\templates\homepage.html.twig:36 - Part-DB1\templates\homepage.html.twig:36 - templates\homepage.html.twig:33 - - - homepage.basedOn - Based on the original Part-DB by - - - - - Part-DB1\templates\homepage.html.twig:39 - Part-DB1\templates\homepage.html.twig:39 - templates\homepage.html.twig:36 - - - homepage.others - and others - - Part-DB1\templates\homepage.html.twig:45 @@ -6401,52 +6379,7 @@ If you have done this incorrectly or if a computer is no longer trusted, you can Serverwide Theme - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - M - M - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - k - k - - - - - - - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - m - m - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - µ - µ - - + Part-DB1\src\Services\LogSystem\LogEntryExtraFormatter.php:100 @@ -7531,17 +7464,6 @@ Element 3 Discard changes - - - templates\Parts\show_part_info.html.twig:161 - obsolete - obsolete - - - part.withdraw.caption: - Withdraw parts: - - templates\Parts\show_part_info.html.twig:166 @@ -7652,26 +7574,6 @@ Element 3 e.g. 5 - - - obsolete - obsolete - - - homepage.basedOn - Based on work of - - - - - obsolete - obsolete - - - homepage.others - and others - - obsolete @@ -8784,15 +8686,6 @@ Element 3 Show old element versions (time travel) - - - obsolete - - - log.type. - __log.type. - - obsolete @@ -11469,5 +11362,35 @@ Element 3 No text content given! The labels will remain empty. + + + user.password_strength.very_weak + Very weak + + + + + user.password_strength.weak + Weak + + + + + user.password_strength.medium + Medium + + + + + user.password_strength.strong + Strong + + + + + user.password_strength.very_strong + Very strong + + diff --git a/translations/messages.fr.xlf b/translations/messages.fr.xlf index ef6b4cf7..c7f4e240 100644 --- a/translations/messages.fr.xlf +++ b/translations/messages.fr.xlf @@ -1455,39 +1455,6 @@ Show/Hide sidebar Forum - - - Part-DB1\templates\homepage.html.twig:36 - Part-DB1\templates\homepage.html.twig:36 - templates\homepage.html.twig:33 - - - homepage.basedOn - Basé sur le Part-DB original par - - - - - Part-DB1\templates\homepage.html.twig:39 - Part-DB1\templates\homepage.html.twig:39 - templates\homepage.html.twig:36 - - - homepage.others - et autres - - - - - Part-DB1\templates\homepage.html.twig:45 - Part-DB1\templates\homepage.html.twig:45 - new - - - homepage.last_activity - Activité récente - - Part-DB1\templates\LabelSystem\dialog.html.twig:3 @@ -6334,52 +6301,6 @@ Si vous avez fait cela de manière incorrecte ou si un ordinateur n'est plus fia Thème du serveur - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - M - M - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - k - k - - - - - - - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - m - m - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - µ - µ - - Part-DB1\src\Services\LogSystem\LogEntryExtraFormatter.php:100 @@ -7461,17 +7382,6 @@ exemple de ville Rejeter les modifications - - - templates\Parts\show_part_info.html.twig:161 - obsolete - obsolete - - - part.withdraw.caption: - Retrait de composants : - - templates\Parts\show_part_info.html.twig:166 @@ -7582,26 +7492,6 @@ exemple de ville Ex. 10 - - - obsolete - obsolete - - - homepage.basedOn - Basé sur le travail de - - - - - obsolete - obsolete - - - homepage.others - et autres - - obsolete @@ -8698,15 +8588,6 @@ exemple de ville Afficher les anciennes versions des éléments (Time travel) - - - obsolete - - - log.type. - Type. - - obsolete diff --git a/translations/messages.ja.xlf b/translations/messages.ja.xlf index c8fac594..4becc319 100644 --- a/translations/messages.ja.xlf +++ b/translations/messages.ja.xlf @@ -1455,28 +1455,6 @@ フォーラム - - - Part-DB1\templates\homepage.html.twig:36 - Part-DB1\templates\homepage.html.twig:36 - templates\homepage.html.twig:33 - - - homepage.basedOn - オリジナルのPart-DBの作者 - - - - - Part-DB1\templates\homepage.html.twig:39 - Part-DB1\templates\homepage.html.twig:39 - templates\homepage.html.twig:36 - - - homepage.others - 他 - - Part-DB1\templates\homepage.html.twig:45 @@ -6334,52 +6312,6 @@ サーバー全体のテーマ - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - M - M - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - k - k - - - - - - - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - m - m - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - µ - µ - - Part-DB1\src\Services\LogSystem\LogEntryExtraFormatter.php:100 @@ -7462,17 +7394,6 @@ Exampletown 変更を破棄 - - - templates\Parts\show_part_info.html.twig:161 - obsolete - obsolete - - - part.withdraw.caption: - 部品を撤回する - - templates\Parts\show_part_info.html.twig:166 @@ -7583,26 +7504,6 @@ Exampletown 例: 5 - - - obsolete - obsolete - - - homepage.basedOn - オリジナルのPart-DBの作者: - - - - - obsolete - obsolete - - - homepage.others - 他 - - obsolete @@ -8699,15 +8600,6 @@ Exampletown 要素の以前のバージョンを表示する (タイムトラベル) - - - obsolete - - - log.type. - __log.type. - - obsolete diff --git a/translations/messages.ru.xlf b/translations/messages.ru.xlf index f4630f88..f0f22d76 100644 --- a/translations/messages.ru.xlf +++ b/translations/messages.ru.xlf @@ -1454,39 +1454,6 @@ Форум - - - Part-DB1\templates\homepage.html.twig:36 - Part-DB1\templates\homepage.html.twig:36 - templates\homepage.html.twig:33 - - - homepage.basedOn - На основе оригинальной версии Part-DB - - - - - Part-DB1\templates\homepage.html.twig:39 - Part-DB1\templates\homepage.html.twig:39 - templates\homepage.html.twig:36 - - - homepage.others - и другие - - - - - Part-DB1\templates\homepage.html.twig:45 - Part-DB1\templates\homepage.html.twig:45 - new - - - homepage.last_activity - Последние действия - - Part-DB1\templates\LabelSystem\dialog.html.twig:3 @@ -6335,52 +6302,6 @@ Тема для всего сервера - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - M - М - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - k - к - - - - - - - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - m - м - - - - - Part-DB1\src\Form\Type\SIUnitType.php:141 - obsolete - - - µ - µ - - Part-DB1\src\Services\LogSystem\LogEntryExtraFormatter.php:100 @@ -7463,17 +7384,6 @@ Отменить изменения - - - templates\Parts\show_part_info.html.twig:161 - obsolete - obsolete - - - part.withdraw.caption: - Изъять компоненты: - - templates\Parts\show_part_info.html.twig:166 @@ -7584,26 +7494,6 @@ н.р. 5 - - - obsolete - obsolete - - - homepage.basedOn - Создано на основе работ - - - - - obsolete - obsolete - - - homepage.others - и других - - obsolete @@ -8700,15 +8590,6 @@ Показать предыдущие версии элемента - - - obsolete - - - log.type. - Тип. - - obsolete diff --git a/yarn.lock b/yarn.lock index 8b493bc9..b40832c9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1522,6 +1522,45 @@ resolved "https://registry.yarnpkg.com/@foliojs-fork/restructure/-/restructure-2.0.2.tgz#73759aba2aff1da87b7c4554e6839c70d43c92b4" integrity sha512-59SgoZ3EXbkfSX7b63tsou/SDGzwUEK6MuB5sKqgVK1/XE0fxmpsOb9DQI8LXW3KfGnAjImCGhhEb7uPPAUVNA== +"@formatjs/ecma402-abstract@1.17.0": + version "1.17.0" + resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.17.0.tgz#2ce191a3bde4c65c6684e03fa247062a4a294b9e" + integrity sha512-6ueQTeJZtwKjmh23bdkq/DMqH4l4bmfvtQH98blOSbiXv/OUiyijSW6jU22IT8BNM1ujCaEvJfTtyCYVH38EMQ== + dependencies: + "@formatjs/intl-localematcher" "0.4.0" + tslib "^2.4.0" + +"@formatjs/fast-memoize@2.2.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@formatjs/fast-memoize/-/fast-memoize-2.2.0.tgz#33bd616d2e486c3e8ef4e68c99648c196887802b" + integrity sha512-hnk/nY8FyrL5YxwP9e4r9dqeM6cAbo8PeU9UjyXojZMNvVad2Z06FAVHyR3Ecw6fza+0GH7vdJgiKIVXTMbSBA== + dependencies: + tslib "^2.4.0" + +"@formatjs/icu-messageformat-parser@2.6.0": + version "2.6.0" + resolved "https://registry.yarnpkg.com/@formatjs/icu-messageformat-parser/-/icu-messageformat-parser-2.6.0.tgz#b0d58ce8c8f472969c96b5cd0b3ad5522d3a02b7" + integrity sha512-yT6at0qc0DANw9qM/TU8RZaCtfDXtj4pZM/IC2WnVU80yAcliS3KVDiuUt4jSQAeFL9JS5bc2hARnFmjPdA6qw== + dependencies: + "@formatjs/ecma402-abstract" "1.17.0" + "@formatjs/icu-skeleton-parser" "1.6.0" + tslib "^2.4.0" + +"@formatjs/icu-skeleton-parser@1.6.0": + version "1.6.0" + resolved "https://registry.yarnpkg.com/@formatjs/icu-skeleton-parser/-/icu-skeleton-parser-1.6.0.tgz#0728be8b6b3656f1a4b8e6e5b0e02dffffc23c6c" + integrity sha512-eMmxNpoX/J1IPUjPGSZwo0Wh+7CEvdEMddP2Jxg1gQJXfGfht/FdW2D5XDFj3VMbOTUQlDIdZJY7uC6O6gjPoA== + dependencies: + "@formatjs/ecma402-abstract" "1.17.0" + tslib "^2.4.0" + +"@formatjs/intl-localematcher@0.4.0": + version "0.4.0" + resolved "https://registry.yarnpkg.com/@formatjs/intl-localematcher/-/intl-localematcher-0.4.0.tgz#63bbc37a7c3545a1bf1686072e51d9a3aed98d6b" + integrity sha512-bRTd+rKomvfdS4QDlVJ6TA/Jx1F2h/TBVO5LjvhQ7QPPHp19oPNMIum7W2CMEReq/zPxpmCeB31F9+5gl/qtvw== + dependencies: + tslib "^2.4.0" + "@fortawesome/fontawesome-free@^6.1.1": version "6.4.0" resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-6.4.0.tgz#1ee0c174e472c84b23cb46c995154dc383e3b4fe" @@ -1706,6 +1745,9 @@ loader-utils "^2.0.0" schema-utils "^3.0.0" +"@symfony/ux-translator@file:vendor/symfony/ux-translator/assets": + version "1.0.0" + "@symfony/ux-turbo@file:vendor/symfony/ux-turbo/assets": version "0.1.0" @@ -4270,6 +4312,16 @@ interpret@^2.2.0: resolved "https://registry.yarnpkg.com/interpret/-/interpret-2.2.0.tgz#1a78a0b5965c40a5416d007ad6f50ad27c417df9" integrity sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw== +intl-messageformat@^10.2.5: + version "10.5.0" + resolved "https://registry.yarnpkg.com/intl-messageformat/-/intl-messageformat-10.5.0.tgz#86d11b15913ac954075b25253f5e669359f89538" + integrity sha512-AvojYuOaRb6r2veOKfTVpxH9TrmjSdc5iR9R5RgBwrDZYSmAAFVT+QLbW3C4V7Qsg0OguMp67Q/EoUkxZzXRGw== + dependencies: + "@formatjs/ecma402-abstract" "1.17.0" + "@formatjs/fast-memoize" "2.2.0" + "@formatjs/icu-messageformat-parser" "2.6.0" + tslib "^2.4.0" + ipaddr.js@1.9.1: version "1.9.1" resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3" @@ -6490,6 +6542,11 @@ ts-loader@^9.2.6, ts-loader@^9.3.0: micromatch "^4.0.0" semver "^7.3.4" +tslib@^2.4.0: + version "2.6.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.0.tgz#b295854684dbda164e181d259a22cd779dcd7bc3" + integrity sha512-7At1WUettjcSRHXCyYtTselblcHl9PJFFVKiCAy/bY97+BPZXSQ2wbq0P9s8tK2G7dFQfNnlJnPAiArVBVBsfA== + turndown-plugin-gfm@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.2.tgz#6f8678a361f35220b2bdf5619e6049add75bf1c7"