Prefer english name if available.

meisterT · nickygerritsen · commit ea727c3f871f · 2025-05-23T18:57:51.000Z
diff --git a/webapp/src/Entity/Problem.php b/webapp/src/Entity/Problem.php
@@ -52,7 +52,7 @@ class Problem extends BaseApiEntity implements
 
     #[ORM\Column(options: ['comment' => 'Descriptive name'])]
     #[Assert\NotBlank]
-    private string $name;
+    private string $name = 'Unknown name';
 
     #[ORM\Column(options: [
         'comment' => 'Maximum run time (in seconds) for this problem',
diff --git a/webapp/src/Service/ImportProblemService.php b/webapp/src/Service/ImportProblemService.php
@@ -1006,11 +1006,14 @@ public static function parseYaml(bool|string $problemYaml, array &$messages, str
         $yamlProblemProperties = [];
         if (isset($yamlData['name'])) {
             if (is_array($yamlData['name'])) {
-                foreach ($yamlData['name'] as $name) {
-                    // TODO: select a specific instead of the first language.
-                    $yamlProblemProperties['name'] = $name;
-                    break;
+                // Prefer english name, but if not available, use first name.
+                $englishOrFirstName = null;
+                foreach ($yamlData['name'] as $lang => $name) {
+                    if ($englishOrFirstName === null || $lang === 'en') {
+                        $englishOrFirstName = $name;
+                    }
                 }
+                $yamlProblemProperties['name'] = $englishOrFirstName;
             } else {
                 $yamlProblemProperties['name'] = $yamlData['name'];
             }
diff --git a/webapp/tests/Unit/Service/ImportProblemServiceTest.php b/webapp/tests/Unit/Service/ImportProblemServiceTest.php
@@ -23,7 +23,7 @@ public function testEmptyYaml()
 
         $ret = ImportProblemService::parseYaml($yaml, $messages, $validationMode, PropertyAccess::createPropertyAccessor(), $problem);
         $this->assertTrue($ret);
-        $this->assertEquals('', $problem->getName());
+        $this->assertEquals('Unknown name', $problem->getName());
     }
 
     public function testMinimalYamlTest()
@@ -248,4 +248,55 @@ public function testMaximalProblem() {
         $this->assertEquals(3, $problem->getMultipassLimit());
         $this->assertEquals('special flags', $problem->getSpecialCompareArgs());
     }
+
+    public function testMultipleLanguages() {
+        $yaml = <<<YAML
+name:
+    de: deutsch
+    en: english
+YAML;
+        $messages = [];
+        $validationMode = 'xxx';
+        $problem = new Problem();
+
+        $ret = ImportProblemService::parseYaml($yaml, $messages, $validationMode, PropertyAccess::createPropertyAccessor(), $problem);
+        $this->assertTrue($ret);
+        $this->assertEmpty($messages);
+        $this->assertEquals('english', $problem->getName());
+    }
+
+    public function testKattisExample()
+    {
+        $yaml = <<<YAML
+problem_format_version: 2023-07-draft
+uuid: 5ca6ba5b-36d5-4eff-8aa7-d967cbc4375e
+source: Kattis
+license: cc by-sa
+
+type: interactive
+name:
+  en: Guess the Number
+  sv: Gissa talet
+
+# Override standard limits: say that the TLE solutions provided should
+# be at least 4 times above the time limit in order for us to be
+# happy.
+limits:
+  time_multipliers:
+    time_limit_to_tle: 4
+YAML;
+        $messages = [];
+        $validationMode = 'xxx';
+        $problem = new Problem();
+
+        $ret = ImportProblemService::parseYaml($yaml, $messages, $validationMode, PropertyAccess::createPropertyAccessor(), $problem);
+        $this->assertTrue($ret);
+        $this->assertEmpty($messages);
+        $this->assertEquals('Guess the Number', $problem->getName());
+        $this->assertEquals('pass-fail, interactive', $problem->getTypesAsString());
+        $this->assertEquals('default', $validationMode);
+        $this->assertEquals(0, $problem->getTimelimit());
+        $this->assertEquals(null, $problem->getMemlimit());
+        $this->assertEquals(null, $problem->getOutputlimit());
+    }
 }
