Merge pull request #77 from pi-hole/fix/settings-strings

WEB-CR-6 Fix missing translation string errors in settings

public/i18n/en/common.json

@@ -11,7 +11,7 @@
     "Add": "Add",
     "Time": "Time",
     "Type": "Type",
-    "Network": "Network\n",
+    "Network": "Network",
     "Action": "Action",
     "Enabled": "Enabled",
     "Disabled": "Disabled",

public/i18n/en/location.json

@@ -7,5 +7,8 @@
     "Wildcard": "Wildcard",
     "Login": "Login",
     "Logout": "Logout",
-    "Regex": "Regex"
+    "Regex": "Regex",
+    "Settings": "Settings",
+    "Networking": "Networking",
+    "Versions": "Versions"
 }

src/components/settings/DNSInfo.js

@@ -88,7 +88,7 @@ class DNSInfo extends Component {
             <div className="col-lg-4 col-sm-4 col-xs-4">
               <pre>
                 <br/>
-                {t("Interface listening behaviour")}: {this.state.options.listening_type}<br/>
+                {t("Interface listening behavior")}: {this.state.options.listening_type}<br/>
                 {t("Forward FQDNs only")}: {this.state.options.fqdn_required.toString()}<br/>
                 {t("Only forward public reverse lookups")}:{this.state.options.bogus_priv.toString()}<br/>
                 {t("Use DNSSEC")}: {this.state.options.dnssec.toString()}

src/components/settings/VersionCard.js

@@ -41,18 +41,20 @@ class VersionCard extends Component {
           <Collapse isOpen={!this.state.collapsed}>
             <table className="table table-borderless table-sm table-condensed"
                    style={{ marginTop: "1rem", marginBottom: "0" }}>
-              <tr>
-                <td>{t("Branch")}</td>
-                <td>{this.props.branch}</td>
-              </tr>
-              <tr>
-                <td>{t("Tag")}</td>
-                <td>{this.props.tag}</td>
-              </tr>
-              <tr>
-                <td>{t("Hash")}</td>
-                <td>{this.props.hash}</td>
-              </tr>
+              <tbody>
+                <tr>
+                  <td>{t("Branch")}</td>
+                  <td>{this.props.branch}</td>
+                </tr>
+                <tr>
+                  <td>{t("Tag")}</td>
+                  <td>{this.props.tag}</td>
+                </tr>
+                <tr>
+                  <td>{t("Hash")}</td>
+                  <td>{this.props.hash}</td>
+                </tr>
+              </tbody>
             </table>
           </Collapse>
         </div>

src/i18n.js

@@ -13,7 +13,7 @@ export function setupI18n() {
       fallbackLng: "en",
       ns: ['common'],
       defaultNS: "common",
-      fallbackNS: ['dashboard', 'footer', 'lists', 'location', 'login', 'query-log'],
+      fallbackNS: ["dashboard", "footer", "lists", "location", "login", "query-log", "settings"],
       nsSeparator: false,
       keySeparator: false,
       debug: config.developmentMode,