Improvement when fetching template strings.

bfh · Dec 5, 2024 · 2599294 · 2599294
1 parent 415cc10
commit 2599294
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 1 deletion.
diff --git a/classes/repository/instance_repository.php b/classes/repository/instance_repository.php
@@ -179,7 +179,7 @@ private static function get_strings(string $type, int $subratingid, int $instanc
         static $sortedstrings = [];
         $typeid = localized_string_type::str2id($type);
 
-        if ($instanceid > 0) {
+        if ($instanceid > 0 || localized_string_type::is_template_type($type)) {
             $strings = self::get_strings_for_instance($instanceid);
             if (array_key_exists($typeid, $strings) && array_key_exists($subratingid, $strings[$typeid])) {
                 return $strings[$typeid][$subratingid];

diff --git a/classes/repository/model/localized_string_type.php b/classes/repository/model/localized_string_type.php
@@ -126,4 +126,23 @@ public static function id2str(int $id):string {
         }
         return $constants[$id - 1];
     }
+
+    /**
+     * Return whether a type is a template type.
+     *
+     * @param string $type
+     * @return bool
+     */
+    public static function is_template_type(string $type): bool {
+        return in_array($type, [
+            self::TEMPLATE_CRITERION,
+            self::TEMPLATE_CATEGORY_HEADER,
+            self::TEMPLATE_SUBRATING_TITLE,
+            self::TEMPLATE_SUBRATING_DESCRIPTION,
+            self::TEMPLATE_SUBRATING_VERY_NEGATIVE,
+            self::TEMPLATE_SUBRATING_NEGATIVE,
+            self::TEMPLATE_SUBRATING_POSITIVE,
+            self::TEMPLATE_SUBRATING_VERY_POSITIVE,
+        ]);
+    }
 }