Implementing weights translations

client/common/i18n.js

@@ -29,15 +29,15 @@ class I18n {
         return this._availableLanguages;
     }
 
-    _(key, formats) {
+    _(key, formats, options={ prefix: '', postfix: '' }) {
         let value = null;
         if ( ! this.jed)
             value = key;
         else
             value = this.jed.dcnpgettext(undefined, undefined, key);
 
         if (formats)
-            value = this.format(value, formats);
+            value = this.format(value, formats, options);
         return value;
     }
 
@@ -97,12 +97,33 @@ class I18n {
         return value;
     }
 
-    format(value, formats) {
-        let newValue = value;
-        for (let name in formats) {
-            newValue = newValue.replace(`{${name}}`, formats[name]);
+    __(compound, options={ prefix: '', postfix: '' }) {
+        const parts = compound.split('\u0004');
+        if (parts.length === 1) {
+            // not a translatable string
+            return parts[0];
+        }
+        else if (parts.length < 3) {
+            return _(parts[0]);
+        }
+        else {
+            const key = parts[1];
+            const values = JSON.parse(parts[2]);
+            return _(key, values, options);
+        }
+    }
+
+    format(fstring, values, options={ prefix: '', postfix: '' }) {
+        const { prefix, postfix } = options;
+        if (typeof values === 'string') {
+            return fstring.replace('{}', `${ prefix }${ values }${ postfix }`);
+        }
+        else {
+            let value = fstring;
+            for (let name in values)
+                value = value.replace(`{${name}}`, `${ prefix }${ values[name] }${ postfix }`);
+            return value;
         }
-        return newValue;
     }
 
     isRTL() {

client/main/strings.ts

@@ -0,0 +1,13 @@
+
+// these are just extra strings we need translated, but don't fit anywhere.
+
+// from jmvcore
+_('The data is weighted, however this analysis does not support weights. This analysis used the data unweighted.')
+_('The data is weighted by the variable {}, however this analysis does not support non-integer weights. The weights were rounded to the nearest integer.')
+_('The data is weighted by the variable {}.')
+
+
+// these *were* in our translations, and apparently aren't any more
+// but i feel like we're going to need them in the future
+_('Error')
+_('Unable to save')

client/resultsview/notice.js

@@ -6,6 +6,8 @@ Backbone.$ = $;
 
 const Elem = require('./element');
 
+import i18n from '../common/i18n';
+
 
 export const NoticeModel = Elem.Model.extend({
     defaults : {
@@ -64,7 +66,10 @@ export const NoticeView = Elem.View.extend({
 
         let $content = this.$el.find('.content');
         this.$el.find('a[href]').off('click');
-        $content.html(doc.content);
+
+        const content = i18n.__(doc.content, { prefix: '<strong>', postfix: '</strong>' });
+        $content.html(content);
+
         this.$el.find('a[href]').on('click', (event) => this._handleLinkClick(event));
     },
     _handleLinkClick(event) {

server/jamovi/server/analyses/weights.py

@@ -81,7 +81,7 @@ def _update(self, *, just_created=False):
             weights = self.options.get_value('weights')
             if weights:
                 bolded = f'<strong>{ html.escape(weights) }</strong>'
-                content = _('Data is weighted by the variable {}').format(bolded)
+                content = _('The data is weighted by the variable {}.').format(bolded)
             else:
                 content = _('Data is unweighted')
             self._html_pb.content = content