Skip to content

Commit

Permalink
Updated templates & l10n for 10.0.10
Browse files Browse the repository at this point in the history
  • Loading branch information
mirekys committed Nov 28, 2018
1 parent 09f9839 commit 204ade1
Show file tree
Hide file tree
Showing 16 changed files with 139 additions and 20 deletions.
34 changes: 34 additions & 0 deletions apps/notifications/templates/mail/htmlmail.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td width="20px">&nbsp;</td>
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
Hello,<br>
<?php if ($_['message'] !== ''): ?>
<?php p($_['message']); ?>
<br><br>
<?php endif; ?>
<?php print_unescaped($l->t('See <a href="%s">%s</a> on %s for more information', [$_['serverUrl'], $_['serverUrl'], $theme->getName()])); ?>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td width="20px">&nbsp;</td>
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
<?php print_unescaped($this->inc('html.mail.footer', ['app' => 'core'])); ?>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
</table>
</td></tr>
</table>
10 changes: 10 additions & 0 deletions apps/notifications/templates/mail/plaintextmail.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
Hello,
<?php if ($_['message'] !== ''): ?>
<?php print_unescaped($_['message']); ?>


<?php endif; ?>
<?php print_unescaped($l->t('See %s on %s for more information', [$_['serverUrl'], $theme->getName()])); ?>


<?php print_unescaped($this->inc('plain.mail.footer', ['app' => 'core'])); ?>
6 changes: 4 additions & 2 deletions core/l10n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
"E-mail address" : "E-mailová adresa",
"Person principal usernames" : "Identifikátory osoby v organizacích",
"IsCesnetEligibleLastSeen timestamp" : "Poslední přihlášení oprávněnou identitou",
"Dear user,<br><br>your ownCloud account at CESNET Data Storage has been succesfully created for you.<br><br>Below are listed details about your account.<br><br>Your username: %s<br>Server address: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/en/navody/owncloud/start\">User manual</a><br><br>If you have any questions or problems, feel free to contact us at support@cesnet.cz.<br><br>" : "Dobrý den,<br><br>Váš ownCloud účet na DÚ CESNET byl úspěšně založen.<br><br>Níže jsou uvedeny informace o Vašem účtu.<br><br>Uživatelské jméno: %s<br>Adresa serveru: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/cs/navody/owncloud/start\">Uživatelský manuál</a><br><br>V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.<br><br>",
"Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n" : "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n",
" and with the <a href=\"https://www.cesnet.cz/sdruzeni/ochrana-osobnich-udaju/\" target=\"_blank\">Privacy policy</a> for the service.": " a s <a href=\"https://www.cesnet.cz/sdruzeni/ochrana-osobnich-udaju/\" target=\"_blank\">podmínkami</a> zpracování osobních údajů.",
"To use ownCloud service it is required to have valid affiliation (employee, student) with one of the membership organization that are fulfilling the Access Policy (AP) for the CESNET Large Infrastructure." : "Pro využívání služby ownCloud je nezbytné být zaměstnancem nebo studentem některé z členských organizací, které zároveň splňují Zásady pro přístup do Velké infrastruktury CESNET (Access Policy, AP)",
"Based of those requirements, our services cannot be used by, e.g. former employees, graduates or library readers. If you have been denied access but you consider yourself to be eligible to use our services, please feel free to contact us at " : "Z těchto důvodů nemohou našich služeb využívat např. bývalí zaměstnanci, absolventi, případně čtenáři knihoven. Domníváte-li se, že byste měli mít k našim službám přístup, ale byl Vám systémem odepřen, kontaktujte nás na adrese ",
"Hello,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>" : "Dobrý den,<br><br>dovolujeme si Vás informovat o tom, že %s Vám právě nasdílel <strong>%s</strong>.<br><a href=\"%s\">Zobrazit soubor</a><br><br>",
"Hello,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n" : "Dobrý den,\n\ndovolujeme si Vás informovat o tom, že %s Vám právě nasdílel %s.\nZobrazit soubor: %s\n\n",
"Dear user,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>" : "Dobrý den,<br><br>dovolujeme si Vás informovat o tom, že %s Vám právě nasdílel <strong>%s</strong>.<br><a href=\"%s\">Zobrazit soubor</a><br><br>",
"Dear user,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n" : "Dobrý den,\n\ndovolujeme si Vás informovat o tom, že %s Vám právě nasdílel %s.\nZobrazit soubor: %s\n\n",
"https://du.cesnet.cz/en/provozni_pravidla/start" : "https://du.cesnet.cz/cs/provozni_pravidla/start"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
}
6 changes: 4 additions & 2 deletions core/l10n/cs_CZ.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@
"E-mail address" : "E-mailová adresa",
"Person principal usernames" : "Identifikátory osoby v organizacích",
"IsCesnetEligibleLastSeen timestamp" : "Poslední přihlášení oprávněnou identitou",
"Dear user,<br><br>your ownCloud account at CESNET Data Storage has been succesfully created for you.<br><br>Below are listed details about your account.<br><br>Your username: %s<br>Server address: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/en/navody/owncloud/start\">User manual</a><br><br>If you have any questions or problems, feel free to contact us at support@cesnet.cz.<br><br>" : "Dobrý den,<br><br>Váš ownCloud účet na DÚ CESNET byl úspěšně založen.<br><br>Níže jsou uvedeny informace o Vašem účtu.<br><br>Uživatelské jméno: %s<br>Adresa serveru: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/cs/navody/owncloud/start\">Uživatelský manuál</a><br><br>V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.<br><br>",
"Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n" : "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n",
" and with the <a href=\"https://www.cesnet.cz/sdruzeni/ochrana-osobnich-udaju/\" target=\"_blank\">Privacy policy</a> for the service.": " a s <a href=\"https://www.cesnet.cz/sdruzeni/ochrana-osobnich-udaju/\" target=\"_blank\">podmínkami</a> zpracování osobních údajů.",
"To use ownCloud service it is required to have valid affiliation (employee, student) with one of the membership organization that are fulfilling the Access Policy (AP) for the CESNET Large Infrastructure." : "Pro využívání služby ownCloud je nezbytné být zaměstnancem nebo studentem některé z členských organizací, které zároveň splňují Zásady pro přístup do Velké infrastruktury CESNET (Access Policy, AP)",
"Based of those requirements, our services cannot be used by, e.g. former employees, graduates or library readers. If you have been denied access but you consider yourself to be eligible to use our services, please feel free to contact us at " : "Z těchto důvodů nemohou našich služeb využívat např. bývalí zaměstnanci, absolventi, případně čtenáři knihoven. Domníváte-li se, že byste měli mít k našim službám přístup, ale byl Vám systémem odepřen, kontaktujte nás na adrese ",
"Hello,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>" : "Dobrý den,<br><br>dovolujeme si Vás informovat o tom, že %s Vám právě nasdílel <strong>%s</strong>.<br><a href=\"%s\">Zobrazit soubor</a><br><br>",
"Hello,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n" : "Dobrý den,\n\ndovolujeme si Vás informovat o tom, že %s Vám právě nasdílel %s.\nZobrazit soubor: %s\n\n",
"Dear user,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>" : "Dobrý den,<br><br>dovolujeme si Vás informovat o tom, že %s Vám právě nasdílel <strong>%s</strong>.<br><a href=\"%s\">Zobrazit soubor</a><br><br>",
"Dear user,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n" : "Dobrý den,\n\ndovolujeme si Vás informovat o tom, že %s Vám právě nasdílel %s.\nZobrazit soubor: %s\n\n",
"https://du.cesnet.cz/en/provozni_pravidla/start" : "https://du.cesnet.cz/cs/provozni_pravidla/start"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
}
2 changes: 1 addition & 1 deletion core/templates/altmail.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
print_unescaped($l->t("Hello,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
print_unescaped($l->t("Dear user,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
if ( isset($_['expiration']) ) {
print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
print_unescaped("\n\n");
Expand Down
18 changes: 18 additions & 0 deletions core/templates/altmail.php.bak
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?php
print_unescaped($l->t("Hello,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
if ( isset($_['expiration']) ) {
print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
print_unescaped("\n\n");
}
if (isset($_['personal_note'])) {
// TRANSLATORS personal note in share notification email
print_unescaped($l->t("Personal note from the sender: %s.", [$_['personal_note']]));
print_unescaped("\n\n");
}
// TRANSLATORS term at the end of a mail
p($l->t("Your CESNET Storage Department Team"));
?>

--
<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
<?php print_unescaped("\n".$theme->getBaseUrl());
2 changes: 1 addition & 1 deletion core/templates/internalaltmail.php
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?php
print_unescaped($l->t("Hello,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
print_unescaped($l->t("Dear user,\n\nwe inform you that %s shared %s with you.\nView file here: %s\n\n", array($_['user_displayname'], $_['filename'], $_['link'])));
if ( isset($_['expiration']) ) {
print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
print_unescaped("\n\n");
Expand Down
2 changes: 1 addition & 1 deletion core/templates/internalmail.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<td width="20px">&nbsp;</td>
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
<?php
print_unescaped($l->t("Hello,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>", array($_['user_displayname'], $_['filename'], $_['link'])));
print_unescaped($l->t("Dear user,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>", array($_['user_displayname'], $_['filename'], $_['link'])));
if ( isset($_['expiration']) ) {
p($l->t("The share will expire on %s.", [$_['expiration']]));
print_unescaped('<br><br>');
Expand Down
53 changes: 53 additions & 0 deletions core/templates/lostpassword/email.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<table cellspacing="0" cellpadding="0" border="0" width="100%">
<tr><td>
<table cellspacing="0" cellpadding="0" border="0" width="600px">
<tr>
<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td width="20px">&nbsp;</td>
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
<?php
/**
* @author Christopher Schäpers <kondou@ts.unde.re>
*
* @copyright Copyright (c) 2018, ownCloud GmbH
* @license AGPL-3.0
*
* This code is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License, version 3,
* as published by the Free Software Foundation.
*
* This program 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 Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License, version 3,
* along with this program. If not, see <http://www.gnu.org/licenses/>
*
*/
print_unescaped(\str_replace('{link}', "<a href=\"{$_['link']}\">{$_['link']}</a>", $l->t('Please use the following link to reset your password: {link}')));
print_unescaped("<br><br>");
// TRANSLATORS term at the end of a mail
p($l->t("Cheers!"));
?>
</td>
</tr>
<tr><td colspan="2">&nbsp;</td></tr>
<tr>
<td width="20px">&nbsp;</td>
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
<?php print_unescaped($this->inc('html.mail.footer')); ?>
</td>
</tr>
<tr>
<td colspan="2">&nbsp;</td>
</tr>
</table>
</td></tr>
</table>
2 changes: 1 addition & 1 deletion core/templates/mail.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<td width="20px">&nbsp;</td>
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
<?php
print_unescaped($l->t("Hello,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>", array($_['user_displayname'], $_['filename'], $_['link'])));
print_unescaped($l->t("Dear user,<br><br>we inform you that %s shared <strong>%s</strong> with you.<br><a href=\"%s\">View file</a><br><br>", array($_['user_displayname'], $_['filename'], $_['link'])));
if ( isset($_['expiration']) ) {
p($l->t("The share will expire on %s.", [$_['expiration']]));
print_unescaped('<br><br>');
Expand Down
4 changes: 2 additions & 2 deletions settings/l10n/cs.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"Your CESNET Storage Department Team" : "Váš tým Datových uložišť CESNET",
"Your %s account was created" : "Váš %s účet byl vytvořen",
"Sign In to ownCloud" : "Přihlásit se do ownCloudu",
"Hello,<br><br>your ownCloud account at Data Storage CESNET has been succesfully created for you.<br><br>Below are listed details about your account.<br><br>Your username: %s<br>Server address: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/en/navody/owncloud/start\">User manual</a><br><br>If you have any questions or problems, feel free to contact us at support@cesnet.cz.<br><br>" : "Dobrý den,<br><br>Váš ownCloud účet na DÚ CESNET byl úspěšně založen.<br><br>Níže jsou uvedeny informace o Vašem účtu.<br><br>Uživatelské jméno: %s<br>Adresa serveru: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/cs/navody/owncloud/start\">Uživatelský manuál</a><br><br>V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.<br><br>",
"Hello,\n\nyour ownCloud account at Data Storage CESNET has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n" : "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n"
"Dear user,<br><br>your ownCloud account at CESNET Data Storage has been succesfully created for you.<br><br>Below are listed details about your account.<br><br>Your username: %s<br>Server address: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/en/navody/owncloud/start\">User manual</a><br><br>If you have any questions or problems, feel free to contact us at support@cesnet.cz.<br><br>" : "Dobrý den,<br><br>Váš ownCloud účet na DÚ CESNET byl úspěšně založen.<br><br>Níže jsou uvedeny informace o Vašem účtu.<br><br>Uživatelské jméno: %s<br>Adresa serveru: <a href=\"%s\">%s</a><br><a href=\"https://du.cesnet.cz/cs/navody/owncloud/start\">Uživatelský manuál</a><br><br>V případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.<br><br>",
"Dear user,\n\nyour ownCloud account at CESNET Data Storage has been succesfully created for you.\n\nBelow are listed details about your account.\n\nYour username: %s\nServer address: %s\nUser manual: https://du.cesnet.cz/en/navody/owncloud/start\n\nIf you have any questions or problems, feel free to contact us at support@cesnet.cz.\n\n" : "Dobrý den,\n\nVáš ownCloud účet na DÚ CESNET byl úspěšně založen.\n\nNíže jsou uvedeny informace o Vašem účtu.\n\nUživatelské jméno: %s\nAdresa serveru: %s\nUživatelský manuál: https://du.cesnet.cz/en/navody/owncloud/start\n\nV případě jakýchkoliv dotazů či potíží nás kontaktujte na support@cesnet.cz.\n\n"
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
}
Loading

0 comments on commit 204ade1

Please sign in to comment.