@glissandoo/lib 1.53.7 → 1.53.8

package/helpers/musicStyles/orders.js

@@ -6,195 +6,199 @@ const utils_1 = require("../utils");
 const index_1 = require("./index");
 exports.orders = {
     [index_1.MusicStyleId.Band]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.Oboe,
-        instruments_1.InstrumentId.EnglishHorn,
-        instruments_1.InstrumentId.Bassoon,
-        instruments_1.InstrumentId.BassoonContra,
-        instruments_1.InstrumentId.ClarinetLittle,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.FrenchHorn,
-        instruments_1.InstrumentId.FlugeHorn,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Cello,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
-        instruments_1.InstrumentId.Mallets,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.Oboe,
+        instruments_1.DefaultInstrumentId.EnglishHorn,
+        instruments_1.DefaultInstrumentId.Bassoon,
+        instruments_1.DefaultInstrumentId.BassoonContra,
+        instruments_1.DefaultInstrumentId.ClarinetLittle,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.FrenchHorn,
+        instruments_1.DefaultInstrumentId.FlugeHorn,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Cello,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.Mallets,
+        instruments_1.DefaultInstrumentId.DrumSet,
     ],
     [index_1.MusicStyleId.MarchingBand]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.MarchingToms,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
-        instruments_1.InstrumentId.Mallets,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.MarchingToms,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.Mallets,
+        instruments_1.DefaultInstrumentId.DrumSet,
     ],
     [index_1.MusicStyleId.Orchestra]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Violin,
-        instruments_1.InstrumentId.Viola,
-        instruments_1.InstrumentId.Cello,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.FluteLow,
-        instruments_1.InstrumentId.Oboe,
-        instruments_1.InstrumentId.EnglishHorn,
-        instruments_1.InstrumentId.Bassoon,
-        instruments_1.InstrumentId.BassoonContra,
-        instruments_1.InstrumentId.ClarinetLittle,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.FrenchHorn,
-        instruments_1.InstrumentId.FlugeHorn,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.TrumpetLow,
-        instruments_1.InstrumentId.TrumpetPiccolo,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneHigh,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
-        instruments_1.InstrumentId.Mallets,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Violin,
+        instruments_1.DefaultInstrumentId.Viola,
+        instruments_1.DefaultInstrumentId.Cello,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.FluteLow,
+        instruments_1.DefaultInstrumentId.Oboe,
+        instruments_1.DefaultInstrumentId.EnglishHorn,
+        instruments_1.DefaultInstrumentId.Bassoon,
+        instruments_1.DefaultInstrumentId.BassoonContra,
+        instruments_1.DefaultInstrumentId.ClarinetLittle,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.FrenchHorn,
+        instruments_1.DefaultInstrumentId.FlugeHorn,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.TrumpetLow,
+        instruments_1.DefaultInstrumentId.TrumpetPiccolo,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneHigh,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.Mallets,
     ],
     [index_1.MusicStyleId.Choir]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Soprano,
-        instruments_1.InstrumentId.MezzoSoprano,
-        instruments_1.InstrumentId.ContraAlto,
-        instruments_1.InstrumentId.CounterTenor,
-        instruments_1.InstrumentId.BassChoir,
-        instruments_1.InstrumentId.Tenor,
-        instruments_1.InstrumentId.Baritone,
-        instruments_1.InstrumentId.Choir,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Soprano,
+        instruments_1.DefaultInstrumentId.MezzoSoprano,
+        instruments_1.DefaultInstrumentId.ContraAlto,
+        instruments_1.DefaultInstrumentId.CounterTenor,
+        instruments_1.DefaultInstrumentId.BassChoir,
+        instruments_1.DefaultInstrumentId.Tenor,
+        instruments_1.DefaultInstrumentId.Baritone,
+        instruments_1.DefaultInstrumentId.Choir,
     ],
     [index_1.MusicStyleId.BigBand]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Piccolo,
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.FluteLow,
-        instruments_1.InstrumentId.Oboe,
-        instruments_1.InstrumentId.EnglishHorn,
-        instruments_1.InstrumentId.Bassoon,
-        instruments_1.InstrumentId.BassoonContra,
-        instruments_1.InstrumentId.ClarinetLittle,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.ClarinetBass,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.FrenchHorn,
-        instruments_1.InstrumentId.FlugeHorn,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.TromboneLow,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Cello,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Piccolo,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.FluteLow,
+        instruments_1.DefaultInstrumentId.Oboe,
+        instruments_1.DefaultInstrumentId.EnglishHorn,
+        instruments_1.DefaultInstrumentId.Bassoon,
+        instruments_1.DefaultInstrumentId.BassoonContra,
+        instruments_1.DefaultInstrumentId.ClarinetLittle,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.ClarinetBass,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.FrenchHorn,
+        instruments_1.DefaultInstrumentId.FlugeHorn,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.TromboneLow,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Cello,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.DrumSet,
+    ],
+    [index_1.MusicStyleId.TxistularisBand]: [
+        instruments_1.DefaultInstrumentId.Txistu,
+        instruments_1.DefaultInstrumentId.Silbote,
+        instruments_1.DefaultInstrumentId.Tabal,
     ],
-    [index_1.MusicStyleId.TxistularisBand]: [instruments_1.InstrumentId.Txistu, instruments_1.InstrumentId.Silbote, instruments_1.InstrumentId.Tabal],
     [index_1.MusicStyleId.Colla]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Dulzaina,
-        instruments_1.InstrumentId.DulzainaFa,
-        instruments_1.InstrumentId.Tarota,
-        instruments_1.InstrumentId.Bagpipes,
-        instruments_1.InstrumentId.Tabal,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.Cymbals,
-        instruments_1.InstrumentId.Timpani,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Dulzaina,
+        instruments_1.DefaultInstrumentId.DulzainaFa,
+        instruments_1.DefaultInstrumentId.Tarota,
+        instruments_1.DefaultInstrumentId.Bagpipes,
+        instruments_1.DefaultInstrumentId.Tabal,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Timpani,
     ],
     [index_1.MusicStyleId.Charanga]: [
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.Euphonium,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.BassDrum,
-        instruments_1.InstrumentId.MarchingToms,
-        instruments_1.InstrumentId.Cymbals,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.Euphonium,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.MarchingToms,
+        instruments_1.DefaultInstrumentId.Cymbals,
     ],
     [index_1.MusicStyleId.BandaCornetasYTambores]: [
-        instruments_1.InstrumentId.MusicConductor,
-        instruments_1.InstrumentId.Cornet,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.BassDrum,
+        instruments_1.DefaultInstrumentId.MusicConductor,
+        instruments_1.DefaultInstrumentId.Cornet,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.BassDrum,
     ],
     [index_1.MusicStyleId.JazzBand]: [
-        instruments_1.InstrumentId.Flute,
-        instruments_1.InstrumentId.Clarinet,
-        instruments_1.InstrumentId.SaxSoprano,
-        instruments_1.InstrumentId.SaxAlto,
-        instruments_1.InstrumentId.SaxTenor,
-        instruments_1.InstrumentId.SaxBaritone,
-        instruments_1.InstrumentId.Trumpet,
-        instruments_1.InstrumentId.Trombone,
-        instruments_1.InstrumentId.Tuba,
-        instruments_1.InstrumentId.DoubleBass,
-        instruments_1.InstrumentId.Percussion,
-        instruments_1.InstrumentId.DrumSet,
+        instruments_1.DefaultInstrumentId.Flute,
+        instruments_1.DefaultInstrumentId.Clarinet,
+        instruments_1.DefaultInstrumentId.SaxSoprano,
+        instruments_1.DefaultInstrumentId.SaxAlto,
+        instruments_1.DefaultInstrumentId.SaxTenor,
+        instruments_1.DefaultInstrumentId.SaxBaritone,
+        instruments_1.DefaultInstrumentId.Trumpet,
+        instruments_1.DefaultInstrumentId.Trombone,
+        instruments_1.DefaultInstrumentId.Tuba,
+        instruments_1.DefaultInstrumentId.DoubleBass,
+        instruments_1.DefaultInstrumentId.Percussion,
+        instruments_1.DefaultInstrumentId.DrumSet,
     ],
     [index_1.MusicStyleId.Batucada]: [
-        instruments_1.InstrumentId.Repique,
-        instruments_1.InstrumentId.TambourineBrazilian,
-        instruments_1.InstrumentId.TimbalBrazilian,
-        instruments_1.InstrumentId.SnareDrum,
-        instruments_1.InstrumentId.Surdo,
-        instruments_1.InstrumentId.Agogo,
-        instruments_1.InstrumentId.Chocalho,
+        instruments_1.DefaultInstrumentId.Repique,
+        instruments_1.DefaultInstrumentId.TambourineBrazilian,
+        instruments_1.DefaultInstrumentId.TimbalBrazilian,
+        instruments_1.DefaultInstrumentId.SnareDrum,
+        instruments_1.DefaultInstrumentId.Surdo,
+        instruments_1.DefaultInstrumentId.Agogo,
+        instruments_1.DefaultInstrumentId.Chocalho,
     ],
 };
 const getInstrumentsOrderByMusicStyle = (musicStyle) => {
-    return musicStyle in exports.orders ? exports.orders[musicStyle] : Object.values(instruments_1.InstrumentId);
+    return musicStyle in exports.orders ? exports.orders[musicStyle] : Object.values(instruments_1.DefaultInstrumentId);
 };
 exports.getInstrumentsOrderByMusicStyle = getInstrumentsOrderByMusicStyle;
 const orderByMusicStyle = (list, field, musicStyle) => {

package/helpers/notifications/placeholders.js

@@ -36,6 +36,11 @@ const getTypeAndPathFromPlaceholder = (placeholder) => {
         formatValue: (formatValue || 'shortDate'),
     };
 };
+const getPropsPathsFromArrayPlaceholderInPath = (path) => {
+    const placeholder = path.pop();
+    const props = placeholder ? placeholder.slice(1, -1).replace(' ', '').split(',') : [];
+    return props.map((prop) => [...path, prop]);
+};
 const replaceKeysNotification = (text, values, lang) => {
     const placeholders = text.match(/(\{).+?(\})/g);
     if (!placeholders || placeholders.length === 0) {
@@ -51,21 +56,23 @@ const replaceKeysNotification = (text, values, lang) => {
         const { type, path, formatValue } = getTypeAndPathFromPlaceholder(placeholder);
         switch (type) {
             case PlaceholderType.Instrument: {
-                const instrumentId = (0, lodash_1.get)(newValues, path);
+                const [instrumentIdPropPath, customInstrumentNamePropPath] = getPropsPathsFromArrayPlaceholderInPath(path);
+                const customInstrumentName = (0, lodash_1.get)(newValues, customInstrumentNamePropPath);
+                if (customInstrumentName) {
+                    return text.replace(placeholder, customInstrumentName.toLowerCase());
+                }
+                const instrumentId = (0, lodash_1.get)(newValues, instrumentIdPropPath);
                 const instrument = new Instrument_1.default(instrumentId, lang);
                 if (!instrument)
                     return text;
                 return text.replace(placeholder, instrument.name.toLowerCase());
             }
             case PlaceholderType.Date: {
-                const lastPath = path.pop();
-                const [datetimeProp, timezoneProp] = lastPath
-                    ? lastPath.slice(1, -1).replace(' ', '').split(',')
-                    : [];
-                const datetime = (0, lodash_1.get)(newValues, [...path, datetimeProp]);
+                const [datetimePropPath, timezonePropPath] = getPropsPathsFromArrayPlaceholderInPath(path);
+                const datetime = (0, lodash_1.get)(newValues, datetimePropPath);
                 if (!datetime)
                     return text.replace(placeholder, '');
-                const timezone = (0, lodash_1.get)(newValues, [...path, timezoneProp]) || 'Europe/Madrid';
+                const timezone = (0, lodash_1.get)(newValues, timezonePropPath) || 'Europe/Madrid';
                 const zonedDatetime = (0, date_fns_tz_1.utcToZonedTime)(datetime.toDate(), timezone);
                 const dateLang = (0, lang_1.getDateLang)(lang);
                 const dateFormat = (0, date_fns_1.format)(zonedDatetime, (0, lodash_1.get)(dateLang.format, formatValue), {

package/helpers/objects.d.ts

@@ -1,4 +1,4 @@
-export declare const mapToArray: <K extends string, V extends object, O extends Record<K, V>>(obj: O) => (O[`${Exclude<keyof O, symbol>}`] & {
+export declare const mapToArray: <K extends string, V extends object, O extends Record<K, V | undefined>>(obj: O) => (O[`${Exclude<keyof O, symbol>}`] & {
     id: keyof O;
 })[];
 export declare const orderedMapToArray: <K extends string, V extends {

package/lang/ca.json

@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogó",
     "instruments.altoClarinet": "Clarinet Alt",
     "instruments.altoSaxophone": "Saxòfon alt",
+    "instruments.auxiliar": "Auxiliar",
     "instruments.bagpipes": "Sac de gemecs",
     "instruments.bandurria": "Bandúrria",
     "instruments.banjo": "Banjo",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Corn anglès",
     "instruments.euphonium": "Bombardí",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Abanderat",
     "instruments.flugelhorn": "Fiscorn",
     "instruments.flute": "Flauta",
     "instruments.frenchHorn": "Trompa",
@@ -254,7 +256,7 @@
     "practices.edit.comments.text": "Una serie d'assajos han actualitzat els seus comentaris",
     "practices.edit.comments.title": "Assajos - comentaris actualitzats",
     "practices.edit.datetime.text": "Una serie d'assajos han actualitzat el seu horari",
-    "practices.edit.datetime.title": "Assajos - canvi d’horari",
+    "practices.edit.datetime.title": "Assajos - canvi d'horari",
     "practices.edit.locality.text": "Una serie d'assajos han actualitzat la seva adreça",
     "practices.edit.locality.title": "Assajos - canvi d'adreça",
     "practices.edit.repertory.text": "Una serie d'assajos han actualitzat el seu repertori",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4t",
     "repertoireTags.principal": "Principal",
     "sections.all": "Tots",
-    "theme.claim.new.text": "{string:user.0.displayName} ha reclamat la partitura de {instrument:extra.instrumentId} de l'obra \"{string:extra.title}\"",
+    "theme.claim.new.text": "{string:user.0.displayName} ha reclamat la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de l'obra \"{string:extra.title}\"",
     "theme.claim.new.title": "Han demanat una partitura",
-    "theme.claim.update.text": "S'afegit la partitura de {instrument:extra.instrumentId} de l'obra \"{string:extra.title}\"",
-    "theme.claim.update.title": "Nova partitura de {instrument:extra.instrumentId}"
+    "theme.claim.update.text": "S'afegit la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de l'obra \"{string:extra.title}\"",
+    "theme.claim.update.title": "Nova partitura de {instrument:extra.[instrumentId,customInstrumentName]}"
 }

package/lang/de.json

@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogo",
     "instruments.altoClarinet": "Altklarinette",
     "instruments.altoSaxophone": "Altsaxophon",
+    "instruments.auxiliar": "Assistent",
     "instruments.bagpipes": "Dudelsack",
     "instruments.bandurria": "Bandurria",
     "instruments.banjo": "Banjo",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Englischhorn",
     "instruments.euphonium": "Euphonium",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Fahnenträger",
     "instruments.flugelhorn": "Flügelhorn",
     "instruments.flute": "Flöte",
     "instruments.frenchHorn": "Horn",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4.",
     "repertoireTags.principal": "Haupt",
     "sections.all": "Alle",
-    "theme.claim.new.text": "{string:user.0.displayName} fordert eine Überprüfung der Noten für {instrument:extra.instrumentId} von \"{string:extra.title}\"",
+    "theme.claim.new.text": "{string:user.0.displayName} fordert eine Überprüfung der Noten für {instrument:extra.[instrumentId,customInstrumentName]} von \"{string:extra.title}\"",
     "theme.claim.new.title": "Ein Musiker hat eine Überprüfung der Noten angefordert",
-    "theme.claim.update.text": "{instrument:extra.instrumentId} -Noten des Stücks \"{string:extra.title}\" wurden hinzugefügt.",
-    "theme.claim.update.title": "Neue {instrument:extra.instrumentId} -Noten"
+    "theme.claim.update.text": "{instrument:extra.[instrumentId,customInstrumentName]} -Noten des Stücks \"{string:extra.title}\" wurden hinzugefügt.",
+    "theme.claim.update.title": "Neue {instrument:extra.[instrumentId,customInstrumentName]} -Noten"
 }

package/lang/en.json

@@ -30,7 +30,7 @@
     "group.onboarding.engagement.title": "Modern scheduling for music ensembles 📅",
     "group.onboarding.invite.text": "Glissandoo is made with love by musicians, for musicians 🎶",
     "group.onboarding.invite.title": "Get going by inviting your members 👋",
-    "group.onboarding.premium.text": "You’re on the premium plan for 30 days. Glissandoo is free to use for all musicians, parents, and staff on your ensemble 💚",
+    "group.onboarding.premium.text": "You're on the premium plan for 30 days. Glissandoo is free to use for all musicians, parents, and staff on your ensemble 💚",
     "group.onboarding.premium.title": "{string:group.0.displayName}",
     "group.players.add.text": "You've been added to {string:group.0.displayName}",
     "group.players.add.title": "New group",
@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogo",
     "instruments.altoClarinet": "Alto Clarinet",
     "instruments.altoSaxophone": "Alto Saxophone",
+    "instruments.auxiliar": "Auxiliar",
     "instruments.bagpipes": "Bagpipes",
     "instruments.bandurria": "Bandurria",
     "instruments.banjo": "Banjo",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "English Horn",
     "instruments.euphonium": "Euphonium",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Flag bearer",
     "instruments.flugelhorn": "Flugelhorn",
     "instruments.flute": "Flute",
     "instruments.frenchHorn": "French Horn",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4th",
     "repertoireTags.principal": "Principal",
     "sections.all": "All",
-    "theme.claim.new.text": "{string:user.0.displayName} has claimed a review on {instrument:extra.instrumentId} for \"{string:extra.title}\"",
+    "theme.claim.new.text": "{string:user.0.displayName} has claimed a review on {instrument:extra.[instrumentId,customInstrumentName]} for \"{string:extra.title}\"",
     "theme.claim.new.title": "A music sheet review has been submitted by a musician",
-    "theme.claim.update.text": "{instrument:extra.instrumentId} sheet for \"{string:extra.title}\" has been added.",
-    "theme.claim.update.title": "New {instrument:extra.instrumentId} sheet has been added"
+    "theme.claim.update.text": "{instrument:extra.[instrumentId,customInstrumentName]} sheet for \"{string:extra.title}\" has been added.",
+    "theme.claim.update.title": "New {instrument:extra.[instrumentId,customInstrumentName]} sheet has been added"
 }

package/lang/es.json

@@ -44,6 +44,7 @@
     "groupPlayer.switchInstruments.byAdmin.title": "Instrumentos modificados",
     "instruments.accordion": "Acordeón",
     "instruments.agogo": "Agogó",
+    "instruments.auxiliar": "Auxiliar",
     "instruments.altoClarinet": "Clarinete Alto",
     "instruments.altoSaxophone": "Saxofón alto",
     "instruments.bagpipes": "Gaita",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Corno inglés",
     "instruments.euphonium": "Bombardino",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Abanderado",
     "instruments.flugelhorn": "Fliscorno",
     "instruments.flute": "Flauta",
     "instruments.frenchHorn": "Trompa",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4º",
     "repertoireTags.principal": "Principal",
     "sections.all": "Todos",
-    "theme.claim.new.text": "{string:user.0.displayName} ha reclamado la partitura de {instrument:extra.instrumentId} de la obra \"{string:extra.title}\"",
+    "theme.claim.new.text": "{string:user.0.displayName} ha reclamado la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de la obra \"{string:extra.title}\"",
     "theme.claim.new.title": "Han pedido una partitura",
-    "theme.claim.update.text": "Se ha añadido la partitura de {instrument:extra.instrumentId} de la obra \"{string:extra.title}\"",
-    "theme.claim.update.title": "Nueva partitura de {instrument:extra.instrumentId}"
+    "theme.claim.update.text": "Se ha añadido la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de la obra \"{string:extra.title}\"",
+    "theme.claim.update.title": "Nueva partitura de {instrument:extra.[instrumentId,customInstrumentName]}"
 }

package/lang/eu.json

@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogo",
     "instruments.altoClarinet": "Klarinete Altua",
     "instruments.altoSaxophone": "Saxofoi altua",
+    "instruments.auxiliar": "Laguntzailea",
     "instruments.bagpipes": "Gaita",
     "instruments.bandurria": "Bandurria",
     "instruments.banjo": "Banjoa",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Adar ingelesa",
     "instruments.euphonium": "Bonbardinoa",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Estandarra",
     "instruments.flugelhorn": "Fliskornoa",
     "instruments.flute": "Txirula",
     "instruments.frenchHorn": "Adar frantsesa",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4.a",
     "repertoireTags.principal": "Lehen",
     "sections.all": "Guztiak",
-    "theme.claim.new.text": "{string:user.0.displayName} erabiltzaileak \"{string:extra.title}\" obrako {instrument:extra.instrumentId} instrumentuaren partitura eskatu du",
+    "theme.claim.new.text": "{string:user.0.displayName} erabiltzaileak \"{string:extra.title}\" obrako {instrument:extra.[instrumentId,customInstrumentName]} instrumentuaren partitura eskatu du",
     "theme.claim.new.title": "Partitura bat eskatu da",
-    "theme.claim.update.text": "{instrument:extra.instrumentId} instrumentuaren partitura gehitu da \"{string:extra.title}\" obrarako",
-    "theme.claim.update.title": "{instrument:extra.instrumentId} partitura berria gehitu da"
+    "theme.claim.update.text": "{instrument:extra.[instrumentId,customInstrumentName]} instrumentuaren partitura gehitu da \"{string:extra.title}\" obrarako",
+    "theme.claim.update.title": "{instrument:extra.[instrumentId,customInstrumentName]} partitura berria gehitu da"
 }

package/lang/gl.json

@@ -46,6 +46,7 @@
     "instruments.agogo": "Agogó",
     "instruments.altoClarinet": "Clarinete Alto",
     "instruments.altoSaxophone": "Saxofón alto",
+    "instruments.auxiliar": "Asistente",
     "instruments.bagpipes": "Gaita",
     "instruments.bandurria": "Bandurria",
     "instruments.banjo": "Banjo",
@@ -77,6 +78,7 @@
     "instruments.englishHorn": "Corno Inglés",
     "instruments.euphonium": "Eufonio",
     "instruments.flabiol": "Flabiol",
+    "instruments.flagBearer": "Porta estandarte",
     "instruments.flugelhorn": "Fliscorno",
     "instruments.flute": "Frauta",
     "instruments.frenchHorn": "Trompa",
@@ -275,8 +277,8 @@
     "repertoireTags.4": "4º",
     "repertoireTags.principal": "Principal",
     "sections.all": "Todos",
-    "theme.claim.new.text": "{string:user.0.displayName} ha reclamado la partitura de {instrument:extra.instrumentId} de la obra \"{string:extra.title}\"",
+    "theme.claim.new.text": "{string:user.0.displayName} ha reclamado la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de la obra \"{string:extra.title}\"",
     "theme.claim.new.title": "Han pedido una partitura",
-    "theme.claim.update.text": "Se ha añadido la partitura de {instrument:extra.instrumentId} de la obra \"{string:extra.title}\"",
-    "theme.claim.update.title": "Nueva partitura de {instrument:extra.instrumentId}"
+    "theme.claim.update.text": "Se ha añadido la partitura de {instrument:extra.[instrumentId,customInstrumentName]} de la obra \"{string:extra.title}\"",
+    "theme.claim.update.title": "Nueva partitura de {instrument:extra.[instrumentId,customInstrumentName]}"
 }