make setting info translatable

4 files changed, 14 insertions, 14 deletions

diff --git a/Digitigrade/GlobalSettings.php b/Digitigrade/GlobalSettings.php
index 79f25d3..3e893e1 100644
--- a/Digitigrade/GlobalSettings.php
+++ b/Digitigrade/GlobalSettings.php
@@ -115,9 +115,9 @@ class GlobalSettings extends Singleton {
     }
 
     /**
-     * Gets information (name, description, default value) for a given setting.
+     * Gets information (default value, maybe type) for a given setting.
      * @param string $key which setting to look up
-     * @return ?array{item: string, value: string} associative array of info,
+     * @return ?array associative array of info,
      * or null if none is available
      */
     public function getInfo(string $key): ?array {
diff --git a/locale/en_GB.json b/locale/en_GB.json
index 88e4abf..b5dd0f2 100644
--- a/locale/en_GB.json
+++ b/locale/en_GB.json
@@ -80,6 +80,16 @@
   "globalSettings.pageTitle.instance": "Instance settings",
   "globalSettings.pageTitle.about": "About this instance",
   "globalSettings.categories": "Categories: ",
+  "globalSettings.s.instance.name.name": "Instance name",
+  "globalSettings.s.instance.name.description": "Shown in the page header and instance information",
+  "globalSettings.s.instance.description.name": "Instance description",
+  "globalSettings.s.instance.description.description": "Briefly describe your instance's purpose or tagline",
+  "globalSettings.s.instance.openRegistrations.name": "Open registrations",
+  "globalSettings.s.instance.openRegistrations.description": "Allow new users to sign up?",
+  "globalSettings.s.about.description.name": "Description",
+  "globalSettings.s.about.description.description": "Describe your instance's purpose in more detail. You can use HTML formatting",
+  "globalSettings.s.about.terms.name": "Terms of use",
+  "globalSettings.s.about.terms.description": "Policies and rules for users of this instance. You can use HTML formatting",
   "about.pageTitle": "About this instance",
   "about.terms.heading": "Rules and terms of use",
   "form.edit": "Edit",
diff --git a/settings.global.ini b/settings.global.ini
index 7d4b392..9a0269c 100644
--- a/settings.global.ini
+++ b/settings.global.ini
@@ -2,30 +2,20 @@
 # ini values sometimes and it's not worth the debugging headache
 
 [instance.name]
-name = "Instance name"
-description = "Shown in the page header and instance information"
 default = "Digitigrade"
 
 [instance.description]
-name = "Instance description"
-description = "Briefly describe your instance's purpose or tagline"
 default = "A Digitigrade instance"
 type = "longtext"
 
 [instance.openRegistrations]
-name = "Open registrations"
-description = "Allow new users to sign up?"
 default = "false"
 type = "boolean"
 
 [about.description]
-name = "Description"
-description = "Describe your instance's purpose in more detail. You can use HTML formatting"
 default = ""
 type = "longtext"
 
 [about.terms]
-name = "Terms of use"
-description = "Policies and rules for users of this instance. You can use HTML formatting"
 default = ""
 type = "longtext"
diff --git a/templates/settings_editor.php b/templates/settings_editor.php
index 1bf72b7..02cf8d1 100644
--- a/templates/settings_editor.php
+++ b/templates/settings_editor.php
@@ -10,8 +10,8 @@ $settings = GlobalSettings::getInstance();
         call_template('settings_field', [
             'key' => $key,
             'value' => $value,
-            'name' => $info['name'] ?? $key,
-            'description' => $info['description'] ?? '',
+            'name' => $info['name'] ?? __("globalSettings.s.$key.name"),
+            'description' => $info['description'] ?? __("globalSettings.s.$key.description"),
             'options' => $info['options'] ?? null,
             'type' => $info['type'] ?? 'string'
         ]);