ISSUE #1631: Improve ExtractTranslationsConsoleCommand

Author: robiningelbrecht

config/reference.php

@@ -1098,17 +1098,6 @@
  *     doctrine?: DoctrineConfig,
  *     doctrine_migrations?: DoctrineMigrationsConfig,
  *     twig?: TwigConfig,
- *     "when@dev"?: array{
- *         imports?: ImportsConfig,
- *         parameters?: ParametersConfig,
- *         services?: ServicesConfig,
- *         framework?: FrameworkConfig,
- *         flysystem?: FlysystemConfig,
- *         monolog?: MonologConfig,
- *         doctrine?: DoctrineConfig,
- *         doctrine_migrations?: DoctrineMigrationsConfig,
- *         twig?: TwigConfig,
- *     },
  *     "when@prod"?: array{
  *         imports?: ImportsConfig,
  *         parameters?: ParametersConfig,
@@ -1211,7 +1200,6 @@ public static function config(array $config): array
  *     deprecated?: array{package:string, version:string, message?:string},
  * }
  * @psalm-type RoutesConfig = array{
- *     "when@dev"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     "when@prod"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     "when@test"?: array<string, RouteConfig|ImportConfig|AliasConfig>,
  *     ...<string, RouteConfig|ImportConfig|AliasConfig>

docs/assets/images/dashboard-widgets/athlete-profile.jpeg

@@ -169,7 +169,7 @@ This widget summarizes how you train. Each axis reflects a different normalized
 { 'widget': 'athleteProfile', 'width': 33, 'enabled': true }
 ```
 
-![athleteProfile widget](../assets/images/dashboard-widgets/athlete-profile.jpeg)
+![athleteProfile widget](../assets/images/dashboard-widgets/athlete-profile.png)
 
 ## eddington
 

docs/assets/images/dashboard-widgets/athlete-profile.png

@@ -1,6 +1,6 @@
 {
-  "id": "http://localhost:8080/",
-  "name": "Statistics for Strava | Robin Ingelbrecht 🦖",
+  "id": "[APP_HOST]",
+  "name": "[APP_NAME]",
   "short_name": "Statistics for Strava",
   "description": "Statistics for Strava is a self-hosted web app designed to provide you with better stats.",
   "categories": [
@@ -9,7 +9,7 @@
     "utilities"
   ],
   "start_url": "/",
-  "scope": "http://localhost:8080/",
+  "scope": "[APP_HOST]",
   "display": "standalone",
   "display_override": [
     "fullscreen",
@@ -20,49 +20,49 @@
   "background_color": "#f9fafb",
   "icons": [
     {
-      "src": "/assets/images/manifest/icon-192.png",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/icon-192.png",
       "sizes": "192x192",
       "type": "image/png"
     },
     {
-      "src": "/assets/images/manifest/icon-192.maskable.png",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/icon-192.maskable.png",
       "sizes": "192x192",
       "type": "image/png",
       "purpose": "maskable"
     },
     {
-      "src": "/assets/images/manifest/icon-512.png",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/icon-512.png",
       "sizes": "512x512",
       "type": "image/png"
     },
     {
-      "src": "/assets/images/manifest/icon-512.maskable.png",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/icon-512.maskable.png",
       "sizes": "512x512",
       "type": "image/png",
       "purpose": "maskable"
     },
     {
-      "src": "/assets/images/manifest/icon-512.png",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/icon-512.png",
       "sizes": "any",
       "type": "image/png"
     },
     {
-      "src": "/assets/images/manifest/icon-512.maskable.png",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/icon-512.maskable.png",
       "sizes": "any",
       "type": "image/png",
       "purpose": "maskable"
     }
   ],
   "screenshots": [
     {
-      "src": "/assets/images/manifest/screenshots/dashboard.jpeg",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/screenshots/dashboard.jpeg",
       "sizes": "750x1600",
       "type": "image/jpeg",
       "form_factor": "narrow",
       "label": "Dashboard"
     },
     {
-      "src": "/assets/images/manifest/screenshots/heatmap.jpeg",
+      "src": "[APP_BASE_PATH]/assets/images/manifest/screenshots/heatmap.jpeg",
       "sizes": "750x1600",
       "type": "image/jpeg",
       "form_factor": "narrow",

docs/configuration/dashboard-widgets.md

@@ -8,7 +8,6 @@
 use App\Infrastructure\ValueObject\String\KernelProjectDir;
 use Symfony\Component\Console\Attribute\AsCommand;
 use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -22,10 +21,11 @@ class ExtractTranslationsConsoleCommand extends Command
 {
     public function __construct(
         private readonly ExtractorInterface $extractor,
-        private readonly KernelProjectDir $kernelProjectDir
-    ){
+        private readonly KernelProjectDir $kernelProjectDir,
+    ) {
         parent::__construct();
     }
+
     protected function configure(): void
     {
         $this->addOption('removeObsoleteTranslatables', null, InputOption::VALUE_NONE);
@@ -53,18 +53,34 @@ protected function execute(InputInterface $input, OutputInterface $output): int
             $output->writeln(sprintf('<info>Extracted translations for "%s"</info>', $locale->value));
         }
 
-        if($input->getOption('removeObsoleteTranslatables')){
-            $messages = new MessageCatalogue(Locale::en_US->value);
+        if (!$input->getOption('removeObsoleteTranslatables')) {
+            return Command::SUCCESS;
+        }
+
+        $messages = new MessageCatalogue(Locale::en_US->value);
+
+        $this->extractor->extract($this->kernelProjectDir.'/templates', $messages);
+        $this->extractor->extract($this->kernelProjectDir.'/src', $messages);
+        $translatables = $messages->all()['messages'];
+
+        $translatableKeys = array_keys($translatables ?? []);
 
-            $this->extractor->extract($this->kernelProjectDir.'/templates', $messages);
-            $this->extractor->extract($this->kernelProjectDir.'/src', $messages);
-            $translatables = $messages->all()['messages'];
+        $translationFilePath = sprintf('%s/translations/messages%s.%s.yaml', $this->kernelProjectDir, MessageCatalogue::INTL_DOMAIN_SUFFIX, Locale::en_US->value);
+        $parsedTranslations = Yaml::parse(file_get_contents($translationFilePath) ?: '');
+
+        if (!$translationKeysToRemove = array_diff(array_keys($parsedTranslations), $translatableKeys)) {
+            return Command::SUCCESS;
+        }
+
+        foreach (Locale::cases() as $locale) {
+            $translationFilePath = sprintf('%s/translations/messages%s.%s.yaml', $this->kernelProjectDir, MessageCatalogue::INTL_DOMAIN_SUFFIX, $locale->value);
+            $parsedTranslations = Yaml::parse(file_get_contents($translationFilePath) ?: '');
 
-            $translatableKeys = array_keys($translatables ?? []);
+            foreach ($translationKeysToRemove as $keyToRemove) {
+                unset($parsedTranslations[$keyToRemove]);
+            }
 
-            $translationFilePath = sprintf('%s/translations/messages%s.%s.yaml', $this->kernelProjectDir, MessageCatalogue::INTL_DOMAIN_SUFFIX, Locale::en_US->value);
-            $parsedTranslations = Yaml::parse(file_get_contents($translationFilePath));
-            $translationKeysToRemove = array_diff(array_keys($parsedTranslations), $translatableKeys);
+            file_put_contents($translationFilePath, Yaml::dump($parsedTranslations));
         }
 
         return Command::SUCCESS;

public/manifest.json

@@ -136,11 +136,11 @@ Hikes: Wanderungen
 History: Verlauf
 'History chart': 'History chart'
 'How diverse is your training': 'How diverse is your training'
-'How hard do you train': 'How hard do you train'
-'How long are your sessions': 'How long are your sessions'
-'How much do you train': 'How much do you train'
+'How hard is your typical training session': 'How hard is your typical training session'
+'How long is your typical training session': 'How long is your typical training session'
+'How much do you train on average per week': 'How much do you train on average per week'
+'How much training you do in total on days you train.': 'How much training you do in total on days you train.'
 'How often do you train': 'How often do you train'
-'How packed is your training': 'How packed is your training'
 'Ice Skate': Eislaufen
 Id: Id
 'Image "{imgSrc}" is referenced in your maintenance config file, but was not found in "storage/gear-maintenance"': 'Das Bild "{imgSrc}" wurde in deiner maintenance config Datei referenziert, aber es wurde nicht unter "storage/gear-maintenance" gefunden'
@@ -273,6 +273,7 @@ Socials: 'Soziale Medien'
 Speed: Geschwindigkeit
 'Speed distribution': 'Speed distribution'
 Splits: Zwischenzeiten
+'Sport variety': 'Sport variety'
 Squash: Squash
 'Stair Stepper': Stufen-Stepper
 'Stand Up Paddling': Stand-Up-Paddeln
@@ -281,6 +282,7 @@ Squash: Squash
 'Statistics for Strava': 'Statistiken für Strava'
 Stats: Statistiken
 'Stats per weekday': 'Statistiken pro Wochentag'
+'Streak started on {date}': 'Streak started on {date}'
 Streaks: Serien
 Sun: So
 Sunday: Sonntag
@@ -325,7 +327,6 @@ Tuesday: Dienstag
 Unspecified: 'Nicht spezifiziert'
 'Updated on': 'Aktualisiert am'
 'User badge': 'Benutzer Abzeichen'
-Variety: Variety
 'Velo Mobiles': Velomobil
 'Very fresh – possible detraining': 'Sehr erholt – möglicher Leistungsabbau'
 'Very high': 'Sehr hoch'

src/Console/ExtractTranslationsConsoleCommand.php

@@ -136,11 +136,11 @@ Hikes: Hikes
 History: History
 'History chart': 'History chart'
 'How diverse is your training': 'How diverse is your training'
-'How hard do you train': 'How hard do you train'
-'How long are your sessions': 'How long are your sessions'
-'How much do you train': 'How much do you train'
+'How hard is your typical training session': 'How hard is your typical training session'
+'How long is your typical training session': 'How long is your typical training session'
+'How much do you train on average per week': 'How much do you train on average per week'
+'How much training you do in total on days you train.': 'How much training you do in total on days you train.'
 'How often do you train': 'How often do you train'
-'How packed is your training': 'How packed is your training'
 'Ice Skate': 'Ice Skate'
 Id: Id
 'Image "{imgSrc}" is referenced in your maintenance config file, but was not found in "storage/gear-maintenance"': 'Image "{imgSrc}" is referenced in your maintenance config file, but was not found in "storage/gear-maintenance"'
@@ -273,6 +273,7 @@ Socials: Socials
 Speed: Speed
 'Speed distribution': 'Speed distribution'
 Splits: Splits
+'Sport variety': 'Sport variety'
 Squash: Squash
 'Stair Stepper': 'Stair Stepper'
 'Stand Up Paddling': 'Stand Up Paddling'
@@ -281,6 +282,7 @@ Squash: Squash
 'Statistics for Strava': 'Statistics for Strava'
 Stats: Stats
 'Stats per weekday': 'Stats per weekday'
+'Streak started on {date}': 'Streak started on {date}'
 Streaks: Streaks
 Sun: Sun
 Sunday: Sunday
@@ -325,7 +327,6 @@ Tuesday: Tuesday
 Unspecified: Unspecified
 'Updated on': 'Updated on'
 'User badge': 'User badge'
-Variety: Variety
 'Velo Mobiles': 'Velo Mobiles'
 'Very fresh – possible detraining': 'Very fresh – possible detraining'
 'Very high': 'Very high'

translations/messages+intl-icu.de_DE.yaml

@@ -136,11 +136,11 @@ Hikes: Randonnées
 History: Historique
 'History chart': 'History chart'
 'How diverse is your training': 'How diverse is your training'
-'How hard do you train': 'How hard do you train'
-'How long are your sessions': 'How long are your sessions'
-'How much do you train': 'How much do you train'
+'How hard is your typical training session': 'How hard is your typical training session'
+'How long is your typical training session': 'How long is your typical training session'
+'How much do you train on average per week': 'How much do you train on average per week'
+'How much training you do in total on days you train.': 'How much training you do in total on days you train.'
 'How often do you train': 'How often do you train'
-'How packed is your training': 'How packed is your training'
 'Ice Skate': 'Patin à glace'
 Id: Id
 'Image "{imgSrc}" is referenced in your maintenance config file, but was not found in "storage/gear-maintenance"': 'L''image "{imgSrc}" est référencée dans votre fichier de configuration de maintenance, mais n''a pas été trouvée dans "storage/gear-maintenance"'
@@ -273,6 +273,7 @@ Socials: 'Réseaux sociaux'
 Speed: Vitesse
 'Speed distribution': 'Répartition de la vitesse'
 Splits: Splits
+'Sport variety': 'Sport variety'
 Squash: Squash
 'Stair Stepper': Steppeur
 'Stand Up Paddling': 'Paddle debout'
@@ -281,6 +282,7 @@ Squash: Squash
 'Statistics for Strava': 'Statistiques pour Strava'
 Stats: Statistiques
 'Stats per weekday': 'Statistiques par jour de la semaine'
+'Streak started on {date}': 'Streak started on {date}'
 Streaks: Séries
 Sun: Dim
 Sunday: Dimanche
@@ -325,7 +327,6 @@ Tuesday: Mardi
 Unspecified: 'Non spécifié'
 'Updated on': 'Mis à jour le'
 'User badge': "Badge d'utilisateur"
-Variety: Variety
 'Velo Mobiles': Vélomobiles
 'Very fresh – possible detraining': 'Très frais – risque de désentraînement'
 'Very high': 'Très élevé'

translations/messages+intl-icu.en_US.yaml

@@ -136,11 +136,11 @@ Hikes: Escursioni
 History: Cronologia
 'History chart': 'History chart'
 'How diverse is your training': 'How diverse is your training'
-'How hard do you train': 'How hard do you train'
-'How long are your sessions': 'How long are your sessions'
-'How much do you train': 'How much do you train'
+'How hard is your typical training session': 'How hard is your typical training session'
+'How long is your typical training session': 'How long is your typical training session'
+'How much do you train on average per week': 'How much do you train on average per week'
+'How much training you do in total on days you train.': 'How much training you do in total on days you train.'
 'How often do you train': 'How often do you train'
-'How packed is your training': 'How packed is your training'
 'Ice Skate': 'Pattinaggio su ghiaccio'
 Id: ID
 'Image "{imgSrc}" is referenced in your maintenance config file, but was not found in "storage/gear-maintenance"': 'L''immagine "{imgSrc}" è referenziata nel tuo file di configurazione della manutenzione, ma non è stata trovata in "storage/gear-maintenance"'
@@ -273,6 +273,7 @@ Socials: Social
 Speed: Velocità
 'Speed distribution': 'Distribuzione della velocità'
 Splits: Intertempi
+'Sport variety': 'Sport variety'
 Squash: Squash
 'Stair Stepper': 'Stepper a gradini'
 'Stand Up Paddling': 'Stand up paddle'
@@ -281,6 +282,7 @@ Squash: Squash
 'Statistics for Strava': 'Statistiche per Strava'
 Stats: Statistiche
 'Stats per weekday': 'Statistiche giornaliere'
+'Streak started on {date}': 'Streak started on {date}'
 Streaks: Serie
 Sun: Dom
 Sunday: Domenica
@@ -325,7 +327,6 @@ Tuesday: Martedì
 Unspecified: 'Non specificato'
 'Updated on': 'Aggiornato il'
 'User badge': 'Badge utente'
-Variety: Variety
 'Velo Mobiles': Velomobili
 'Very fresh – possible detraining': 'Molto fresco – possibile perdita di forma'
 'Very high': 'Molto alto'