@yuneta/gobj-ui 7.26.28 → 7.26.29

package/src/c_yui_form.js

@@ -805,11 +805,13 @@ function build_html_form(gobj, $form, prefix, template)
         }
 
         /*
-         *  Build the html field and add to form, if <tag> is not-null
+         *  Build the html field and add to form, if <tag> is not-null.
+         *  Its label and options are the schema's: column names and
+         *  headers, data.
          */
         if(html_field_conf.tag) {
-            let $field = create_form_field(gobj, $form, prefix, field_desc, html_field_conf);
-            name_form_control($field, html_field_conf);
+            let $field = create_form_field(gobj, $form, prefix, field_desc, /* i18n: data */ html_field_conf);
+            name_form_control($field, /* i18n: data */ html_field_conf);
             $form.appendChild($field);
         }
     });

package/src/c_yui_gobj_tree_js.js

@@ -2862,7 +2862,7 @@ function ac_open_gclass(gobj, event, kw, src)
     close_gclass_view(priv.gclass_view);
     priv.gclass_view = null;
 
-    priv.gclass_view = open_gclass_view(gobj, node_data.gclass, {
+    priv.gclass_view = open_gclass_view(gobj, /* i18n: data */ node_data.gclass, {
         title_prefix: gobj_yuno_name() || "",
         /*  Which state THIS gobj is in. The description describes the
          *  CLASS and cannot carry it, and the tree is the only party

package/src/c_yui_nav.js

@@ -230,17 +230,19 @@ function build_ui(gobj)
     let menu_id = gobj_read_attr(gobj, "menu_id") || "nav";
     let $container;
 
+    /*  The items are the app's nav declaration: the keys of their names
+     *  are read there (app_config.json), not here.  */
     switch(layout) {
-        case "vertical":   $container = render_vertical(gobj, items); break;
-        case "icon-bar":   $container = render_icon_bar(gobj, items); break;
-        case "tabs":       $container = render_tabs(gobj, items);     break;
-        case "drawer":     $container = render_drawer(gobj, items);   break;
-        case "submenu":    $container = render_submenu(gobj, items);  break;
-        case "accordion":  $container = render_accordion(gobj, items); break;
-        case "cards":      $container = render_cards(gobj, items);    break;
-        case "backbar":    $container = render_backbar(gobj);         break;
-        case "breadcrumb": $container = render_breadcrumb(gobj, items); break;
-        default:           $container = render_vertical(gobj, items);
+        case "vertical":   $container = render_vertical(gobj, /* i18n: data */ items); break;
+        case "icon-bar":   $container = render_icon_bar(gobj, /* i18n: data */ items); break;
+        case "tabs":       $container = render_tabs(gobj, /* i18n: data */ items);     break;
+        case "drawer":     $container = render_drawer(gobj, /* i18n: data */ items);   break;
+        case "submenu":    $container = render_submenu(gobj, /* i18n: data */ items);  break;
+        case "accordion":  $container = render_accordion(gobj, /* i18n: data */ items); break;
+        case "cards":      $container = render_cards(gobj, /* i18n: data */ items);    break;
+        case "backbar":    $container = render_backbar(gobj);                          break;
+        case "breadcrumb": $container = render_breadcrumb(gobj, /* i18n: data */ items); break;
+        default:           $container = render_vertical(gobj, /* i18n: data */ items);
     }
     $container.setAttribute("data-nav-zone", zone);
     $container.setAttribute("data-nav-layout", layout);

package/src/c_yui_period.js

@@ -386,7 +386,7 @@ function mode_name(mode)
         return t(mode.roll.label || mode.id);
     }
     if(mode.kind === "bucket") {
-        return period_name(/* i18n: YUI_TIME_I18N_KEYS */ mode.spec, t);
+        return period_name(mode.spec, t);
     }
     return t(mode.id);                      /*  span / custom  */
 }
@@ -482,7 +482,7 @@ function build_ui(gobj)
         if(mode.overflow || mode.hidden) {
             continue;
         }
-        priv.$modes.appendChild(build_mode_button(gobj, mode));
+        priv.$modes.appendChild(build_mode_button(gobj, /* i18n: C_YUI_PERIOD_I18N_KEYS, YUI_TIME_I18N_KEYS */ mode));
     }
 
     /*  Scroll plumbing, not an action: it changes nothing outside the strip.
@@ -572,7 +572,7 @@ function build_mode_button(gobj, mode)
 {
     /*  The name is COMPOSED for a bucket (period_name), so it carries no
      *  key: ac_language_changed() rewrites the text and both names.  */
-    let name = mode_name(/* i18n: C_YUI_PERIOD_I18N_KEYS, YUI_TIME_I18N_KEYS */ mode);
+    let name = mode_name(mode);
     let $btn = createElement2(
         ["button", {class: `button YUI_PERIOD_MODE YUI_PERIOD_MODE_${mode.id.toUpperCase()}`,
                     type: "button", title: name, "aria-label": name},

package/src/c_yui_schema_editor.js

@@ -383,7 +383,7 @@ function mt_destroy(gobj)
 function refuse_bad_name(gobj, $message)
 {
     mark_name_field(gobj, true);
-    yui_shell_show_error(yui_shell_of(gobj), /* i18n: data */ $message, {t: t});
+    yui_shell_show_error(yui_shell_of(gobj), $message, {t: t});
     return -1;
 }
 
@@ -1258,7 +1258,7 @@ function render(gobj)
     }
     if(state === "ST_IDLE") {
         show_notice(gobj, priv.load_error ? "cannot load the schemas" : "not connected",
-            priv.load_error, true);
+            /* i18n: data */ priv.load_error, true);
         destroy_diagram(gobj);
         clear($body);
         return;
@@ -1362,16 +1362,16 @@ function render_treedbs(gobj, $body)
     let $cards = [];
 
     for(let treedb of priv.model.treedbs) {
-        let tags = [
+        const from_c = treedb.c_schema_version !== undefined &&
+            String(treedb.c_schema_version) !== String(treedb.schema_version);
+        const tags = [
             {i18n: "topics", text: treedb.topics.length},
             {i18n: "version", text: treedb.schema_version === undefined
-                ? "?" : treedb.schema_version}
+                ? "?" : treedb.schema_version},
+            ...(from_c
+                ? [{i18n: "from c", text: treedb.c_schema_version, style: "is-warning is-light"}]
+                : [])
         ];
-        if(treedb.c_schema_version !== undefined &&
-            String(treedb.c_schema_version) !== String(treedb.schema_version)
-        ) {
-            tags.push({i18n: "from c", text: treedb.c_schema_version, style: "is-warning is-light"});
-        }
         $cards.push(open_card(gobj, "SCHEMA_TREEDB_CARD", treedb.id, "yi-database",
             tags, "EV_SELECT_TREEDB", {treedb: treedb.id}));
     }
@@ -1406,7 +1406,7 @@ function render_topics(gobj, $body)
     let treedb = current_treedb(gobj);
 
     if(!treedb) {
-        show_notice(gobj, "that treedb is not here any more", priv.treedb_id);
+        show_notice(gobj, "that treedb is not here any more", /* i18n: data */ priv.treedb_id);
         return;
     }
 
@@ -1554,7 +1554,7 @@ function render_columns(gobj, $body)
     let topic = current_topic(gobj);
 
     if(!topic) {
-        show_notice(gobj, "that topic is not here any more", priv.topic_name);
+        show_notice(gobj, "that topic is not here any more", /* i18n: data */ priv.topic_name);
         return;
     }
 
@@ -1815,7 +1815,7 @@ function render_diagram(gobj)
     if(!treedb) {
         destroy_diagram(gobj);
         clear($body);
-        show_notice(gobj, "that treedb is not here any more", priv.treedb_id);
+        show_notice(gobj, "that treedb is not here any more", /* i18n: data */ priv.treedb_id);
         return;
     }
     if(!gclass_find_by_name("C_YUI_TREEDB_SCHEMA")) {
@@ -1921,7 +1921,7 @@ function open_dialog(gobj, $content, title, logical, title_prefix)
     priv.dialog_gen = priv.model_gen;
     priv.dialog_kind = logical;
     priv.dialog_content = $content;
-    priv.dialog = yui_shell_show_modal(yui_shell_of(gobj), /* i18n: data */ $content, {
+    priv.dialog = yui_shell_show_modal(yui_shell_of(gobj), $content, {
         dialog:        true,
         title:         title,
         title_prefix:  title_prefix || "",
@@ -2435,8 +2435,8 @@ function open_report(gobj, findings, treedb_id)
         return ["tr", {class: `SCHEMA_REPORT_ROW SCHEMA_REPORT_${finding.severity.toUpperCase()}`}, [
             ["td", {class: "SCHEMA_REPORT_SEVERITY"}, [
                 ["span", {class: `tag ${finding.severity === "error" ? "is-danger" : "is-warning"}` +
-                                 " is-light", i18n: /* i18n: C_YUI_SCHEMA_EDITOR_I18N_KEYS */ finding.severity},
-                    t(/* i18n: C_YUI_SCHEMA_EDITOR_I18N_KEYS */ finding.severity)]
+                                 " is-light", i18n: finding.severity},
+                    t(finding.severity)]
             ]],
             ["td", {class: "SCHEMA_REPORT_WHAT", i18n: finding.code}, t(finding.code)],
             ["td", {class: "SCHEMA_REPORT_TOPIC"}, text_node(finding.topic || "")],
@@ -4256,7 +4256,7 @@ function confirm_column_delete(gobj, verdict)
         }
         $warning = createElement2(["div", {class: "SCHEMA_COLUMN_DATA_WARNING"}, children]);
     }
-    confirm_then(gobj, $warning? /* i18n: data */ $warning : message, `${c.topic}.${c.col}`,
+    confirm_then(gobj, $warning? $warning : message, `${c.topic}.${c.col}`,
         {what: "column", topic: c.topic, col: c.col});
     return 0;
 }
@@ -4494,7 +4494,9 @@ function ac_validate(gobj, event, kw, src)
         written_topics: Object.keys(priv.written),
         baseline:       priv.baseline
     });
-    open_report(gobj, findings, treedb.id);
+    /*  The severities are C_YUI_SCHEMA_EDITOR_I18N_KEYS; the codes are the
+     *  checks' own keys, read where schema_validate.js writes them.  */
+    open_report(gobj, /* i18n: C_YUI_SCHEMA_EDITOR_I18N_KEYS */ findings, treedb.id);
     if(has_errors(findings)) {
         log_warning(`${gobj_short_name(gobj)}: ${treedb.id} would be refused as it is`);
     }
@@ -4578,7 +4580,9 @@ function ac_preview_import(gobj, event, kw, src)
 
     let plan = plan_import(treedb, incoming, {prune: !!kw.prune});
     priv.import_plan = plan;
-    render_import_plan(gobj, plan);
+    /*  Its writes are SCHEMA_IMPORT_I18N_KEYS; its conflicts are keys of
+     *  their own, read where schema_import.js writes them.  */
+    render_import_plan(gobj, /* i18n: SCHEMA_IMPORT_I18N_KEYS */ plan);
     return 0;
 }
 

package/src/c_yui_shell.js

@@ -281,7 +281,8 @@ function mt_start(gobj)
 
     build_item_index(gobj, config);
     instantiate_menus(gobj, config);
-    build_toolbar(gobj, config);
+    /*  The app's shell declaration: its toolbar's keys are read there  */
+    build_toolbar(gobj, /* i18n: data */ config);
 
     /*  lifecycle: "eager" — preinstantiate views that must exist from boot. */
     preinstantiate_eager_views(gobj);
@@ -1781,7 +1782,7 @@ function safe_id(s)
  ************************************************************/
 function build_toolbar(gobj, config)
 {
-    let tb = config && config.toolbar;
+    const tb = config && config.toolbar;
     if(!tb || !is_array(tb.items)) {
         return;
     }
@@ -2341,7 +2342,7 @@ function open_toolbar_dropdown(gobj, item, action, $trigger)
     let raw_items = is_array(action.items) ? action.items : [];
     for(let i = 0; i < raw_items.length; i++) {
         let sub = raw_items[i];
-        let $row = build_dropdown_row(gobj, sub, i);
+        let $row = build_dropdown_row(gobj, /* i18n: data */ sub, i);    // the app's shell declaration
         if(!$row) {
             continue;
         }

package/src/c_yui_treedb_graph.js

@@ -1361,8 +1361,7 @@ function answer_print_tranger_refused(gobj, path, answer)
         gobj_send_event(jv, "EV_SUBTREE_ERROR",
             Object.assign({path: path}, answer), gobj);
     } else {
-        yui_shell_show_error(yui_shell_of(gobj),
-            /* i18n: data */ answer.i18n || answer.error, {t: t});
+        yui_shell_show_error(yui_shell_of(gobj), answer.i18n || answer.error, {t: t});
     }
 }
 
@@ -1413,7 +1412,7 @@ function request_print_tranger(gobj, path)
         }, gobj);
     if(ret) {
         log_error(ret);
-        answer_print_tranger_refused(gobj, path, {error: refusal_text(ret)});
+        answer_print_tranger_refused(gobj, path, {error: /* i18n: data */ refusal_text(ret)});
         return;
     }
     if(path) {
@@ -2193,7 +2192,7 @@ function ac_mt_command_answer(gobj, event, kw, src)
             /*  The schema couldn't load (not a treedb, no authz for it, backend
              *  down…). Show an inline banner in the view rather than a blocking
              *  app-modal that wedges the whole SPA behind an empty tab. */
-            show_load_error(gobj, t(comment));
+            show_load_error(gobj, t(/* i18n: data */ comment));
         } else {
             yui_shell_show_error(yui_shell_of(gobj), /* i18n: data */ comment, {t: t});
         }

package/src/c_yui_treedb_topic_with_form.js

@@ -325,7 +325,7 @@ function present_json_popup(gobj, $box, opts)
 
     if(is_mobile()) {
         return {
-            modal: yui_shell_show_modal(shell, /* i18n: data */ $box, {
+            modal: yui_shell_show_modal(shell, $box, {
                 dialog:        true,
                 logical_class: opts.logical_class + "_SHEET",
                 title_prefix:  opts.title_prefix,
@@ -1512,7 +1512,7 @@ function create_tabulator(gobj)
 
         let colDef = {
             title: col_label(col, gobj_read_str_attr(gobj, "topic_name")),
-            titleFormatter: col_title_formatter(gobj, col),
+            titleFormatter: col_title_formatter(gobj, /* i18n: data */ col),     // a column of the schema
             field: col.id,
             sorter: sorter,
             hozAlign: hozAlign,
@@ -2496,7 +2496,7 @@ function open_form_dialog(gobj, mode, record)
      *  are wired by the shell. `before_close` preserves the unsaved-changes
      *  guard — it vetoes the dismiss and, on confirm, closes the modal
      *  itself. `on_close` tears the hosted form child down. */
-    priv.form_modal = yui_shell_show_modal(shell, /* i18n: data */ $body, {
+    priv.form_modal = yui_shell_show_modal(shell, $body, {
         dialog:        true,
         logical_class: "TREEDB_FORM_SHEET",
         title_prefix:  title_prefix,
@@ -2676,7 +2676,7 @@ function open_schema_dialog(gobj)
     /*  Title split in two halves: the topic name is DATA (never
      *  translated) and "schema" is the kind (carries its i18n key), so
      *  the header re-translates on a language switch. */
-    let presented = present_json_popup(gobj, $box, {
+    let presented = present_json_popup(gobj, /* i18n: data */ $box, {     // the viewer's own DOM
         name:          "schemawin_" + clean_name(gobj_name(gobj)),
         logical_class: "TREEDB_SCHEMA",
         title_prefix:  gobj_read_str_attr(gobj, "topic_name"),
@@ -2803,11 +2803,11 @@ function open_cell_json_dialog(gobj, row_id, col_id)
      *  i18n key — the shared `col.id` one, so the header re-translates on a
      *  language switch and reads as the raw id where the app defines no key
      *  (exactly what an untranslated column header already shows). */
-    let presented = present_json_popup(gobj, $box, {
+    let presented = present_json_popup(gobj, /* i18n: data */ $box, {     // the viewer's own DOM
         name:          "cellwin_" + clean_name(gobj_name(gobj)),
         logical_class: "TREEDB_CELL_JSON",
         title_prefix:  String(row_id),
-        title:         /* i18n: data */ col_id,
+        title:         col_id,
         icon:          "yi-js-square",
         forget_window: function() {
             priv.cell_json_win = null;
@@ -3019,7 +3019,7 @@ function open_cell_file_dialog(gobj, row_id, col_id)
         name:          "filewin_" + clean_name(gobj_name(gobj)),
         logical_class: "TREEDB_CELL_FILE",
         title_prefix:  String(row_id),
-        title:         /* i18n: data */ col_id,
+        title:         col_id,
         icon:          "yi-eye",
         forget_window: function() {
             priv.cell_file_win = null;
@@ -3167,7 +3167,7 @@ function open_hook_choice_dialog(gobj, targets, parent_id, hook)
             }];
         })]
     );
-    priv.hook_choice_modal = yui_shell_show_modal(shell, /* i18n: data */ $body, {
+    priv.hook_choice_modal = yui_shell_show_modal(shell, $body, {
         dialog:        true,
         logical_class: "TREEDB_HOOK_CHOICE_SHEET",
         title:         "choose a topic",
@@ -4132,7 +4132,7 @@ function ac_delete_rows(gobj, event, kw, src)
             return 0;
         }
 
-        confirm_then(gobj, /* i18n: data */ build_delete_question(gobj, rows),
+        confirm_then(gobj, build_delete_question(gobj, rows),
             {what: "delete_selection", ids: yui_row_ids(tabulator, rows)});
 
     } else {
@@ -4140,7 +4140,7 @@ function ac_delete_rows(gobj, event, kw, src)
          *  Delete one row
          *  {row: }
          *----------------------------*/
-        confirm_then(gobj, /* i18n: data */ build_delete_question(gobj, kw.row),
+        confirm_then(gobj, build_delete_question(gobj, kw.row),
             {what: "delete_row", ids: yui_row_ids(tabulator, [kw.row])});
     }
 
@@ -4599,7 +4599,7 @@ function ac_show_hook_data(gobj, event, kw, src)
                             String(kw.row_id), kw.col_id);
         return 0;
     }
-    open_hook_choice_dialog(gobj, targets, String(kw.row_id), kw.col_id);
+    open_hook_choice_dialog(gobj, /* i18n: data */ targets, String(kw.row_id), kw.col_id);    // the schema's topics
     return 0;
 }
 
@@ -4681,7 +4681,7 @@ function ac_refresh(gobj, event, kw, src)
  ************************************************************/
 function ac_show_cell_json(gobj, event, kw, src)
 {
-    open_cell_json_dialog(gobj, kw.row_id, kw.col_id);
+    open_cell_json_dialog(gobj, kw.row_id, /* i18n: data */ kw.col_id);
 
     return 0;
 }
@@ -4695,7 +4695,7 @@ function ac_show_cell_json(gobj, event, kw, src)
  ************************************************************/
 function ac_show_cell_file(gobj, event, kw, src)
 {
-    open_cell_file_dialog(gobj, kw.row_id, kw.col_id);
+    open_cell_file_dialog(gobj, kw.row_id, /* i18n: data */ kw.col_id);
 
     return 0;
 }
@@ -5078,7 +5078,7 @@ function ac_open_columns(gobj, event, kw, src)
         ));
     }
 
-    yui_shell_show_modal(shell, /* i18n: data */ $list, {
+    yui_shell_show_modal(shell, $list, {
         dialog:        true,
         logical_class: "TREEDB_COLUMNS_DIALOG",
         title_prefix:  gobj_read_str_attr(gobj, "topic_name"),
@@ -5291,7 +5291,7 @@ function open_table_json_dialog(gobj, records)
     }
 
     /*  The topic is DATA (the prefix), the title carries its key.  */
-    let presented = present_json_popup(gobj, $box, {
+    let presented = present_json_popup(gobj, /* i18n: data */ $box, {     // the viewer's own DOM
         name:          "tablejsonwin_" + clean_name(gobj_name(gobj)),
         logical_class: "TREEDB_TABLE_JSON",
         title_prefix:  gobj_read_str_attr(gobj, "topic_name"),

package/src/c_yui_treedb_topics.js

@@ -1368,8 +1368,9 @@ function process_treedb_descs(gobj)
         );
 
         // TODO get icon from remote config
-        add_tab(gobj, gobj_topic_form, id, key, "yi-table");
-        add_topic_card(gobj, id, key, "yi-table", desc);
+        /*  `key` is a topic of the backend's schema: data  */
+        add_tab(gobj, gobj_topic_form, id, /* i18n: data */ key, "yi-table");
+        add_topic_card(gobj, id, /* i18n: data */ key, "yi-table", desc);
 
         gobj_start(gobj_topic_form);
     }
@@ -1390,7 +1391,7 @@ function process_treedb_descs(gobj)
         if(gobj.priv._pending_info) {
             let ti = gobj.priv._pending_info;
             gobj.priv._pending_info = null;
-            show_topic_info(gobj, ti);
+            show_topic_info(gobj, /* i18n: data */ ti);     // a topic name
         } else if(href && href.indexOf("?") >= 0) {
             gobj_send_event(gobj, "EV_SHOW", {href: href}, gobj);
         } else {
@@ -2223,8 +2224,7 @@ function answer_print_tranger_refused(gobj, path, answer)
         gobj_send_event(jv, "EV_SUBTREE_ERROR",
             Object.assign({path: path}, answer), gobj);
     } else {
-        yui_shell_show_error(yui_shell_of(gobj),
-            /* i18n: data */ answer.i18n || answer.error, {t: t});
+        yui_shell_show_error(yui_shell_of(gobj), answer.i18n || answer.error, {t: t});
     }
 }
 
@@ -2274,7 +2274,7 @@ function request_print_tranger(gobj, path)
         }, gobj);
     if(ret) {
         log_error(ret);
-        answer_print_tranger_refused(gobj, path, {error: refusal_text(ret)});
+        answer_print_tranger_refused(gobj, path, {error: /* i18n: data */ refusal_text(ret)});
         return;
     }
     if(path) {
@@ -2459,7 +2459,7 @@ function ac_mt_command_answer(gobj, event, kw, src)
             /*  The schema couldn't load (not a treedb, no authz for it, backend
              *  down…). Show an inline banner in the view rather than a blocking
              *  app-modal that wedges the whole SPA behind an empty tab. */
-            show_load_error(gobj, t(comment));
+            show_load_error(gobj, t(/* i18n: data */ comment));
         } else {
             yui_shell_show_error(yui_shell_of(gobj), /* i18n: data */ comment, {t: t});
             /*  A refused write leaves the TABLE showing what the operator
@@ -2737,7 +2737,7 @@ function ac_show(gobj, event, kw, src)
  ************************************************************/
 function ac_show_topic_info(gobj, event, kw, src)
 {
-    show_topic_info(gobj, kw && kw.topic);
+    show_topic_info(gobj, /* i18n: data */ kw && kw.topic);    // a topic name
     return 0;
 }
 

package/src/c_yui_window_manager.js

@@ -510,9 +510,12 @@ function ac_register_window(gobj, event, kw, src)
         label_items.push(['span', {class: 'yui-dock-label-prefix'},
             text_node(prefix)]);    // data, not markup
     }
+    /*  An FSM action: what it is given is the kw of EV_REGISTER_WINDOW,
+     *  which no reader can follow. `title_key` is the window's `title`,
+     *  a key its HOST chose when it created the window.  */
     if(title_key) {
         label_items.push(
-            ['span', {class: 'yui-dock-label-kind', i18n: title_key},
+            ['span', {class: 'yui-dock-label-kind', i18n: /* i18n: data */ title_key},
              kind_text || title_key]
         );
     }
@@ -532,7 +535,7 @@ function ac_register_window(gobj, event, kw, src)
     let $chip = createElement2(
         ['div', Object.assign(
             {class: 'yui-dock-chip', role: 'button', tabindex: '0', title: title},
-            (!prefix && title_key) ? {'data-i18n-title': title_key} : {}
+            (!prefix && title_key) ? {'data-i18n-title': /* i18n: data */ title_key} : {}
         ), [
             chip_lead(kw.icon),
             ['span', {class: 'yui-dock-label'}, label_items],