From c0e41ea0fa3e8c738893dfe8faacbbb71797be57 Mon Sep 17 00:00:00 2001 From: "o.pinke" Date: Mon, 26 Apr 2021 20:28:43 +0200 Subject: [PATCH] fixed german translations --- .gitignore | 1 + cl_plugin.xml | 2 +- classes/class.newsletter.php | 20 +-- includes/include.newsletter_edit.php | 66 ++++---- includes/include.newsletter_edit_message.php | 68 ++++---- includes/include.newsletter_jobs_details.php | 90 +++++----- includes/include.newsletter_jobs_menu.php | 14 +- includes/include.newsletter_jobs_subnav.php | 4 +- includes/include.newsletter_left_top.php | 154 +++++++++--------- includes/include.newsletter_menu.php | 20 +-- includes/include.newsletter_subnav.php | 4 +- includes/include.recipients.group.subnav.php | 2 +- includes/include.recipients.group_edit.php | 76 ++++----- includes/include.recipients.group_menu.php | 6 +- includes/include.recipients_edit.php | 38 ++--- includes/include.recipients_import.php | 56 +++---- includes/include.recipients_menu.php | 14 +- .../{cl_newsletter.pot => cl-newsletter.pot} | 0 .../{cl_newsletter.mo => cl-newsletter.mo} | Bin .../{cl_newsletter.po => cl-newsletter.po} | 0 20 files changed, 318 insertions(+), 317 deletions(-) create mode 100644 .gitignore rename locale/{cl_newsletter.pot => cl-newsletter.pot} (100%) rename locale/de_DE/LC_MESSAGES/{cl_newsletter.mo => cl-newsletter.mo} (100%) rename locale/de_DE/LC_MESSAGES/{cl_newsletter.po => cl-newsletter.po} (100%) diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d8fe4fa --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/.project diff --git a/cl_plugin.xml b/cl_plugin.xml index a7ec0ba..c006176 100644 --- a/cl_plugin.xml +++ b/cl_plugin.xml @@ -9,7 +9,7 @@ ConLite Team cl-newsletter@conlite.org https://conlite.org - 1.0.0 + 1.0.2 diff --git a/classes/class.newsletter.php b/classes/class.newsletter.php index 510011d..565ba30 100644 --- a/classes/class.newsletter.php +++ b/classes/class.newsletter.php @@ -107,7 +107,7 @@ class NewsletterCollection extends ItemCollection { if ($oClientLang->getProperty("newsletter", "html_newsletter") == "true") { $iIDArt = conCopyArticle($oBaseItem->get("idart"), $oClientLang->getProperty("newsletter", "html_newsletter_idcat"), - sprintf(i18n("Newsletter: %s", "cl_newsletter"), $oItem->get("name"))); + sprintf(i18n("Newsletter: %s", "cl-newsletter"), $oItem->get("name"))); conMakeOnline($iIDArt, $lang); // Article has to be online for sending... } unset($oClientLang); @@ -541,7 +541,7 @@ class Newsletter extends Item { $sReturn = $sHTML; } else { if ($contenido) { // Use i18n only in backend - $sErrorText = i18n("There was a problem getting the newsletter article using http. Error: %s (%s)", "cl_newsletter"); + $sErrorText = i18n("There was a problem getting the newsletter article using http. Error: %s (%s)", "cl-newsletter"); } else { $sErrorText = "There was a problem getting the newsletter article using http. Error: %s (%s)"; } @@ -646,7 +646,7 @@ class Newsletter extends Item { // deleted). Exit with error instead of sending as text message only if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter to %s could not be sent: No html message available", "cl_newsletter"); + $sError = i18n("Newsletter to %s could not be sent: No html message available", "cl-newsletter"); } else { $sError = "Newsletter to %s could not be sent: No html message available"; } @@ -717,7 +717,7 @@ class Newsletter extends Item { if (!isValidMail($sEMail) || strtolower($sEMail) == "sysadmin@ihresite.de") { // No valid destination mail address specified if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter to %s could not be sent: No valid e-mail address", "cl_newsletter"); + $sError = i18n("Newsletter to %s could not be sent: No valid e-mail address", "cl-newsletter"); } else { $sError = "Newsletter to %s could not be sent: No valid e-mail address"; } @@ -742,7 +742,7 @@ class Newsletter extends Item { if (!$oMail->Send()) { if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter to %s could not be sent", "cl_newsletter"); + $sError = i18n("Newsletter to %s could not be sent", "cl-newsletter"); } else { $sError = "Newsletter to %s could not be sent"; } @@ -804,7 +804,7 @@ class Newsletter extends Item { // deleted). Exit with error instead of sending as text message only if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter could not be sent: No html message available", "cl_newsletter"); + $sError = i18n("Newsletter could not be sent: No html message available", "cl-newsletter"); } else { $sError = "Newsletter could not be sent: No html message available"; } @@ -916,14 +916,14 @@ class Newsletter extends Item { if (strlen($sKey) != 30) { // Prevents sending without having a key if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter to %s could not be sent: Recipient has an incompatible or empty key", "cl_newsletter"); + $sError = i18n("Newsletter to %s could not be sent: Recipient has an incompatible or empty key", "cl-newsletter"); } else { $sError = "Newsletter to %s could not be sent: Recipient has an incompatible or empty key"; } $aMessages[] = $sName . " (" . $sEMail . "): " . sprintf($sError, $sEMail); } else if (!isValidMail($sEMail)) { if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter to %s could not be sent: No valid e-mail address specified", "cl_newsletter"); + $sError = i18n("Newsletter to %s could not be sent: No valid e-mail address specified", "cl-newsletter"); } else { $sError = "Newsletter to %s could not be sent: No valid e-mail address specified"; } @@ -949,7 +949,7 @@ class Newsletter extends Item { $aSendRcps[] = $sName . " (" . $sEMail . ")"; } else { if ($contenido) { // Use i18n only in backend - $sError = i18n("Newsletter to %s could not be sent", "cl_newsletter"); + $sError = i18n("Newsletter to %s could not be sent", "cl-newsletter"); } else { $sError = "Newsletter to %s could not be sent"; } @@ -959,7 +959,7 @@ class Newsletter extends Item { } } else { if ($contenido) { // Use i18n only in backend - $sError = i18n("No recipient with specified recipient/group id %s/%s found", "cl_newsletter"); + $sError = i18n("No recipient with specified recipient/group id %s/%s found", "cl-newsletter"); } else { $sError = "No recipient with specified recpient/group id %s/%s found"; } diff --git a/includes/include.newsletter_edit.php b/includes/include.newsletter_edit.php index fc6d9d8..ac3be9d 100644 --- a/includes/include.newsletter_edit.php +++ b/includes/include.newsletter_edit.php @@ -49,7 +49,7 @@ if (is_array($cfg['plugins']['newsletters'])) { if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create")) { // Create new newsletter - $oNewsletter = $oNewsletters->create(i18n("-- new newsletter --", "cl_newsletter")); + $oNewsletter = $oNewsletters->create(i18n("-- new newsletter --", "cl-newsletter")); $idnewsletter = $oNewsletter->get("idnews"); $oPage->setSubnav("idnewsletter=$idnewsletter", "news"); $oPage->setReload(); @@ -120,9 +120,9 @@ if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create unset($oJobs); if ($oJob) { - $notis = $notification->returnNotification("info", i18n("Newsletter dispatch job has been added for this newsletter", "cl_newsletter")) . "
"; + $notis = $notification->returnNotification("info", i18n("Newsletter dispatch job has been added for this newsletter", "cl-newsletter")) . "
"; } else { - $notis = $notification->returnNotification("error", i18n("Newsletter dispatch job has been not been added! Please check newsletter details", "cl_newsletter")) . "
"; + $notis = $notification->returnNotification("error", i18n("Newsletter dispatch job has been not been added! Please check newsletter details", "cl-newsletter")) . "
"; } $oNewsletter = new Newsletter($idnewsletter); @@ -160,7 +160,7 @@ if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create if ($bSend) { $aRecipients[] = $sName . " (" . $sEMail . ")"; } else { - $aRecipients[] = i18n("None", "cl_newsletter"); + $aRecipients[] = i18n("None", "cl-newsletter"); } } else { $bSend = $oNewsletter->sendDirect($oClientLang->getProperty("newsletter", "idcatart"), 0, $iTestIDNewsGroup, $aRecipients, $sEncoding); @@ -168,11 +168,11 @@ if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create unset($oUser); if ($bSend) { - $notis = $notification->returnNotification("info", i18n("Test newsletter has been sent to:", "cl_newsletter") . "
" . implode("
", $aRecipients) . "
"); + $notis = $notification->returnNotification("info", i18n("Test newsletter has been sent to:", "cl-newsletter") . "
" . implode("
", $aRecipients) . "
"); } else { - $notis = $notification->returnNotification("warning", i18n("Test newsletter has not been sent (partly or completely):", "cl_newsletter") . "
" . - i18n("Successful:", "cl_newsletter") . "
" . implode("
", $aRecipients) . "
" . - i18n("Error messages:", "cl_newsletter") . "
" . $oNewsletter->_sError); + $notis = $notification->returnNotification("warning", i18n("Test newsletter has not been sent (partly or completely):", "cl-newsletter") . "
" . + i18n("Successful:", "cl-newsletter") . "
" . implode("
", $aRecipients) . "
" . + i18n("Error messages:", "cl-newsletter") . "
" . $oNewsletter->_sError); } } else { // No action, just get selected newsletter @@ -230,7 +230,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && $oNewsletters->query(); if ($oNewsletters->next()) { - $aMessages[] = i18n("Could not set new newsletter name: name already exists", "cl_newsletter"); + $aMessages[] = i18n("Could not set new newsletter name: name already exists", "cl-newsletter"); } else { $oNewsletter->set("name", $sName); if ($oNewsletter->get("idart") > 0) { @@ -241,7 +241,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && $oArticles->query(); if ($oArticle = $oArticles->next()) { - $oArticle->set("title", sprintf(i18n("Newsletter: %s", "cl_newsletter"), $oNewsletter->get("name"))); + $oArticle->set("title", sprintf(i18n("Newsletter: %s", "cl-newsletter"), $oNewsletter->get("name"))); $oArticle->store(); } unset($oArticle); @@ -282,7 +282,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && // If "selected groups" have been selected and no group specified, set // selection to "all" if ($_REQUEST["optSendTo"] == "selection" && !is_array($_REQUEST["selGroup"])) { - $aMessages[] = i18n("'Send to recipients in selected groups' has been selected, but no group has been specified. Selection has been set to 'Send to all recipients'", "cl_newsletter"); + $aMessages[] = i18n("'Send to recipients in selected groups' has been selected, but no group has been specified. Selection has been set to 'Send to all recipients'", "cl-newsletter"); $_REQUEST["optSendTo"] = "all"; } $oNewsletter->set("send_to", $_REQUEST["optSendTo"]); @@ -353,16 +353,16 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && $oForm->setVar("action", "news_save"); $oForm->setVar("idnewsletter", $oNewsletter->get("idnews")); - $oForm->addHeader(i18n("Edit newsletter", "cl_newsletter")); + $oForm->addHeader(i18n("Edit newsletter", "cl-newsletter")); $oTxtName = new cHTMLTextbox("txtName", $oNewsletter->get("name"), 40); - $oForm->add(i18n("Name", "cl_newsletter"), $oTxtName->render()); + $oForm->add(i18n("Name", "cl-newsletter"), $oTxtName->render()); $oSelType = new cHTMLSelectElement("selType"); $aItems = array(); - $aItems[] = array("text", i18n("Text only", "cl_newsletter")); + $aItems[] = array("text", i18n("Text only", "cl-newsletter")); if ($oClientLang->getProperty("newsletter", "html_newsletter") == "true") { - $aItems[] = array("html", i18n("HTML and text", "cl_newsletter")); + $aItems[] = array("html", i18n("HTML and text", "cl-newsletter")); } else { $oNewsletter->set("type", "text"); // just in case the global setting was switched off // TODO: Should this setting be stored? @@ -370,15 +370,15 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && $oSelType->autoFill($aItems); $oSelType->setDefault($oNewsletter->get("type")); - $oForm->add(i18n("Type", "cl_newsletter"), $oSelType->render()); + $oForm->add(i18n("Type", "cl-newsletter"), $oSelType->render()); $oTxtFromEMail = new cHTMLTextbox("txtFromEMail", $oNewsletter->get("newsfrom"), 40); $oTxtFromName = new cHTMLTextbox("txtFromName", $oNewsletter->get("newsfromname"), 40); $oTxtSubject = new cHTMLTextarea("txtSubject", $oNewsletter->get("subject"), 80, 2); - $oForm->add(i18n("From (E-Mail)", "cl_newsletter"), $oTxtFromEMail->render()); - $oForm->add(i18n("From (Name)", "cl_newsletter"), $oTxtFromName->render() . " " . i18n("optional", "cl_newsletter")); - $oForm->add(i18n("Subject", "cl_newsletter"), $oTxtSubject->render()); + $oForm->add(i18n("From (E-Mail)", "cl-newsletter"), $oTxtFromEMail->render()); + $oForm->add(i18n("From (Name)", "cl-newsletter"), $oTxtFromName->render() . " " . i18n("optional", "cl-newsletter")); + $oForm->add(i18n("Subject", "cl-newsletter"), $oTxtSubject->render()); // Send options $oSendToAll = new cHTMLRadiobutton("optSendTo", "all"); @@ -406,7 +406,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && $oSelGroup->setSize(10); $oSelGroup->setStyle("width: 350px; margin-top: 5px; margin-bottom: 5px; margin-left: 25px;"); $oSelGroup->setMultiSelect(); - $oSelGroup->setAlt(i18n("Note: Hold to select multiple items.", "cl_newsletter")); + $oSelGroup->setAlt(i18n("Note: Hold to select multiple items.", "cl-newsletter")); $oSelGroup->autoFill($aItems); // No groups in the list, sendToGroups and group listbox disabled @@ -438,9 +438,9 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && } // Recipients - $oForm->add(i18n("Recipients", "cl_newsletter"), $oSendToAll->toHTML(false) . " " . i18n("Send newsletter to all recipients", "cl_newsletter") . "
" . chr(10) . - $oSendToDefault->toHTML(false) . " " . i18n("Send newsletter to the members of the default group", "cl_newsletter") . "
" . chr(10) . - $oSendToGroups->toHTML(false) . " " . i18n("Send newsletter to the members of the selected group(s):", "cl_newsletter") . "
" . chr(10) . + $oForm->add(i18n("Recipients", "cl-newsletter"), $oSendToAll->toHTML(false) . " " . i18n("Send newsletter to all recipients", "cl-newsletter") . "
" . chr(10) . + $oSendToDefault->toHTML(false) . " " . i18n("Send newsletter to the members of the default group", "cl-newsletter") . "
" . chr(10) . + $oSendToGroups->toHTML(false) . " " . i18n("Send newsletter to the members of the selected group(s):", "cl-newsletter") . "
" . chr(10) . $oSelGroup->render()); /* TODO: Work in progress @@ -512,25 +512,25 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client && $ckbCronJob->setDisabled(""); } else { // Give the user a hint - $ckbCronJob->setAlt(i18n("Option has to be enabled as client setting - see techref for details", "cl_newsletter")); + $ckbCronJob->setAlt(i18n("Option has to be enabled as client setting - see techref for details", "cl-newsletter")); } $oCkbDispatch = new cHTMLCheckbox("ckbDispatch", "enabled"); $oCkbDispatch->setChecked($oNewsletter->get("dispatch")); $oTxtDispatchCount = new cHTMLTextbox("txtDispatchCount", $oNewsletter->get("dispatch_count"), 4); $oTxtDispatchDelay = new cHTMLTextbox("txtDispatchDelay", $oNewsletter->get("dispatch_delay"), 4); - $oTxtDispatchDelay->setAlt(i18n("Note: Set to 0 to send chunks manually.", "cl_newsletter")); + $oTxtDispatchDelay->setAlt(i18n("Note: Set to 0 to send chunks manually.", "cl-newsletter")); $oCkbSaveAsDefault = new cHTMLCheckbox("ckbSetDefault", "1"); - $oForm->add(i18n("Options", "cl_newsletter"), $ckbWelcome->toHTML(false) . " " . i18n("Welcome-Newsletter", "cl_newsletter") . "
" . - $ckbCronJob->toHTML(false) . " " . i18n("Use cronjob", "cl_newsletter") . "
" . - $oCkbDispatch->toHTML(false) . " " . i18n("Send in blocks:", "cl_newsletter") . "   " . - i18n("Recipients per block:", "cl_newsletter") . " " . $oTxtDispatchCount->render() . " " . - i18n("Delay between blocks:", "cl_newsletter") . " " . $oTxtDispatchDelay->render() . " " . i18n("sec.", "cl_newsletter") . "
" . - $oCkbSaveAsDefault->toHTML(false) . " " . i18n("Save option settings as default", "cl_newsletter")); + $oForm->add(i18n("Options", "cl-newsletter"), $ckbWelcome->toHTML(false) . " " . i18n("Welcome-Newsletter", "cl-newsletter") . "
" . + $ckbCronJob->toHTML(false) . " " . i18n("Use cronjob", "cl-newsletter") . "
" . + $oCkbDispatch->toHTML(false) . " " . i18n("Send in blocks:", "cl-newsletter") . "   " . + i18n("Recipients per block:", "cl-newsletter") . " " . $oTxtDispatchCount->render() . " " . + i18n("Delay between blocks:", "cl-newsletter") . " " . $oTxtDispatchDelay->render() . " " . i18n("sec.", "cl-newsletter") . "
" . + $oCkbSaveAsDefault->toHTML(false) . " " . i18n("Save option settings as default", "cl-newsletter")); - $oForm->add(i18n("Author", "cl_newsletter"), $classuser->getUserName($oNewsletter->get("author")) . " (" . $oNewsletter->get("created") . ")"); - $oForm->add(i18n("Last modified by", "cl_newsletter"), $classuser->getUserName($oNewsletter->get("modifiedby")) . " (" . $oNewsletter->get("modified") . ")"); + $oForm->add(i18n("Author", "cl-newsletter"), $classuser->getUserName($oNewsletter->get("author")) . " (" . $oNewsletter->get("created") . ")"); + $oForm->add(i18n("Last modified by", "cl-newsletter"), $classuser->getUserName($oNewsletter->get("modifiedby")) . " (" . $oNewsletter->get("modified") . ")"); $sExecScript = ' '; @@ -79,7 +79,7 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oRGroups->query(); if ($oRGroups->next()) { - $aMessages[] = i18n("Could not set new group name: Group already exists", "cl_newsletter"); + $aMessages[] = i18n("Could not set new group name: Group already exists", "cl-newsletter"); } else { $bReload = true; @@ -172,20 +172,20 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oForm->setVar("idrecipientgroup", $_REQUEST["idrecipientgroup"]); $oForm->setSubmitJS("append_registered_parameters(this);"); - $oForm->addHeader(i18n("Edit group", "cl_newsletter")); + $oForm->addHeader(i18n("Edit group", "cl-newsletter")); $oTxtGroupName = new cHTMLTextbox("groupname", $oRGroup->get("groupname"), 40); - $oForm->add(i18n("Group name", "cl_newsletter"), $oTxtGroupName->render()); + $oForm->add(i18n("Group name", "cl-newsletter"), $oTxtGroupName->render()); $oCkbDefault = new cHTMLCheckbox("defaultgroup", "1"); $oCkbDefault->setChecked($oRGroup->get("defaultgroup")); - $oForm->add(i18n("Default group", "cl_newsletter"), $oCkbDefault->toHTML(false)); + $oForm->add(i18n("Default group", "cl-newsletter"), $oCkbDefault->toHTML(false)); // Member list options folding row - $oMemberListOptionRow = new cFoldingRow("a91f5540-52db-11db-b0de-0800200c9a66", i18n("Member list options", "cl_newsletter")); + $oMemberListOptionRow = new cFoldingRow("a91f5540-52db-11db-b0de-0800200c9a66", i18n("Member list options", "cl-newsletter")); $oSelItemsPerPage = new cHTMLSelectElement("member_elemperpage"); - $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); + $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->setDefault($_REQUEST["member_elemperpage"]); $oSelSortBy = new cHTMLSelectElement("member_sortby"); @@ -201,13 +201,13 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oSelSortBy->setDefault($_REQUEST["member_sortby"]); $oSelSortOrder = new cHTMLSelectElement("member_sortorder"); - $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter"))); + $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->setDefault($_REQUEST["member_sortorder"]); $oTxtFilter = new cHTMLTextbox("member_filter", $_REQUEST["member_filter"], 16); $oSelSearchIn = new cHTMLSelectElement("member_searchin"); - $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--"); + $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oSelSearchIn->addOptionElement("all", $oOption); foreach ($aFields as $sKey => $aData) { @@ -218,28 +218,28 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou } $oSelSearchIn->setDefault($_REQUEST["member_searchin"]); - $oSubmit = new cHTMLButton("submit", i18n("Apply", "cl_newsletter")); + $oSubmit = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $sContent = '
' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); @@ -255,9 +255,9 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oAddedRecipientList->setWidth("100%"); $oAddedRecipientList->setBorder(1); - $oAddedRecipientList->setCell(0, 1, "" . i18n("Name", "cl_newsletter") . ""); + $oAddedRecipientList->setCell(0, 1, "" . i18n("Name", "cl-newsletter") . ""); $oImgDel = new cHTMLImage("images/but_invert_selection.gif"); - $sLnkDelIcon = '' . $oImgDel->render() . ''; + $sLnkDelIcon = '' . $oImgDel->render() . ''; $oAddedRecipientList->setCell(0, 2, $sLnkDelIcon); $oAddedRecipientList->setCellAlignment(0, 2, "right"); @@ -315,10 +315,10 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $iItems = $oInsiders->count(); if ($iItems == 0 && $_REQUEST["member_filter"] == "" && ($_REQUEST["member_elemperpage"] == 0 || $iMembers == 0)) { - $oAddedRecipientList->setCell(1, 1, i18n("No recipients are added to this group yet", "cl_newsletter")); + $oAddedRecipientList->setCell(1, 1, i18n("No recipients are added to this group yet", "cl-newsletter")); $oAddedRecipientList->setCell(1, 2, ' '); } else if ($iItems == 0) { - $oAddedRecipientList->setCell(1, 1, i18n("No recipients found", "cl_newsletter")); + $oAddedRecipientList->setCell(1, 1, i18n("No recipients found", "cl-newsletter")); $oAddedRecipientList->setCell(1, 2, ' '); } else { while ($oRcp = $oInsiders->next()) { @@ -361,9 +361,9 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oPagerLink->setCustom("contenido", $sess->id); $oMemberPager = new cObjectPager("d82a3ff0-52d9-11db-b0de-0800200c9a66", $iMembers, $_REQUEST["member_elemperpage"], $_REQUEST["member_page"], $oPagerLink, "member_page"); - $oMemberPager->setCaption(i18n("Member navigation", "cl_newsletter")); + $oMemberPager->setCaption(i18n("Member navigation", "cl-newsletter")); - $oForm->add(i18n("Recipients in group", "cl_newsletter"), '
' . i18n("Items / page", "cl_newsletter") . '' . i18n("Items / page", "cl-newsletter") . '' . $oSelItemsPerPage->render() . '
' . i18n("Sort by", "cl_newsletter") . '' . i18n("Sort by", "cl-newsletter") . '' . $oSelSortBy->render() . '
' . i18n("Sort order", "cl_newsletter") . '' . i18n("Sort order", "cl-newsletter") . '' . $oSelSortOrder->render() . '
' . i18n("Search for", "cl_newsletter") . '' . i18n("Search for", "cl-newsletter") . '' . $oTxtFilter->render() . '
' . i18n("Search in", "cl_newsletter") . '' . i18n("Search in", "cl-newsletter") . '' . $oSelSearchIn->render() . '
' . + $oForm->add(i18n("Recipients in group", "cl-newsletter"), '
' . $oMemberListOptionRow->render() . $oMemberPager->render() . '
' . $oAddedRecipientList->render() . '
'); @@ -374,10 +374,10 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou // Outsiders // Outsider list options folding row - $oOutsiderListOptionRow = new cFoldingRow("ca633b00-52e9-11db-b0de-0800200c9a66", i18n("Outsider list options", "cl_newsletter")); + $oOutsiderListOptionRow = new cFoldingRow("ca633b00-52e9-11db-b0de-0800200c9a66", i18n("Outsider list options", "cl-newsletter")); $oSelItemsPerPage = new cHTMLSelectElement("outsider_elemperpage"); - $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); + $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->setDefault($_REQUEST["outsider_elemperpage"]); $oSelSortBy = new cHTMLSelectElement("outsider_sortby"); @@ -393,13 +393,13 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oSelSortBy->setDefault($_REQUEST["outsider_sortby"]); $oSelSortOrder = new cHTMLSelectElement("outsider_sortorder"); - $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter"))); + $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->setDefault($_REQUEST["outsider_sortorder"]); $oTxtFilter = new cHTMLTextbox("outsider_filter", $_REQUEST["outsider_filter"], 16); $oSelSearchIn = new cHTMLSelectElement("outsider_searchin"); - $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--"); + $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oSelSearchIn->addOptionElement("all", $oOption); foreach ($aFields as $sKey => $aData) { @@ -410,28 +410,28 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou } $oSelSearchIn->setDefault($_REQUEST["outsider_searchin"]); - $oSubmit = new cHTMLButton("submit", i18n("Apply", "cl_newsletter")); + $oSubmit = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $sContent = '
' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); - $sContent .= ' ' . chr(10); + $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); $sContent .= ' ' . chr(10); @@ -529,12 +529,12 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou $oPagerLink->setCustom("contenido", $sess->id); $oOutsiderPager = new cObjectPager("4d3a7330-52eb-11db-b0de-0800200c9a66", $iOutsiders, $_REQUEST["outsider_elemperpage"], $_REQUEST["outsider_page"], $oPagerLink, "outsider_page"); - $oOutsiderPager->setCaption(i18n("Outsider navigation", "cl_newsletter")); + $oOutsiderPager->setCaption(i18n("Outsider navigation", "cl-newsletter")); - $oForm->add(i18n("Add recipients", "cl_newsletter"), '
' . i18n("Items / page", "cl_newsletter") . '' . i18n("Items / page", "cl-newsletter") . '' . $oSelItemsPerPage->render() . '
' . i18n("Sort by", "cl_newsletter") . '' . i18n("Sort by", "cl-newsletter") . '' . $oSelSortBy->render() . '
' . i18n("Sort order", "cl_newsletter") . '' . i18n("Sort order", "cl-newsletter") . '' . $oSelSortOrder->render() . '
' . i18n("Search for", "cl_newsletter") . '' . i18n("Search for", "cl-newsletter") . '' . $oTxtFilter->render() . '
' . i18n("Search in", "cl_newsletter") . '' . i18n("Search in", "cl-newsletter") . '' . $oSelSearchIn->render() . '
' . + $oForm->add(i18n("Add recipients", "cl-newsletter"), '
' . $oOutsiderListOptionRow->render() . $oOutsiderPager->render() . - '
' . $oSelUser->render() . '
' . i18n("Note: Hold <Ctrl> to
select multiple items.", "cl_newsletter") . '
'); + '' . $oSelUser->render() . '
' . i18n("Note: Hold <Ctrl> to
select multiple items.", "cl-newsletter") . ''); unset($oOutsiders); unset($oOutsiderListOptionRow); unset($oOutsiderPager); diff --git a/includes/include.recipients.group_menu.php b/includes/include.recipients.group_menu.php index 482a0ad..1b92bb0 100644 --- a/includes/include.recipients.group_menu.php +++ b/includes/include.recipients.group_menu.php @@ -49,7 +49,7 @@ $oUser = new cApiUser($auth->auth["uid"]); // sort: Element can be used to be sorted by // search: Element can be used to search in $aFields = array(); -$aFields["name"] = array("field" => "groupname", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search"); +$aFields["name"] = array("field" => "groupname", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); ################################## # Check external input @@ -126,8 +126,8 @@ $iMenu = 0; // Store messages for repeated use (speeds performance, as i18n translation is only needed once) $aMsg = array(); -$aMsg["DelTitle"] = i18n("Delete recipient group", "cl_newsletter"); -$aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter recipient group:
", "cl_newsletter"); +$aMsg["DelTitle"] = i18n("Delete recipient group", "cl-newsletter"); +$aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter recipient group:
", "cl-newsletter"); while ($oRcpGroup = $oRcpGroups->next()) { $iMenu++; diff --git a/includes/include.recipients_edit.php b/includes/include.recipients_edit.php index c88b5a4..c5e972d 100644 --- a/includes/include.recipients_edit.php +++ b/includes/include.recipients_edit.php @@ -44,7 +44,7 @@ if (is_array($cfg['plugins']['recipients'])) { // Note, that the object name has to be $recipient for plugins if ($action == "recipients_create" && $perm->have_perm_area_action($area, $action)) { - $recipient = $oRecipients->create("mail@domain.tld", " " . i18n("-- new recipient --", "cl_newsletter")); + $recipient = $oRecipients->create("mail@domain.tld", " " . i18n("-- new recipient --", "cl-newsletter")); $oPage->setReload(); } elseif ($action == "recipients_delete" && $perm->have_perm_area_action($area, $action)) { $oRecipients->delete($idrecipient); @@ -59,9 +59,9 @@ if ($action == "recipients_create" && $perm->have_perm_area_action($area, $actio $purgedrecipients = $oRecipients->purge($timeframe); /* backslashdollar: There is a problem translating \$ - it is either not recognized or translated correctly (using poEdit) */ if ($purgedrecipients > 0) { - $sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("%1backslashdollard recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl_newsletter")), $purgedrecipients, $timeframe), 0); + $sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("%1backslashdollard recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl-newsletter")), $purgedrecipients, $timeframe), 0); } else { - $sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("There are no recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl_newsletter")), 0, $timeframe), 0); + $sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("There are no recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl-newsletter")), 0, $timeframe), 0); } $recipient = new Recipient; @@ -84,7 +84,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re $recipient->set("name", $name); if (!isValidMail($email)) { - $aMessages[] = i18n("Please specify a valid e-mail address", "cl_newsletter"); + $aMessages[] = i18n("Please specify a valid e-mail address", "cl-newsletter"); } else { $email = strtolower($email); // e-mail always in lower case if ($recipient->get("email") != $email) { @@ -96,7 +96,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re $oRecipients->query(); if ($oRecipients->next()) { - $aMessages[] = i18n("Could not set new e-mail adress: Other recipient with same e-mail address already exists", "cl_newsletter"); + $aMessages[] = i18n("Could not set new e-mail adress: Other recipient with same e-mail address already exists", "cl-newsletter"); } else { $recipient->set("email", $email); } @@ -154,7 +154,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re $oForm->setVar("action", "recipients_save"); $oForm->setVar("idrecipient", $recipient->get("idnewsrcp")); - $oForm->addHeader(i18n("Edit recipient", "cl_newsletter")); + $oForm->addHeader(i18n("Edit recipient", "cl-newsletter")); $oTxtName = new cHTMLTextbox("name", $recipient->get("name"), 40); $oTxtEMail = new cHTMLTextbox("email", $recipient->get("email"), 40); @@ -164,17 +164,17 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re $oCkbDeactivated->setChecked($recipient->get("deactivated")); $oSelNewsType = new cHTMLSelectElement("newstype"); - $oOption = new cHTMLOptionElement(i18n("Text only", "cl_newsletter"), "0"); + $oOption = new cHTMLOptionElement(i18n("Text only", "cl-newsletter"), "0"); $oSelNewsType->addOptionElement(0, $oOption); - $oOption = new cHTMLOptionElement(i18n("HTML and text", "cl_newsletter"), "1"); + $oOption = new cHTMLOptionElement(i18n("HTML and text", "cl-newsletter"), "1"); $oSelNewsType->addOptionElement(1, $oOption); $oSelNewsType->setDefault($recipient->get("news_type")); - $oForm->add(i18n("Name", "cl_newsletter"), $oTxtName->render()); - $oForm->add(i18n("E-Mail", "cl_newsletter"), $oTxtEMail->render()); - $oForm->add(i18n("Confirmed", "cl_newsletter"), $oCkbConfirmed->toHTML(false) . " (" . $recipient->get("confirmeddate") . ")"); - $oForm->add(i18n("Deactivated", "cl_newsletter"), $oCkbDeactivated->toHTML(false)); - $oForm->add(i18n("Message type", "cl_newsletter"), $oSelNewsType->render()); + $oForm->add(i18n("Name", "cl-newsletter"), $oTxtName->render()); + $oForm->add(i18n("E-Mail", "cl-newsletter"), $oTxtEMail->render()); + $oForm->add(i18n("Confirmed", "cl-newsletter"), $oCkbConfirmed->toHTML(false) . " (" . $recipient->get("confirmeddate") . ")"); + $oForm->add(i18n("Deactivated", "cl-newsletter"), $oCkbDeactivated->toHTML(false)); + $oForm->add(i18n("Message type", "cl-newsletter"), $oSelNewsType->render()); $aPluginOrder = trim_array(explode(",", getSystemProperty("plugin", "recipients-pluginorder"))); @@ -192,7 +192,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re } } else { if (is_array($aPluginTitle) || is_array($aPluginDisplay)) { - $oForm->add(i18n("WARNING", "cl_newsletter"), sprintf(i18n("The plugin %s delivered an array for the displayed titles, but did not return an array for the contents.", "cl_newsletter"), $sPlugin)); + $oForm->add(i18n("WARNING", "cl-newsletter"), sprintf(i18n("The plugin %s delivered an array for the displayed titles, but did not return an array for the contents.", "cl-newsletter"), $sPlugin)); } else { $oForm->add($aPluginTitle, $aPluginDisplay); } @@ -212,10 +212,10 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re $oAssocGroups->query(); if ($oAssocGroups->count() == 0) { - $oGroupList->setCell(0, 1, i18n("Recipient is not member of any group", "cl_newsletter")); + $oGroupList->setCell(0, 1, i18n("Recipient is not member of any group", "cl-newsletter")); } else { // Headline - $oGroupList->setCell(0, 1, "" . i18n("Groupname", "cl_newsletter") . ""); + $oGroupList->setCell(0, 1, "" . i18n("Groupname", "cl-newsletter") . ""); $oImgDel = new cHTMLImage("images/delete.gif"); $oGroupList->setCell(0, 2, $oImgDel->render()); $oGroupList->setCellAlignment(0, 2, "right"); @@ -232,10 +232,10 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re } } - $oForm->add(i18n("Associated Groups", "cl_newsletter"), $oGroupList->render()); + $oForm->add(i18n("Associated Groups", "cl-newsletter"), $oGroupList->render()); - $oForm->add(i18n("Author", "cl_newsletter"), $classuser->getUserName($recipient->get("author")) . " (" . $recipient->get("created") . ")"); - $oForm->add(i18n("Last modified by", "cl_newsletter"), $classuser->getUserName($recipient->get("modifiedby")) . " (" . $recipient->get("lastmodified") . ")"); + $oForm->add(i18n("Author", "cl-newsletter"), $classuser->getUserName($recipient->get("author")) . " (" . $recipient->get("created") . ")"); + $oForm->add(i18n("Last modified by", "cl-newsletter"), $classuser->getUserName($recipient->get("modifiedby")) . " (" . $recipient->get("lastmodified") . ")"); $oPage->setContent($sNotis . $oForm->render(true)); } else { diff --git a/includes/include.recipients_import.php b/includes/include.recipients_import.php index ec7b37d..adbcefe 100644 --- a/includes/include.recipients_import.php +++ b/includes/include.recipients_import.php @@ -49,37 +49,37 @@ if ($_REQUEST["selDelimiter"] == "") { $aFields = array(); $aFieldDetails = array(); -$aFields["name"] = strtolower(i18n("Name", "cl_newsletter")); +$aFields["name"] = strtolower(i18n("Name", "cl-newsletter")); $aFieldDetails["name"]["fieldtype"] = "field"; // field, plugin or group $aFieldDetails["name"]["mandatory"] = false; // true or false $aFieldDetails["name"]["type"] = "string"; // string, boolean or date $aFieldDetails["name"]["link"] = false; // plugin name for plugins, recipient group id for groups $aFieldDetails["name"]["col"] = -1; // Stores column index where this field has been found -$aFields["email"] = strtolower(i18n("Mail", "cl_newsletter")); +$aFields["email"] = strtolower(i18n("Mail", "cl-newsletter")); $aFieldDetails["email"]["fieldtype"] = "field"; $aFieldDetails["email"]["mandatory"] = true; $aFieldDetails["email"]["type"] = "string"; $aFieldDetails["email"]["link"] = false; $aFieldDetails["email"]["col"] = -1; -$aFields["deactivated"] = strtolower(i18n("Deactivated", "cl_newsletter")); +$aFields["deactivated"] = strtolower(i18n("Deactivated", "cl-newsletter")); $aFieldDetails["deactivated"]["fieldtype"] = "field"; $aFieldDetails["deactivated"]["mandatory"] = false; $aFieldDetails["deactivated"]["type"] = "boolean"; $aFieldDetails["deactivated"]["link"] = false; $aFieldDetails["deactivated"]["col"] = -1; -$aFields["confirmed"] = strtolower(i18n("Confirmed", "cl_newsletter")); +$aFields["confirmed"] = strtolower(i18n("Confirmed", "cl-newsletter")); $aFieldDetails["confirmed"]["fieldtype"] = "field"; $aFieldDetails["confirmed"]["mandatory"] = false; $aFieldDetails["confirmed"]["type"] = "boolean"; $aFieldDetails["confirmed"]["link"] = false; $aFieldDetails["confirmed"]["col"] = -1; -$aFields["confirmeddate"] = strtolower(i18n("Confirmed Date", "cl_newsletter")); +$aFields["confirmeddate"] = strtolower(i18n("Confirmed Date", "cl-newsletter")); $aFieldDetails["confirmeddate"]["fieldtype"] = "field"; $aFieldDetails["confirmeddate"]["mandatory"] = false; $aFieldDetails["confirmeddate"]["type"] = "date"; $aFieldDetails["confirmeddate"]["link"] = false; $aFieldDetails["confirmeddate"]["col"] = -1; -$aFields["news_type"] = strtolower(i18n("Message type", "cl_newsletter")); +$aFields["news_type"] = strtolower(i18n("Message type", "cl-newsletter")); $aFieldDetails["news_type"]["fieldtype"] = "field"; $aFieldDetails["news_type"]["mandatory"] = false; $aFieldDetails["news_type"]["type"] = "boolean"; @@ -127,7 +127,7 @@ while ($oRcpGroup = $oRcpGroups->next()) { // Only PHP5! //$sGroupName = str_replace(str_split(" \t\n\r\0\x0B;"), "", $oRcpGroup->get("groupname")); - $aFields[$sField] = strtolower(clHtmlEntities(trim(i18n("Group", "cl_newsletter") . "_" . $sGroupName))); + $aFields[$sField] = strtolower(clHtmlEntities(trim(i18n("Group", "cl-newsletter") . "_" . $sGroupName))); $aFieldDetails[$sField]["fieldtype"] = "group"; $aFieldDetails[$sField]["mandatory"] = false; $aFieldDetails[$sField]["type"] = "string"; @@ -171,7 +171,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie foreach ($aParts as $sHeader) { $sKey = array_search(strtolower(clHtmlEntities(trim($sHeader))), $aFields); if ($sKey === false) { - $aMessage[] = sprintf(i18n("Given column header '%s' unknown, column ignored", "cl_newsletter"), $sHeader); + $aMessage[] = sprintf(i18n("Given column header '%s' unknown, column ignored", "cl-newsletter"), $sHeader); } else { $aFieldDetails[$sKey]["col"] = $iCol; $iCol++; @@ -179,7 +179,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie } foreach ($aFieldDetails as $sKey => $aDetails) { if ($aDetails["mandatory"] && $aDetails["col"] == -1) { - $aMessage[] = sprintf(i18n("Mandatory column '%s' wasn't found, import stopped", "cl_newsletter"), $aDetails[$sKey]); + $aMessage[] = sprintf(i18n("Mandatory column '%s' wasn't found, import stopped", "cl-newsletter"), $aDetails[$sKey]); $bStop = true; } } @@ -199,15 +199,15 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie $sName = $sEMail; } if ($sEMail == "") { - $aMessage[] = sprintf(i18n("Item with empty mail address found, item ignored (name: %s, row: %s)", "cl_newsletter"), $sName, $iRow); + $aMessage[] = sprintf(i18n("Item with empty mail address found, item ignored (name: %s, row: %s)", "cl-newsletter"), $sName, $iRow); $aInvalidLines[] = $sLine; $iInvalid++; } else if (!isValidMail($sEMail)) { - $aMessage[] = sprintf(i18n("Mail address '%s' is invalid, item ignored (row: %s)", "cl_newsletter"), $sEMail, $iRow); + $aMessage[] = sprintf(i18n("Mail address '%s' is invalid, item ignored (row: %s)", "cl-newsletter"), $sEMail, $iRow); $aInvalidLines[] = $sLine; $iInvalid++; } else if ($oRecipients->emailExists($sEMail)) { - $aMessage[] = sprintf(i18n("Recipient with mail address '%s' already exists, item skipped (row: %s)", "cl_newsletter"), $sEMail, $iRow); + $aMessage[] = sprintf(i18n("Recipient with mail address '%s' already exists, item skipped (row: %s)", "cl-newsletter"), $sEMail, $iRow); $aInvalidLines[] = $sLine; $iDublettes++; } else { @@ -231,7 +231,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie // html is only treated as "true", to get html messages for recipients // - quick and dirty... - if ($sValue == "yes" || $sValue == i18n("yes", "cl_newsletter") || $sValue == "true" || + if ($sValue == "yes" || $sValue == i18n("yes", "cl-newsletter") || $sValue == "true" || (is_numeric($sValue) && $sValue > 0) || $sValue == "html") { $recipient->set($sKey, 1); @@ -269,7 +269,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie // Add recipient to group $sValue = strtolower(trim($aParts[$aDetails["col"]])); - if ($sValue == "yes" || $sValue == i18n("yes", "cl_newsletter") || + if ($sValue == "yes" || $sValue == i18n("yes", "cl-newsletter") || $sValue == "true" || (is_numeric($sValue) && $sValue > 0)) { $oGroupMembers->create($aDetails["link"], $iID); } @@ -302,7 +302,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie if (count($aMessage) > 0) { $sMessage = $notification->returnNotification("warning", implode("
", $aMessage)) . "
"; } - $sMessage .= $notification->returnNotification("info", sprintf(i18n("%d recipients added, %d recipients skipped (email already exists) and %d invalid recipients/e-mail adresses ignored. Invalid recipients are shown (if any).", "cl_newsletter"), $iAdded, $iDublettes, $iInvalid)); + $sMessage .= $notification->returnNotification("info", sprintf(i18n("%d recipients added, %d recipients skipped (email already exists) and %d invalid recipients/e-mail adresses ignored. Invalid recipients are shown (if any).", "cl-newsletter"), $iAdded, $iDublettes, $iInvalid)); if ($iAdded > 0) { $oPage->setReload(); } @@ -314,30 +314,30 @@ $oForm->setVar("frame", $frame); $oForm->setVar("area", $area); $oForm->setVar("action", "recipients_import_exec"); -$oForm->addHeader(i18n("Import recipients", "cl_newsletter")); +$oForm->addHeader(i18n("Import recipients", "cl-newsletter")); $oSelDelimiter = new cHTMLSelectElement("selDelimiter"); $aItems = array(); -$aItems[] = array("tab", i18n("Tab", "cl_newsletter")); -$aItems[] = array("semicolon", i18n("Semicolon", "cl_newsletter")); +$aItems[] = array("tab", i18n("Tab", "cl-newsletter")); +$aItems[] = array("semicolon", i18n("Semicolon", "cl-newsletter")); $oSelDelimiter->autoFill($aItems); $oSelDelimiter->setDefault($_REQUEST["selDelimiter"]); -$oForm->add(i18n("Delimiter", "cl_newsletter"), $oSelDelimiter->render()); +$oForm->add(i18n("Delimiter", "cl-newsletter"), $oSelDelimiter->render()); $oAreaData = new cHTMLTextarea("txtData", $_REQUEST["txtData"], 80, 20); -$sInfo = '' . i18n("Import information", "cl_newsletter") . '' . +$sInfo = '' . i18n("Import information", "cl-newsletter") . '' . '