Compare commits

..

8 commits

Author SHA1 Message Date
fenris 4d2b20f0b4 [mod] custom strings 2025-07-19 12:26:02 +02:00
Christian Fraß 06b220dd27 [mod] test-Daten verschoben 2025-07-01 17:36:23 +00:00
Christian Fraß ab3bfad376 [task-153] [fix] 2025-07-01 17:34:38 +00:00
Christian Fraß 3fa5d0820b [task-153] 2025-07-01 17:19:47 +00:00
Christian Fraß e366410d61 [mod] gitignore 2025-07-01 17:07:06 +00:00
fenris 1fe6b75b4e Zeichenketten auslagern (#2)
Siehe https://vikunja.ramsch.sx/tasks/343

Co-authored-by: Christian Fraß <roydfalk@folksprak.org>
Reviewed-on: #2
Co-authored-by: Fenris Wolf <fenris@folksprak.org>
Co-committed-by: Fenris Wolf <fenris@folksprak.org>
2025-07-01 19:05:51 +02:00
fenris e298a43f65 [upd] plankton 2025-06-30 13:19:55 +02:00
fenris 362c1d2136 Termine gebündelt ausgeben (#1)
Siehe https://vikunja.ramsch.sx/tasks/340

Co-authored-by: Christian Fraß <roydfalk@folksprak.org>
Reviewed-on: #1
Co-authored-by: Fenris Wolf <fenris@folksprak.org>
Co-committed-by: Fenris Wolf <fenris@folksprak.org>
2025-06-30 13:06:51 +02:00
14 changed files with 819 additions and 844 deletions

1
.gitignore vendored
View file

@ -1,4 +1,3 @@
/build/ /build/
/temp/ /temp/
/conf/
/.geany /.geany

View file

@ -0,0 +1,25 @@
{
"meta": {
"identifier": "deu",
"name": "Deutsch"
},
"tree": {
"core.event.event": "Termin",
"core.event.events": "Termine",
"core.event.title.long": "Titel",
"core.event.title.short": "was",
"core.event.time.long": "Datum und Uhrzeit",
"core.event.time.short": "wann",
"core.event.location.long": "Ort",
"core.event.location.short": "wo",
"core.reminder.reminder": "Erinnerung",
"args.action.description": "auszuführende Aktion",
"args.conf_path.description": "Pfad zur Konfigurations-Datei",
"args.conf_schema.description": "nur das Konfigurations-Schema ausgeben",
"args.conf_expose.description": "die vervollständigte Konfiguration ausgeben",
"args.single_run.description": "nur einen Durchlauf ausführen",
"args.dry_run.description": "das Senden von Benachrichtigungen überspringen",
"args.help.description": "nur die Hilfe-Seite anzeigen",
"help.description": "sendet Erinnerungen zu anstehenden Terminen"
}
}

View file

@ -0,0 +1,25 @@
{
"meta": {
"identifier": "eng",
"name": "English"
},
"tree": {
"core.event.event": "event",
"core.event.events": "events",
"core.event.title.long": "title",
"core.event.title.short": "what",
"core.event.time.long": "date and time",
"core.event.time.short": "when",
"core.event.location.long": "location",
"core.event.location.short": "where",
"core.reminder.reminder": "reminder",
"args.action.description": "what to do",
"args.conf_path.description": "path to configuration file",
"args.conf_schema.description": "only print the configuration schema",
"args.conf_expose.description": "whether to expose the full configuration",
"args.single_run.description": "whether to only execute one iteration at run",
"args.dry_run.description": "whether to skip the sending of reminders (logs will be written)",
"args.help.description": "only print the help page",
"help.description": "sends reminders about upcoming events"
}
}

View file

@ -16,6 +16,7 @@
"file", "file",
"conf", "conf",
"log", "log",
"translate",
"args" "args"
] ]
} }

View file

@ -1211,6 +1211,9 @@ declare namespace lib_plankton.pit {
/** /**
*/ */
function is_after(pit: type_pit, reference: type_pit): boolean; function is_after(pit: type_pit, reference: type_pit): boolean;
/**
*/
function is_equal_or_after(pit: type_pit, reference: type_pit): boolean;
/** /**
*/ */
function is_between(pit: type_pit, reference_left: type_pit, reference_right: type_pit): boolean; function is_between(pit: type_pit, reference_left: type_pit, reference_right: type_pit): boolean;
@ -2698,6 +2701,99 @@ declare namespace lib_plankton.conf {
*/ */
function load_versioned(path: string, get_schema: ((version: string) => type_schema), migrations: Record<string, type_migration<any, any>>): Promise<type_sheet<any>>; function load_versioned(path: string, get_schema: ((version: string) => type_schema), migrations: Record<string, type_migration<any, any>>): Promise<type_sheet<any>>;
} }
declare namespace lib_plankton.translate {
/**
* @author fenris
*/
type type_package_meta = {
identifier: string;
name?: string;
};
/**
* @author fenris
*/
type type_package = {
meta: type_package_meta;
tree: {
[id: string]: string;
};
};
/**
* @desc the level of verbosity, specifiying how much output the system shall provide about its actions
* @author fenris
*/
var _verbosity: int;
/**
* @desc moves a language to the top of the order, making it the primary one
* @author fenris
*/
function promote(identifier: string): void;
/**
* @desc adds a package to the sytem
* @author fenris
*/
function add(package_: type_package): void;
/**
* @desc integrates a package to the system, i.e. creates a new one if none existed so far or merges with an existing one
* @author fenris
*/
function feed(package_: type_package): void;
/**
* @desc tries to retrieve a translation for a specific package identifier
* @author fenris
*/
function fetch(identifier: string, path: string, args?: {
[id: string]: string;
}): lib_plankton.pod.type_pod<string>;
/**
* @desc retrieves a string by going through the order and trying to fetch it for the current entry
* @author fenris
* @todo rename to "get"
*/
function get_new(path: string, { "args": args, "preferred_language": preferred_language, "fallback": fallback, }?: {
args?: Record<string, string>;
preferred_language?: (null | string);
fallback?: string;
}): string;
/**
* @desc retrieves a string by going through the order and trying to fetch it for the current entry
* @author fenris
* @deprecated use "get_new"
* @todo remove
*/
function get(path: string, args?: {
[id: string]: string;
}, fallback?: string): string;
/**
* @author fenris
*/
function list(): Array<type_package_meta>;
/**
* @author fenris
* @todo get rid of this; it's currenly needed only for the cdh-internal lib_completion
*/
function paths(): Array<string>;
/**
* @author fenris
*/
function initialize({ "logprefix": logprefix, "verbosity": verbosity, "packages": packages, "order": order, "autopromote": autopromote, }?: {
logprefix?: string;
verbosity?: int;
packages?: Array<type_package>;
order?: Array<string>;
autopromote?: boolean;
}): Promise<void>;
}
declare namespace lib_plankton.translate {
/**
* @author fenris
*/
function iso_639_1_to_iso_639_2(iso6391: string): string;
/**
* @author fenris
*/
function stance(str: string): string;
}
declare namespace lib_plankton.args { declare namespace lib_plankton.args {
/** /**
*/ */

View file

@ -3648,10 +3648,16 @@ var lib_plankton;
return (pit > reference); return (pit > reference);
} }
pit_1.is_after = is_after; pit_1.is_after = is_after;
/**
*/
function is_equal_or_after(pit, reference) {
return (pit >= reference);
}
pit_1.is_equal_or_after = is_equal_or_after;
/** /**
*/ */
function is_between(pit, reference_left, reference_right) { function is_between(pit, reference_left, reference_right) {
return (is_after(pit, reference_left) return (is_equal_or_after(pit, reference_left)
&& &&
is_before(pit, reference_right)); is_before(pit, reference_right));
} }
@ -8054,6 +8060,370 @@ var lib_plankton;
})(conf = lib_plankton.conf || (lib_plankton.conf = {})); })(conf = lib_plankton.conf || (lib_plankton.conf = {}));
})(lib_plankton || (lib_plankton = {})); })(lib_plankton || (lib_plankton = {}));
/* /*
This file is part of »bacterio-plankton:translate«.
Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR'
<info@greenscale.de>
»bacterio-plankton:translate« is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
»bacterio-plankton:translate« is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with »bacterio-plankton:translate«. If not, see <http://www.gnu.org/licenses/>.
*/
var lib_plankton;
(function (lib_plankton) {
var translate;
(function (translate) {
/**
* @desc contains the sets of strings
* @author fenris
*/
var _packages = {};
/**
* @desc specifies in which order the languages shall be queried; if getting a string from language #0 fails, the
* system tries to get it from language #1, and so on
* @author fenris
*/
var _order = [];
/**
* @desc whether to automatically promote the language of a newly added package
* @author fenris
*/
var _autopromote = false;
/**
* @desc the level of verbosity, specifiying how much output the system shall provide about its actions
* @author fenris
*/
translate._verbosity = 1;
/**
* @desc which initial string to use for log-outputs
* @author fenris
*/
var _logprefix = "[lib_translate]";
/**
* @desc moves a language to the top of the order, making it the primary one
* @author fenris
*/
function promote(identifier) {
if (Object.keys(_packages).indexOf(identifier) < 0) {
if (translate._verbosity >= 1) {
console.warn(`${_logprefix} package '${identifier}' doesn't exist yet`);
}
}
let position = _order.indexOf(identifier);
if (position >= 0) {
if (translate._verbosity >= 2) {
console.info(`${_logprefix} '${identifier}' already in order; will promote it`);
}
_order.splice(position, 1);
}
_order.unshift(identifier);
if (translate._verbosity >= 2) {
console.info(`${_logprefix} order is now ${_order.toString()}`);
}
}
translate.promote = promote;
/**
* @desc adds a package to the sytem
* @author fenris
*/
function add(package_) {
let identifier = package_.meta.identifier;
if (identifier in _packages) {
if (translate._verbosity >= 1) {
console.warn(`${_logprefix} package '${identifier}' has already been added; will overwrite`);
}
}
else {
if (translate._verbosity >= 2) {
console.log(`${_logprefix} got package '${identifier}'`);
}
}
_packages[identifier] = package_;
if (_autopromote) {
promote(identifier);
}
}
translate.add = add;
/**
* @desc integrates a package to the system, i.e. creates a new one if none existed so far or merges with an existing one
* @author fenris
*/
function feed(package_) {
let identifier = package_.meta.identifier;
if (identifier in _packages) {
lib_plankton.object.patch(_packages[identifier].tree, package_.tree, {
"deep": true,
});
}
else {
if (translate._verbosity >= 2) {
console.info(`${_logprefix} package '${identifier}' didn't exist so far; will create it now`);
}
add(package_);
}
}
translate.feed = feed;
/**
* @desc tries to retrieve a translation for a specific package identifier
* @author fenris
*/
function fetch(identifier, path, args = {}) {
if (!(identifier in _packages)) {
if (translate._verbosity >= 1) {
console.warn(`${_logprefix} no package '${identifier}'`);
}
return (lib_plankton.pod.make_empty());
}
else {
// let str : string = lib_plankton.object.path_read<string>(_packages[identifier].tree, path);
let str = _packages[identifier].tree[path];
if (str == undefined) {
if (translate._verbosity >= 1) {
console.warn(`${_logprefix} string '${path}' missing in package '${identifier}'`);
}
return (lib_plankton.pod.make_empty());
}
else {
// resolve references
{
let regexp_reference = new RegExp("#\\(([\\w\\.]*)(?:\\?(\\w+)=(\\w+)(?:&(\\w+)=(\\w+))*)?\\)");
while (true) {
let matching = regexp_reference.exec(str);
if (matching != null) {
let path_ = matching[1];
let args_ = {};
if (translate._verbosity >= 2) {
// console.info(`${_logprefix} found reference to '${path_}' with args ${JSON.stringify(args_)}`);
console.info(`${_logprefix} found reference to '${path_}'`);
}
// parse args
{
for (let index = 2; index <= matching.length - 1; index += 2) {
let id = matching[index + 0];
let value = matching[index + 1];
if (id != undefined) {
args_[id] = value;
}
}
}
// fetch referenced string
{
let result_ = fetch(identifier, path_, args_);
if (lib_plankton.pod.is_filled(result_)) {
let front = str.slice(0, matching.index);
let back = str.slice(matching.index + matching[0].length);
str = (front + lib_plankton.pod.cull(result_) + back);
}
else {
return (lib_plankton.pod.make_empty());
break;
}
}
}
else {
break;
}
}
}
// insert arguments
{
str = lib_plankton.string.coin(str, args);
}
return (lib_plankton.pod.make_filled(str));
}
}
}
translate.fetch = fetch;
/**
* @desc retrieves a string by going through the order and trying to fetch it for the current entry
* @author fenris
* @todo rename to "get"
*/
function get_new(path, { "args": args = {}, "preferred_language": preferred_language = null, "fallback": fallback = null, } = {}) {
if (fallback == null) {
fallback = `{${path}}`;
}
if (translate._verbosity >= 2) {
console.info(`${_logprefix} getting translation for string '${path}' with arguments ${JSON.stringify(args)}`);
}
let result = lib_plankton.pod.make_empty();
const order = ((preferred_language === null)
?
_order
:
([preferred_language].concat(_order.filter(x => (x !== preferred_language)))));
const found = order.some(identifier => {
if (translate._verbosity >= 2) {
console.info(`${_logprefix} trying package '${identifier}' …`);
}
const result_ = fetch(identifier, path, args);
if (lib_plankton.pod.is_filled(result_)) {
result = result_;
return true;
}
else {
return false;
}
});
if (found) {
const str = lib_plankton.pod.cull(result);
if (translate._verbosity >= 3) {
console.info(`${_logprefix} found translation: '${str}'`);
}
return str;
}
else {
const str = fallback;
if (translate._verbosity >= 1) {
console.warn(`${_logprefix} no package provides a translation for string '${path}'; will use the fallback translation '${str}'`);
}
return str;
}
}
translate.get_new = get_new;
/**
* @desc retrieves a string by going through the order and trying to fetch it for the current entry
* @author fenris
* @deprecated use "get_new"
* @todo remove
*/
function get(path, args = {}, fallback = null) {
return get_new(path, {
"args": args,
"fallback": fallback,
});
}
translate.get = get;
/**
* @author fenris
*/
function list() {
return lib_plankton.object.to_array(_packages).map(x => x.value.meta);
}
translate.list = list;
/**
* @author fenris
* @todo get rid of this; it's currenly needed only for the cdh-internal lib_completion
*/
function paths() {
return lib_plankton.object.keys(lib_plankton.object.flatten(_packages[_order[0]].tree));
}
translate.paths = paths;
/**
* @author fenris
*/
function initialize({ "logprefix": logprefix = undefined, "verbosity": verbosity = undefined, "packages": packages = [], "order": order = undefined, "autopromote": autopromote = undefined, } = {}) {
return (Promise.resolve(undefined)
// set variables
.then(_ => {
if (logprefix != undefined)
_logprefix = logprefix;
if (verbosity != undefined)
translate._verbosity = verbosity;
// _packages = {};
if (order != undefined)
_order = order;
if (autopromote != undefined)
_autopromote = autopromote;
return Promise.resolve(undefined);
})
// feed
.then(_ => {
packages.forEach(feed);
return Promise.resolve(undefined);
}));
}
translate.initialize = initialize;
})(translate = lib_plankton.translate || (lib_plankton.translate = {}));
})(lib_plankton || (lib_plankton = {}));
/*
This file is part of »bacterio-plankton:translate«.
Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR'
<info@greenscale.de>
»bacterio-plankton:translate« is free software: you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
»bacterio-plankton:translate« is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with »bacterio-plankton:translate«. If not, see <http://www.gnu.org/licenses/>.
*/
var lib_plankton;
(function (lib_plankton) {
var translate;
(function (translate) {
/**
* @author fenris
*/
function iso_639_1_to_iso_639_2(iso6391) {
let mapping = {
"af": "afr",
"ar": "ara",
"bg": "bul",
"cs": "ces",
"da": "dan",
"de": "deu",
"el": "ell",
"en": "eng",
"eo": "epo",
"es": "esp",
"fa": "fas",
"fi": "fin",
"fr": "fra",
"hi": "hin",
"hr": "hrv",
"hu": "hun",
"is": "isl",
"it": "ita",
"ja": "jpn",
"ko": "kor",
"nb": "nob",
"nl": "nld",
"nn": "nno",
"pt": "por",
"pl": "pol",
"ro": "ron",
"ru": "rus",
"sk": "slk",
"sv": "swe",
"zh": "zho",
};
return mapping[iso6391];
}
translate.iso_639_1_to_iso_639_2 = iso_639_1_to_iso_639_2;
/**
* @author fenris
*/
function stance(str) {
let regexp = new RegExp("^translate:(.*)$");
let matching = regexp.exec(str);
if (matching != null) {
return translate.get(matching[1]);
}
else {
return str;
}
}
translate.stance = stance;
})(translate = lib_plankton.translate || (lib_plankton.translate = {}));
})(lib_plankton || (lib_plankton = {}));
/*
This file is part of »bacterio-plankton:args«. This file is part of »bacterio-plankton:args«.
Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR' Copyright 2016-2024 'Christian Fraß, Christian Neubauer, Martin Springwald GbR'

File diff suppressed because it is too large Load diff

View file

@ -203,7 +203,7 @@ namespace _munin.logic
{ {
try try
{ {
await target.send(conf.labels, events); await target.send(events);
} }
catch (error) catch (error)
{ {

View file

@ -27,6 +27,31 @@ namespace _munin
args_raw : Array<string> args_raw : Array<string>
): Promise<void> ): Promise<void>
{ {
// init
const language_codes : Array<string> = [
"deu",
"eng",
];
const packages = await Promise.all<lib_plankton.translate.type_package>(
language_codes
.map<Promise<lib_plankton.translate.type_package>>(
code => (
Promise.resolve<string>(code)
.then<string>(code => Promise.resolve(lib_plankton.string.coin("data/localization/{{code}}.json", {"code": code})))
.then<string>(path => lib_plankton.file.read(path))
.then<lib_plankton.translate.type_package>(content => Promise.resolve(lib_plankton.json.decode(content)))
)
)
);
await lib_plankton.translate.initialize(
{
"verbosity": 1,
"packages": packages,
"order": language_codes,
"autopromote": false,
}
);
// args // args
const arg_handler : lib_plankton.args.class_handler = new lib_plankton.args.class_handler( const arg_handler : lib_plankton.args.class_handler = new lib_plankton.args.class_handler(
{ {
@ -35,7 +60,12 @@ namespace _munin
"type": lib_plankton.args.enum_type.string, "type": lib_plankton.args.enum_type.string,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": "run", "default": "run",
"info": "what to do : test | run", "info": lib_plankton.string.coin(
"{{core}} : test | run",
{
"core": lib_plankton.translate.get("args.action.description"),
}
),
"name": "action", "name": "action",
}), }),
"conf_path": lib_plankton.args.class_argument.volatile({ "conf_path": lib_plankton.args.class_argument.volatile({
@ -44,16 +74,16 @@ namespace _munin
"type": lib_plankton.args.enum_type.string, "type": lib_plankton.args.enum_type.string,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": "munin.json", "default": "munin.json",
"info": "path to configuration file", "info": lib_plankton.translate.get("args.conf_path.description"),
"name": "conf-path", "name": "conf-path",
}), }),
"conf_schema": lib_plankton.args.class_argument.volatile({ "conf_schema": lib_plankton.args.class_argument.volatile({
"indicators_long": ["conf-schema"], "indicators_long": ["conf-schema"],
"indicators_short": ["s"], "indicators_short": ["s"],
"type": lib_plankton.args.enum_type.string, "type": lib_plankton.args.enum_type.boolean,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": "", "default": false,
"info": "only print the configuration schema in a specific version (latest version via argument '_')", "info": lib_plankton.translate.get("args.conf_schema.description"),
"name": "conf-schema", "name": "conf-schema",
}), }),
"conf_expose": lib_plankton.args.class_argument.volatile({ "conf_expose": lib_plankton.args.class_argument.volatile({
@ -62,7 +92,7 @@ namespace _munin
"type": lib_plankton.args.enum_type.boolean, "type": lib_plankton.args.enum_type.boolean,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": false, "default": false,
"info": "whether to expose the full configuration", "info": lib_plankton.translate.get("args.conf_expose.description"),
"name": "conf-expose", "name": "conf-expose",
}), }),
"single_run": lib_plankton.args.class_argument.volatile({ "single_run": lib_plankton.args.class_argument.volatile({
@ -71,7 +101,7 @@ namespace _munin
"type": lib_plankton.args.enum_type.boolean, "type": lib_plankton.args.enum_type.boolean,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": false, "default": false,
"info": "whether to only execute one iteration at run", "info": lib_plankton.translate.get("args.single_run.description"),
"name": "single-run", "name": "single-run",
}), }),
"verbosity": lib_plankton.args.class_argument.volatile({ "verbosity": lib_plankton.args.class_argument.volatile({
@ -89,7 +119,7 @@ namespace _munin
"type": lib_plankton.args.enum_type.boolean, "type": lib_plankton.args.enum_type.boolean,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": false, "default": false,
"info": "whether to skip the sending of reminders (logs will be written)", "info": lib_plankton.translate.get("args.dry_run.description"),
"name": "dry-run", "name": "dry-run",
}), }),
"help": lib_plankton.args.class_argument.volatile({ "help": lib_plankton.args.class_argument.volatile({
@ -98,7 +128,7 @@ namespace _munin
"type": lib_plankton.args.enum_type.boolean, "type": lib_plankton.args.enum_type.boolean,
"mode": lib_plankton.args.enum_mode.replace, "mode": lib_plankton.args.enum_mode.replace,
"default": false, "default": false,
"info": "alias for action 'help'", "info": lib_plankton.translate.get("args.help.description"),
"name": "help", "name": "help",
}), }),
} }
@ -113,17 +143,17 @@ namespace _munin
arg_handler.generate_help( arg_handler.generate_help(
{ {
"programname": "munin", "programname": "munin",
"description": "sends reminders about upcoming events", "description": lib_plankton.translate.get("help.description"),
"executable": "node build/munin", "executable": "node build/munin",
} }
) )
); );
} }
else { else {
if (args.conf_schema !== "") { if (args.conf_schema) {
process.stdout.write( process.stdout.write(
lib_plankton.json.encode( lib_plankton.json.encode(
_munin.conf.schema((args.conf_schema === "_") ? undefined : args.conf_schema), _munin.conf.schema_extended(),
{ {
"formatted": true, "formatted": true,
} }

View file

@ -32,21 +32,46 @@ namespace _munin.targets.email
receivers : Array<string>; receivers : Array<string>;
hide_tags : boolean; hide_tags : boolean;
reminders : Array<_munin.type_reminder>; reminders : Array<_munin.type_reminder>;
language : string;
strings : {
notification_head : string;
};
}; };
/**
*/
function get_translation(
parameters : type_parameters,
path : string
) : string
{
return lib_plankton.translate.get_new(
path,
{
"preferred_language": parameters.language,
}
);
}
/** /**
*/ */
function summarize_event( function summarize_event(
parameters : type_parameters, parameters : type_parameters,
labels : _munin.type_labels,
event : _munin.type_event event : _munin.type_event
) : string ) : string
{ {
return lib_plankton.string.coin( return lib_plankton.string.coin(
"[{{head}}] {{date}} : {{macro_tags}}{{title}}", "[{{head}}] {{date}} : {{macro_tags}}{{title}}",
{ {
"head": labels.head, "head": lib_plankton.string.coin(
"{{event}}-{{reminder}}",
{
"event": get_translation(parameters, "core.event.event").toLowerCase(),
"reminder": get_translation(parameters, "core.reminder.reminder").toLowerCase(),
}
),
"date": lib_plankton.pit.date_format( "date": lib_plankton.pit.date_format(
event.begin.date event.begin.date
), ),
@ -67,14 +92,13 @@ namespace _munin.targets.email
*/ */
function render_event( function render_event(
parameters : type_parameters, parameters : type_parameters,
labels : _munin.type_labels,
event : _munin.type_event event : _munin.type_event
) : string ) : string
{ {
return lib_plankton.string.coin( return lib_plankton.string.coin(
"{{title_label}} | {{macro_tags}}{{title_value}}\n{{time_label}} | {{time_value}}{{macro_location}}{{macro_description}}", "{{title_label}} | {{macro_tags}}{{title_value}}\n{{time_label}} | {{time_value}}{{macro_location}}{{macro_description}}",
{ {
"title_label": labels.title.toUpperCase(), "title_label": get_translation(parameters, "core.event.title.short").toUpperCase(),
"macro_tags": ( "macro_tags": (
(parameters.hide_tags || (event.tags === null)) (parameters.hide_tags || (event.tags === null))
? ?
@ -83,7 +107,7 @@ namespace _munin.targets.email
(event.tags.map(tag => ("{" + tag + "}")).join(" ") + " ") (event.tags.map(tag => ("{" + tag + "}")).join(" ") + " ")
), ),
"title_value": event.title, "title_value": event.title,
"time_label": labels.time.toUpperCase(), "time_label": get_translation(parameters, "core.event.time.short").toUpperCase(),
"time_value": lib_plankton.pit.timespan_format( "time_value": lib_plankton.pit.timespan_format(
event.begin, event.begin,
event.end, event.end,
@ -99,7 +123,7 @@ namespace _munin.targets.email
lib_plankton.string.coin( lib_plankton.string.coin(
"\n{{location_label}} | {{location_value}}", "\n{{location_label}} | {{location_value}}",
{ {
"location_label": labels.location.toUpperCase(), "location_label": get_translation(parameters, "core.event.location.short").toUpperCase(),
"location_value": event.location, "location_value": event.location,
} }
) )
@ -126,7 +150,6 @@ namespace _munin.targets.email
*/ */
async function send( async function send(
parameters : type_parameters, parameters : type_parameters,
labels : _munin.type_labels,
events : Array<_munin.type_event> events : Array<_munin.type_event>
) : Promise<void> ) : Promise<void>
{ {
@ -142,21 +165,32 @@ namespace _munin.targets.email
( (
(events.length === 1) (events.length === 1)
? ?
summarize_event(parameters, labels, events[0]) summarize_event(parameters, events[0])
: :
lib_plankton.string.coin( lib_plankton.string.coin(
"[{{head}}] {{count}} {{events}}", parameters.strings.notification_head,
{ {
"head": labels.head, "core": lib_plankton.string.coin(
"count": events.length.toFixed(0), "{{event}}-{{reminder}}",
"events": labels.events, {
"event": get_translation(parameters, "core.event.event").toLowerCase(),
"reminder": get_translation(parameters, "core.reminder.reminder").toLowerCase(),
}
),
"extra": lib_plankton.string.coin(
"{{count}} {{events}}",
{
"count": events.length.toFixed(0),
"events": get_translation(parameters, "core.event.events"),
}
),
} }
) )
), ),
( (
events events
.map(event => render_event(parameters, labels, event)) .map(event => render_event(parameters, event))
.join("\n\n---\n\n") .join("\n\n--------\n\n")
) )
); );
} }
@ -176,7 +210,7 @@ namespace _munin.targets.email
"receivers": parameters.receivers.join(","), "receivers": parameters.receivers.join(","),
} }
), ),
"send": (labels, events) => send(parameters, labels, events), "send": (events) => send(parameters, events),
}; };
} }

View file

@ -28,14 +28,33 @@ namespace _munin.targets.telegram_bot
chat_id : int; chat_id : int;
hide_tags : boolean; hide_tags : boolean;
reminders : Array<_munin.type_reminder>; reminders : Array<_munin.type_reminder>;
language : string;
strings : {
notification_head : string;
};
}; };
/**
*/
function get_translation(
parameters : type_parameters,
path : string
) : string
{
return lib_plankton.translate.get_new(
path,
{
"preferred_language": parameters.language,
}
);
}
/** /**
*/ */
function render_event( function render_event(
parameters : type_parameters, parameters : type_parameters,
labels : _munin.type_labels,
event : _munin.type_event event : _munin.type_event
) : string ) : string
{ {
@ -49,9 +68,9 @@ namespace _munin.targets.telegram_bot
: :
(event.tags.map(tag => ("{" + tag + "}")).join(" ") + " ") (event.tags.map(tag => ("{" + tag + "}")).join(" ") + " ")
), ),
"title_label": labels.title.toUpperCase(), "title_label": get_translation(parameters, "core.event.title.short").toUpperCase(),
"title_value": event.title, "title_value": event.title,
"time_label": labels.time.toUpperCase(), "time_label": get_translation(parameters, "core.event.time.short").toUpperCase(),
"time_value": lib_plankton.pit.timespan_format( "time_value": lib_plankton.pit.timespan_format(
event.begin, event.begin,
event.end, event.end,
@ -67,7 +86,7 @@ namespace _munin.targets.telegram_bot
lib_plankton.string.coin( lib_plankton.string.coin(
"\n{{location_label}} | {{location_value}}", "\n{{location_label}} | {{location_value}}",
{ {
"location_label": labels.location.toUpperCase(), "location_label": get_translation(parameters, "core.event.location.short").toUpperCase(),
"location_value": event.location, "location_value": event.location,
} }
) )
@ -93,7 +112,6 @@ namespace _munin.targets.telegram_bot
*/ */
async function send( async function send(
parameters : type_parameters, parameters : type_parameters,
labels : _munin.type_labels,
events : Array<_munin.type_event> events : Array<_munin.type_event>
) : Promise<void> ) : Promise<void>
{ {
@ -101,26 +119,37 @@ namespace _munin.targets.telegram_bot
parameters.bot_token, parameters.bot_token,
parameters.chat_id, parameters.chat_id,
lib_plankton.string.coin( lib_plankton.string.coin(
"*{{head_core}}{{head_extra}}*\n\n{{events}}", "*{{head}}*\n\n{{body}}",
{ {
"head_core": labels.head, "head": lib_plankton.string.coin(
"head_extra": ( parameters.strings.notification_head,
(events.length <= 1) {
? "core": lib_plankton.string.coin(
"" "{{label_event}}-{{label_reminder}}",
: {
lib_plankton.string.coin( "label_event": lib_plankton.string.capitalize(get_translation(parameters, "core.event.event")),
" ({{count}} {{events}})", "label_reminder": lib_plankton.string.capitalize(get_translation(parameters, "core.reminder.reminder")),
{ }
"count": events.length.toFixed(0), ),
"events": labels.events, "extra": (
} (events.length <= 1)
) ?
""
:
lib_plankton.string.coin(
" ({{count}} {{events}})",
{
"count": events.length.toFixed(0),
"events": get_translation(parameters, "core.event.events"),
}
)
),
}
), ),
"events": ( "body": (
events events
.map(event => render_event(parameters, labels, event)) .map(event => render_event(parameters, event))
.join("\n\n---\n\n") .join("\n\n--------\n\n")
), ),
} }
), ),
@ -145,7 +174,7 @@ namespace _munin.targets.telegram_bot
"chat_id": parameters.chat_id.toFixed(0), "chat_id": parameters.chat_id.toFixed(0),
} }
), ),
"send": (labels, events) => send(parameters, labels, events), "send": (events) => send(parameters, events),
}; };
} }

View file

@ -67,7 +67,7 @@ namespace _munin.test
type_output type_output
> >
> = await _munin.helpers.test.get_data<type_input, type_output>( > = await _munin.helpers.test.get_data<type_input, type_output>(
"data/reminder_check.testdata.json", "data/test/reminder_check.testdata.json",
{ {
} }
); );

View file

@ -30,17 +30,6 @@ namespace _munin
monthly = "monthly", monthly = "monthly",
} }
/**
*/
export type type_labels = {
head : string;
title : string;
time : string;
location : string;
events : string;
};
/** /**
*/ */
@ -83,10 +72,7 @@ namespace _munin
reminders : Array<type_reminder>; reminders : Array<type_reminder>;
show : (() => string); show : (() => string);
send : ( send : (
( (events : Array<type_event>)
labels : type_labels,
events : Array<type_event>
)
=> =>
Promise<void> Promise<void>
); );