Use field.baseKey and field.index to generate localizedFieldID

Author: pedromml

data/core.yaml

@@ -2543,7 +2543,7 @@ en:
       source:
         label: Source
       source_multiple:
-        label: Source {localizerOption}
+        label: Source {index}
     presets:
       type/chronology:
         name: Chronology

modules/presets/field.js

@@ -10,10 +10,11 @@ export function presetField(fieldID, field, allFields) {
   allFields = allFields || {};
   let _this = Object.assign({}, field);   // shallow copy
 
-  // This handles fieldIDs that contain ':', like 'source:1'
-  let localizerFieldID = fieldID.includes(':') ? fieldID.split(':')[0] + '_multiple': fieldID;
-  // This is what comes after the ':' in the fieldID. 
-  let localizerOption = fieldID.includes(':') ? fieldID.split(':')[1]: 0;
+  // This handles fields that are composed of a base key and an index, like 'source:1'
+  let localizerFieldID = fieldID;
+  if (field.baseKey && field.index){
+    localizerFieldID = field.baseKey + '_multiple';
+  }
 
   _this.id = fieldID;
 
@@ -48,10 +49,10 @@ export function presetField(fieldID, field, allFields) {
     return _this;
   };
 
-  _this.title = () => _this.overrideLabel || _this.resolveReference('label').t('label', { 'default': fieldID, 'localizerOption': localizerOption });
+  _this.title = () => _this.overrideLabel || _this.resolveReference('label').t('label', { 'default': fieldID, 'index': field.index });
   _this.label = () => _this.overrideLabel ?
       selection => selection.text(_this.overrideLabel) :
-      _this.resolveReference('label').t.append('label', { 'default': fieldID, 'localizerOption': localizerOption });
+      _this.resolveReference('label').t.append('label', { 'default': fieldID, 'index': field.index });
 
   _this.placeholder = () => _this.resolveReference('placeholder').t('placeholder', { 'default': '' });
 

modules/presets/index.js

@@ -62,12 +62,15 @@ function addHistoricalFields(fields) {
     fields.source.keys = ['source', 'source:url', 'source:name', 'source:date'];
 
     for (let i = 1; i < 4; i++){
-        let id = 'source' + (i > 0 ? ':' + i.toString() : '');
+        let id = 'source:' + i.toString();
         let previousId = 'source' + ((i-1) > 0 ? ':' + (i-1).toString() : '');
         fields[id] = {
             ...fields.source,
             key: id,
             keys: [id, id + ':url', id + ':name', id + ':date'],
+            // baseKey and index will be used to create a localized label for this field
+            baseKey: 'source',
+            index: i,
             prerequisiteTag: {
                 keys: [
                     previousId,