From e06545aa92ac7347b734675bffd961f9ecd5ced9 Mon Sep 17 00:00:00 2001 From: Ralf Zerres Date: Sun, 23 May 2021 14:36:35 +0200 Subject: [PATCH] Update copyright and year Signed-off-by: Ralf Zerres --- advotracker_client/examples/csv-test/main.rs | 2 +- .../examples/csv-test/parse_args.rs | 4 +- advotracker_client/examples/email_test.rs | 7 + .../examples/messages_test/main.rs | 2 +- .../examples/messages_test/main_view.rs | 2 +- .../examples/messages_test/mod.rs | 7 + .../examples/messages_test/receiver/mod.rs | 7 + .../messages_test/receiver/receiver_state.rs | 2 +- .../messages_test/receiver/receiver_view.rs | 2 +- .../examples/messages_test/sender/mod.rs | 7 + .../messages_test/sender/sender_state.rs | 2 +- .../messages_test/sender/sender_view.rs | 2 +- advotracker_client/examples/pager_test.rs | 2 +- advotracker_client/src/data/constants.rs | 2 +- advotracker_client/src/data/mod.rs | 4 +- advotracker_client/src/data/structures.rs | 3 +- advotracker_client/src/lib.rs | 4 +- advotracker_client/src/main.rs | 4 +- advotracker_client/src/parse_args.rs | 4 +- .../src/services/exports/#send_ticketdata.rs# | 127 ------------------ .../src/services/exports/allianzdirectcall.rs | 4 +- .../src/services/exports/mod.rs | 4 +- .../src/services/exports/send_ticketdata.rs | 2 +- .../src/services/imports/allianzdirectcall.rs | 4 +- .../src/services/imports/csv-test.rs | 4 +- .../src/services/imports/mod.rs | 4 +- advotracker_client/src/services/mod.rs | 4 +- .../configuration/configuration_state.rs | 4 +- .../configuration/configuration_view.rs | 4 +- .../src/widgets/configuration/mod.rs | 4 +- .../src/widgets/global_state.rs | 4 +- .../localization/localization_state.rs | 4 +- .../widgets/localization/localization_view.rs | 4 +- .../src/widgets/localization/mod.rs | 4 +- .../src/widgets/login/loginform_view.rs | 4 +- .../src/widgets/login/loginlist_view.rs | 4 +- advotracker_client/src/widgets/main_view.rs | 4 +- .../src/widgets/menu/menu_state.rs | 4 +- .../src/widgets/menu/menu_view.rs | 4 +- advotracker_client/src/widgets/menu/mod.rs | 4 +- advotracker_client/src/widgets/mod.rs | 4 +- .../src/widgets/policycheck/mod.rs | 4 +- .../widgets/policycheck/policycheck_state.rs | 4 +- .../widgets/policycheck/policycheck_view.rs | 4 +- .../src/widgets/policydata/mod.rs | 4 +- .../widgets/policydata/policydata_state.rs | 4 +- .../src/widgets/policydata/policydata_view.rs | 4 +- .../src/widgets/policylist/mod.rs | 4 +- .../widgets/policylist/policylist_state.rs | 4 +- .../src/widgets/policylist/policylist_view.rs | 4 +- .../src/widgets/ticketdata/mod.rs | 4 +- .../widgets/ticketdata/ticketdata_state.rs | 4 +- .../src/widgets/ticketdata/ticketdata_view.rs | 4 +- .../advotracker/advotracker_de_DE.ron | 40 +++--- 54 files changed, 134 insertions(+), 232 deletions(-) delete mode 100644 advotracker_client/src/services/exports/#send_ticketdata.rs# diff --git a/advotracker_client/examples/csv-test/main.rs b/advotracker_client/examples/csv-test/main.rs index b472ab7..99ae0f6 100644 --- a/advotracker_client/examples/csv-test/main.rs +++ b/advotracker_client/examples/csv-test/main.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use chrono::{Local, DateTime}; diff --git a/advotracker_client/examples/csv-test/parse_args.rs b/advotracker_client/examples/csv-test/parse_args.rs index 530a080..7c8193c 100644 --- a/advotracker_client/examples/csv-test/parse_args.rs +++ b/advotracker_client/examples/csv-test/parse_args.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats - + * * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ // parse CLI commandline arguments with clap diff --git a/advotracker_client/examples/email_test.rs b/advotracker_client/examples/email_test.rs index 55036c6..64f46d9 100644 --- a/advotracker_client/examples/email_test.rs +++ b/advotracker_client/examples/email_test.rs @@ -1,3 +1,10 @@ +// SPDX-License-Identifier: (0BSD or MIT) +/* + * advotracker - Hotline tackingtool for Advocats + + * Copyright 2020 Ralf Zerres + */ + use lettre::{ transport::smtp::authentication::Credentials, Message, SmtpTransport, Transport, diff --git a/advotracker_client/examples/messages_test/main.rs b/advotracker_client/examples/messages_test/main.rs index 53843d7..f3f8eb8 100644 --- a/advotracker_client/examples/messages_test/main.rs +++ b/advotracker_client/examples/messages_test/main.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * OrbTK - The Orbital Widget Toolkit * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/examples/messages_test/main_view.rs b/advotracker_client/examples/messages_test/main_view.rs index 0e19d75..28a68af 100644 --- a/advotracker_client/examples/messages_test/main_view.rs +++ b/advotracker_client/examples/messages_test/main_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * OrbTK - The Orbital Widget Toolkit * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/examples/messages_test/mod.rs b/advotracker_client/examples/messages_test/mod.rs index 2011c5b..23d2fa9 100644 --- a/advotracker_client/examples/messages_test/mod.rs +++ b/advotracker_client/examples/messages_test/mod.rs @@ -1,3 +1,10 @@ +// SPDX-License-Identifier: (0BSD or MIT) +/* + * advotracker - Hotline tackingtool for Advocats + * + * Copyright 2020 Ralf Zerres + */ + // The starting point (Main View). pub mod main_view; diff --git a/advotracker_client/examples/messages_test/receiver/mod.rs b/advotracker_client/examples/messages_test/receiver/mod.rs index 44a0597..539e2c9 100644 --- a/advotracker_client/examples/messages_test/receiver/mod.rs +++ b/advotracker_client/examples/messages_test/receiver/mod.rs @@ -1,3 +1,10 @@ +// SPDX-License-Identifier: (0BSD or MIT) +/* + * advotracker - Hotline tackingtool for Advocats + * + * Copyright 2020 Ralf Zerres + */ + /// The reciever state pub mod receiver_state; diff --git a/advotracker_client/examples/messages_test/receiver/receiver_state.rs b/advotracker_client/examples/messages_test/receiver/receiver_state.rs index bee299e..fa43075 100644 --- a/advotracker_client/examples/messages_test/receiver/receiver_state.rs +++ b/advotracker_client/examples/messages_test/receiver/receiver_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * OrbTK - The Orbital Widget Toolkit * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/examples/messages_test/receiver/receiver_view.rs b/advotracker_client/examples/messages_test/receiver/receiver_view.rs index ca4d1f9..24951de 100644 --- a/advotracker_client/examples/messages_test/receiver/receiver_view.rs +++ b/advotracker_client/examples/messages_test/receiver/receiver_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * OrbTK - The Orbital Widget Toolkit * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/examples/messages_test/sender/mod.rs b/advotracker_client/examples/messages_test/sender/mod.rs index bef7c02..f662439 100644 --- a/advotracker_client/examples/messages_test/sender/mod.rs +++ b/advotracker_client/examples/messages_test/sender/mod.rs @@ -1,3 +1,10 @@ +/* + * OrbTK - The Orbital Widget Toolkit + * + * Copyright 2021 Ralf Zerres + * SPDX-License-Identifier: (0BSD or MIT) + */ + /// The sender state pub mod sender_state; diff --git a/advotracker_client/examples/messages_test/sender/sender_state.rs b/advotracker_client/examples/messages_test/sender/sender_state.rs index d9ee945..c2bef52 100644 --- a/advotracker_client/examples/messages_test/sender/sender_state.rs +++ b/advotracker_client/examples/messages_test/sender/sender_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * OrbTK - The Orbital Widget Toolkit * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/examples/messages_test/sender/sender_view.rs b/advotracker_client/examples/messages_test/sender/sender_view.rs index 3b32f5f..bf4b7b8 100644 --- a/advotracker_client/examples/messages_test/sender/sender_view.rs +++ b/advotracker_client/examples/messages_test/sender/sender_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * OrbTK - The Orbital Widget Toolkit * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/examples/pager_test.rs b/advotracker_client/examples/pager_test.rs index 039f509..05f9017 100644 --- a/advotracker_client/examples/pager_test.rs +++ b/advotracker_client/examples/pager_test.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use orbtk::prelude::*; diff --git a/advotracker_client/src/data/constants.rs b/advotracker_client/src/data/constants.rs index 9c0bd45..b5ec24e 100644 --- a/advotracker_client/src/data/constants.rs +++ b/advotracker_client/src/data/constants.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ // Component Values (Properties) diff --git a/advotracker_client/src/data/mod.rs b/advotracker_client/src/data/mod.rs index 3d74a9e..58c3dce 100644 --- a/advotracker_client/src/data/mod.rs +++ b/advotracker_client/src/data/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ diff --git a/advotracker_client/src/data/structures.rs b/advotracker_client/src/data/structures.rs index dcefec7..571b8bb 100644 --- a/advotracker_client/src/data/structures.rs +++ b/advotracker_client/src/data/structures.rs @@ -1,7 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres + * Copyright 2020-2021 Ralf Zerres * SPDX-License-Identifier: (0BSD or MIT) */ diff --git a/advotracker_client/src/lib.rs b/advotracker_client/src/lib.rs index 94ab35f..bfe10d4 100644 --- a/advotracker_client/src/lib.rs +++ b/advotracker_client/src/lib.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: 0BSD, MIT + * Copyright 2020-2021 Ralf Zerres */ #![crate_name = "advotracker_client"] diff --git a/advotracker_client/src/main.rs b/advotracker_client/src/main.rs index 7c3e4e1..25f78c3 100644 --- a/advotracker_client/src/main.rs +++ b/advotracker_client/src/main.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ // suppress creation of a new console window on window diff --git a/advotracker_client/src/parse_args.rs b/advotracker_client/src/parse_args.rs index df33b69..1f3df46 100644 --- a/advotracker_client/src/parse_args.rs +++ b/advotracker_client/src/parse_args.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ // parse CLI commandline arguments with clap diff --git a/advotracker_client/src/services/exports/#send_ticketdata.rs# b/advotracker_client/src/services/exports/#send_ticketdata.rs# deleted file mode 100644 index a4217a9..0000000 --- a/advotracker_client/src/services/exports/#send_ticketdata.rs# +++ /dev/null @@ -1,127 +0,0 @@ -/* - * advotracker - Hotline tackingtool for Advocats - * - * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) - */ - -use lettre::{ - message::{header, MultiPart, SinglePart}, - Message, SmtpTransport, Transport, - transport::smtp::authentication::Credentials, -}; -use maud::html; -use std::error::Error; -//use std::process; -use tracing::{info, trace}; - -use crate::data::structures::Email; -use self::t; - -// include localization strings -include!(concat!(env!("OUT_DIR"), "/i18n.rs")); - -/// send ticket data via eMail -pub fn sendticketdata(email: &Email, language: &str) -> Result<(), Box> { - use self.t; - - let mut res = t!(sendticketdata_export_started => lang); - let mut state = t!(state_started => lang); - trace!(target: "sendticketdata", process = ?res, state = ?state); - - // The html we want to send. - // It uses https://crates.io/crates/maud - let html = html! { - head { - title { (email.subject) " (" (email.policy_code) ")" } - style type="text/css" { - "h2, h4 { font-family: Arial, Helvetica, sans-serif; }" - } - } - div style="display: flex; flex-direction: column; align-items: left;" { - // compose with variables and strings - h2 { (email.subject) " (" (email.policy_code) ")" } - p { "Vers.-Schein/Schadennummer: " (email.policy_code) } - p { "Versicherungsnehmer: " (email.policy_holder) } - p { "Selbstbehalt: " (email.deductible) } - p { "Rückrufnummer: " (email.callback_number) } - p { "Erreichbarkeit: " (email.callback_date) } - p { "Rechtsproblem: " (email.harm_type) } - p { "Rechtsrat: " (email.ivr_comment) } - } - }; - - let ascii_body = String::new() - + &"Vers.-Schein/Schadennummer".to_string() + &(email.policy_code) + &"\n" - + &"Versicherungsnehmer: ".to_string() + &(email.policy_holder) + &"\n" - + &"Selbstbehalt: ".to_string() + &(email.deductible) + &"\n" - + &"Rückrufnummer: ".to_string()+ &(email.callback_number) + &"\n" - + &"Erreichbarkeit: ".to_string() + &(email.callback_date) + &"\n" - + &"Rechtsproblem: ".to_string() + &(email.harm_type) + &"\n" - + &"Rechtsrat: ".to_string() + &(email.ivr_comment) + &"\n"; - - info!("email body: {:?}", ascii_body); - - let message = Message::builder() - .from((email.mail_from).parse().unwrap()) - .reply_to((email.mail_reply).parse().unwrap()) - .to((email.mail_to).parse().unwrap()) - .cc((email.mail_cc).parse().unwrap()) - // we do not use bcc yet - //.bcc((email.mail_bcc).parse().unwrap()) - .subject(String::new() - + &email.subject.to_string() - + &" (".to_string() - + &email.policy_code.to_string() - + &")".to_string() - ) - .multipart( - MultiPart::alternative() // This is composed of two parts. - .singlepart( - SinglePart::builder() - .header(header::ContentType( - "text/plain; charset=utf8".parse().unwrap(), - )) - .body(String::from(ascii_body)), - ) - .singlepart( - SinglePart::builder() - .header(header::ContentType( - "text/html; charset=utf8".parse().unwrap(), - )) - .body(html.into_string()), - ), - ) - .expect("failed to build email"); - - - info!("message: {:?}", message); - - // Create credential for remote authentication (username, password) - // WIP: get credentials from config file / cli - let credentials = Credentials::new("service@hiedemann.de".to_string(), "88service99$".to_string()); - - // standard smtp client connection - //let mailer = SmtpTransport::starttls_relay("hiedemannsbs.kanzlei.hiedemann.de") - - // Open a remote connection to relay server (port 2525) - // WIP: get relay address from config file / cli - //let relay = "hiedemannsbs.kanzlei.hiedemann.de" - let relay = "smtp.strato.de"; - - let mailer = SmtpTransport::relay(relay) - .unwrap() - .credentials(credentials) - .build(); - - trace!(target: "sendticketdata", email = ?email); - - // Send the email and catch the error if it isn't successfully - let _result = mailer.send(&message)?; - - state = t!(state_finished => lang); - res = t!(sendticketdata_export_finished => lang); - trace!(target: "sendticketdata", process = ?res, state = ?state); - - Ok(()) -} diff --git a/advotracker_client/src/services/exports/allianzdirectcall.rs b/advotracker_client/src/services/exports/allianzdirectcall.rs index aa4a0da..cf7c6ae 100644 --- a/advotracker_client/src/services/exports/allianzdirectcall.rs +++ b/advotracker_client/src/services/exports/allianzdirectcall.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ //use chrono::{Local, DateTime}; diff --git a/advotracker_client/src/services/exports/mod.rs b/advotracker_client/src/services/exports/mod.rs index bd16ef3..d1f747f 100644 --- a/advotracker_client/src/services/exports/mod.rs +++ b/advotracker_client/src/services/exports/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// Send ticketdata via email diff --git a/advotracker_client/src/services/exports/send_ticketdata.rs b/advotracker_client/src/services/exports/send_ticketdata.rs index 7037bf0..9872c59 100644 --- a/advotracker_client/src/services/exports/send_ticketdata.rs +++ b/advotracker_client/src/services/exports/send_ticketdata.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) */ use lettre::{ diff --git a/advotracker_client/src/services/imports/allianzdirectcall.rs b/advotracker_client/src/services/imports/allianzdirectcall.rs index b9c1d19..8b8a18d 100644 --- a/advotracker_client/src/services/imports/allianzdirectcall.rs +++ b/advotracker_client/src/services/imports/allianzdirectcall.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use chrono::{Local, DateTime}; diff --git a/advotracker_client/src/services/imports/csv-test.rs b/advotracker_client/src/services/imports/csv-test.rs index 5ed29fa..f7dc81b 100644 --- a/advotracker_client/src/services/imports/csv-test.rs +++ b/advotracker_client/src/services/imports/csv-test.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use std::error::Error; diff --git a/advotracker_client/src/services/imports/mod.rs b/advotracker_client/src/services/imports/mod.rs index 03f227a..1de34bc 100644 --- a/advotracker_client/src/services/imports/mod.rs +++ b/advotracker_client/src/services/imports/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// Importing Allianz DirecCall data diff --git a/advotracker_client/src/services/mod.rs b/advotracker_client/src/services/mod.rs index e0ee4d2..83dafba 100644 --- a/advotracker_client/src/services/mod.rs +++ b/advotracker_client/src/services/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// advotracker import modules diff --git a/advotracker_client/src/widgets/configuration/configuration_state.rs b/advotracker_client/src/widgets/configuration/configuration_state.rs index ab00f98..9d0b0bc 100644 --- a/advotracker_client/src/widgets/configuration/configuration_state.rs +++ b/advotracker_client/src/widgets/configuration/configuration_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/configuration/configuration_view.rs b/advotracker_client/src/widgets/configuration/configuration_view.rs index 2ff877a..e7cb6ba 100644 --- a/advotracker_client/src/widgets/configuration/configuration_view.rs +++ b/advotracker_client/src/widgets/configuration/configuration_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/configuration/mod.rs b/advotracker_client/src/widgets/configuration/mod.rs index b2d4953..e871126 100644 --- a/advotracker_client/src/widgets/configuration/mod.rs +++ b/advotracker_client/src/widgets/configuration/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The configuration state diff --git a/advotracker_client/src/widgets/global_state.rs b/advotracker_client/src/widgets/global_state.rs index 2f8eba3..e1c0ef3 100644 --- a/advotracker_client/src/widgets/global_state.rs +++ b/advotracker_client/src/widgets/global_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use dotenv::dotenv; diff --git a/advotracker_client/src/widgets/localization/localization_state.rs b/advotracker_client/src/widgets/localization/localization_state.rs index 9cc3b58..60c4942 100644 --- a/advotracker_client/src/widgets/localization/localization_state.rs +++ b/advotracker_client/src/widgets/localization/localization_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/localization/localization_view.rs b/advotracker_client/src/widgets/localization/localization_view.rs index 3303180..4778717 100644 --- a/advotracker_client/src/widgets/localization/localization_view.rs +++ b/advotracker_client/src/widgets/localization/localization_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/localization/mod.rs b/advotracker_client/src/widgets/localization/mod.rs index 48225bc..41eba4b 100644 --- a/advotracker_client/src/widgets/localization/mod.rs +++ b/advotracker_client/src/widgets/localization/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The localization state diff --git a/advotracker_client/src/widgets/login/loginform_view.rs b/advotracker_client/src/widgets/login/loginform_view.rs index 91661e2..da7ef4d 100644 --- a/advotracker_client/src/widgets/login/loginform_view.rs +++ b/advotracker_client/src/widgets/login/loginform_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/login/loginlist_view.rs b/advotracker_client/src/widgets/login/loginlist_view.rs index fb4b391..cfb13d5 100644 --- a/advotracker_client/src/widgets/login/loginlist_view.rs +++ b/advotracker_client/src/widgets/login/loginlist_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/main_view.rs b/advotracker_client/src/widgets/main_view.rs index 3ef8f21..4feed45 100644 --- a/advotracker_client/src/widgets/main_view.rs +++ b/advotracker_client/src/widgets/main_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/menu/menu_state.rs b/advotracker_client/src/widgets/menu/menu_state.rs index 5cfac5a..8e429f1 100644 --- a/advotracker_client/src/widgets/menu/menu_state.rs +++ b/advotracker_client/src/widgets/menu/menu_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use cfg_if::cfg_if; diff --git a/advotracker_client/src/widgets/menu/menu_view.rs b/advotracker_client/src/widgets/menu/menu_view.rs index 5149b2d..b2c1dae 100644 --- a/advotracker_client/src/widgets/menu/menu_view.rs +++ b/advotracker_client/src/widgets/menu/menu_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/menu/mod.rs b/advotracker_client/src/widgets/menu/mod.rs index 5713301..0350482 100644 --- a/advotracker_client/src/widgets/menu/mod.rs +++ b/advotracker_client/src/widgets/menu/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The menu view diff --git a/advotracker_client/src/widgets/mod.rs b/advotracker_client/src/widgets/mod.rs index 47f48ee..c83e7da 100644 --- a/advotracker_client/src/widgets/mod.rs +++ b/advotracker_client/src/widgets/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// Configuration widget. diff --git a/advotracker_client/src/widgets/policycheck/mod.rs b/advotracker_client/src/widgets/policycheck/mod.rs index 1e88f90..bbaf404 100644 --- a/advotracker_client/src/widgets/policycheck/mod.rs +++ b/advotracker_client/src/widgets/policycheck/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The policy check state diff --git a/advotracker_client/src/widgets/policycheck/policycheck_state.rs b/advotracker_client/src/widgets/policycheck/policycheck_state.rs index 07aa529..be63055 100644 --- a/advotracker_client/src/widgets/policycheck/policycheck_state.rs +++ b/advotracker_client/src/widgets/policycheck/policycheck_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/policycheck/policycheck_view.rs b/advotracker_client/src/widgets/policycheck/policycheck_view.rs index 9a30190..b2dc641 100644 --- a/advotracker_client/src/widgets/policycheck/policycheck_view.rs +++ b/advotracker_client/src/widgets/policycheck/policycheck_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/policydata/mod.rs b/advotracker_client/src/widgets/policydata/mod.rs index 1e88f90..bbaf404 100644 --- a/advotracker_client/src/widgets/policydata/mod.rs +++ b/advotracker_client/src/widgets/policydata/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The policy check state diff --git a/advotracker_client/src/widgets/policydata/policydata_state.rs b/advotracker_client/src/widgets/policydata/policydata_state.rs index 8c7750e..332f72d 100644 --- a/advotracker_client/src/widgets/policydata/policydata_state.rs +++ b/advotracker_client/src/widgets/policydata/policydata_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/policydata/policydata_view.rs b/advotracker_client/src/widgets/policydata/policydata_view.rs index b87b34e..076f4cf 100644 --- a/advotracker_client/src/widgets/policydata/policydata_view.rs +++ b/advotracker_client/src/widgets/policydata/policydata_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/policylist/mod.rs b/advotracker_client/src/widgets/policylist/mod.rs index 0b658fe..43e3c27 100644 --- a/advotracker_client/src/widgets/policylist/mod.rs +++ b/advotracker_client/src/widgets/policylist/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The policy check state diff --git a/advotracker_client/src/widgets/policylist/policylist_state.rs b/advotracker_client/src/widgets/policylist/policylist_state.rs index d26146e..70dd86e 100644 --- a/advotracker_client/src/widgets/policylist/policylist_state.rs +++ b/advotracker_client/src/widgets/policylist/policylist_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/policylist/policylist_view.rs b/advotracker_client/src/widgets/policylist/policylist_view.rs index 0a878bf..c4a2273 100644 --- a/advotracker_client/src/widgets/policylist/policylist_view.rs +++ b/advotracker_client/src/widgets/policylist/policylist_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/src/widgets/ticketdata/mod.rs b/advotracker_client/src/widgets/ticketdata/mod.rs index 9462fb6..d130878 100644 --- a/advotracker_client/src/widgets/ticketdata/mod.rs +++ b/advotracker_client/src/widgets/ticketdata/mod.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ /// The ticket data state diff --git a/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs b/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs index bf78eb3..340eb09 100644 --- a/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs +++ b/advotracker_client/src/widgets/ticketdata/ticketdata_state.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2020 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ //use locales::t; diff --git a/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs b/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs index 944aadd..31f7326 100644 --- a/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs +++ b/advotracker_client/src/widgets/ticketdata/ticketdata_view.rs @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) /* * advotracker - Hotline tackingtool for Advocats * - * Copyright 2021 Ralf Zerres - * SPDX-License-Identifier: (0BSD or MIT) + * Copyright 2020-2021 Ralf Zerres */ use orbtk::prelude::*; diff --git a/advotracker_client/static/resources/advotracker/advotracker_de_DE.ron b/advotracker_client/static/resources/advotracker/advotracker_de_DE.ron index 0061ea4..804a43e 100644 --- a/advotracker_client/static/resources/advotracker/advotracker_de_DE.ron +++ b/advotracker_client/static/resources/advotracker/advotracker_de_DE.ron @@ -1,8 +1,8 @@ +// SPDX-License-Identifier: (0BSD or MIT) // * // * advotracker - Hotline tackingtool for Advocats // * -// * Copyright 2020 Ralf Zerres -// * SPDX-License-Identifier: (0BSD or MIT) +// * Copyright 2020-2021 Ralf Zerres // */ // the language class @@ -10,23 +10,23 @@ Dictionary ( // the map of active identifiers // like a struct, but keys are also values instead of just beenig identifiers words: { - // policycheck_view - "Policy number validation": "Versicherungsnummern Prüfung", - "Policy number": "Versicherungsnummer", - "Checklist elements: ": "Prüflistenelemente: ", - "Check result": "Prüfungsergebnis", - "Importing data": "Importiere Datensätze", - "Processing time": "Bearbeitungszeit", - "Policy number is to long": "Die Nummer ist zu lang", - "Policy number is to short": "Die Nummer ist zu kurz", - "The given policy number is invalid": "Die Versicherungsnumber ist ungültig", - "The given policy number is valid": "Die Versicherungsnumber ist gültig", - "Only numbers are valid": "Nur Nummern sind zulässig", - // localization - "Hello": "Hallo", - "User": "Anwender", - "Localization dialog": "Lokalisierungs-Dialog", - "German": "Deutsch", - "English": "Englisch" + // policycheck_view + "Policy number validation": "Versicherungsnummern Prüfung", + "Policy number": "Versicherungsnummer", + "Checklist elements: ": "Prüflistenelemente: ", + "Check result": "Prüfungsergebnis", + "Importing data": "Importiere Datensätze", + "Processing time": "Bearbeitungszeit", + "Policy number is to long": "Die Nummer ist zu lang", + "Policy number is to short": "Die Nummer ist zu kurz", + "The given policy number is invalid": "Die Versicherungsnumber ist ungültig", + "The given policy number is valid": "Die Versicherungsnumber ist gültig", + "Only numbers are valid": "Nur Nummern sind zulässig", + // localization + "Hello": "Hallo", + "User": "Anwender", + "Localization dialog": "Lokalisierungs-Dialog", + "German": "Deutsch", + "English": "Englisch" } )