Skip to content

Commit 204ade1

Browse files
mirekysmirekys
committed
Updated templates & l10n for 10.0.10
1 parent 09f9839 commit 204ade1

File tree

16 files changed

+139
-20
lines changed

16 files changed

+139
-20
lines changed

‎apps/notifications/templates/mail/htmlmail.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
<table cellspacing="0" cellpadding="0" border="0" width="100%">
2+
<tr><td>
3+
<table cellspacing="0" cellpadding="0" border="0" width="600px">
4+
<tr>
5+
<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
6+
<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
7+
<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
8+
</td>
9+
</tr>
10+
<tr><td colspan="2">&nbsp;</td></tr>
11+
<tr>
12+
<td width="20px">&nbsp;</td>
13+
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
14+
Hello,<br>
15+
<?php if ($_['message'] !== ''): ?>
16+
<?php p($_['message']); ?>
17+
<br><br>
18+
<?php endif; ?>
19+
<?php print_unescaped($l->t('See <a href="%s">%s</a> on %s for more information', [$_['serverUrl'], $_['serverUrl'], $theme->getName()])); ?>
20+
</td>
21+
</tr>
22+
<tr><td colspan="2">&nbsp;</td></tr>
23+
<tr>
24+
<td width="20px">&nbsp;</td>
25+
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
26+
<?php print_unescaped($this->inc('html.mail.footer', ['app' => 'core'])); ?>
27+
</td>
28+
</tr>
29+
<tr>
30+
<td colspan="2">&nbsp;</td>
31+
</tr>
32+
</table>
33+
</td></tr>
34+
</table>

‎apps/notifications/templates/mail/plaintextmail.php‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
Hello,
2+
<?php if ($_['message'] !== ''): ?>
3+
<?php print_unescaped($_['message']); ?>
4+
5+
6+
<?php endif; ?>
7+
<?php print_unescaped($l->t('See %s on %s for more information', [$_['serverUrl'], $theme->getName()])); ?>
8+
9+
10+
<?php print_unescaped($this->inc('plain.mail.footer', ['app' => 'core'])); ?>

‎core/l10n/cs.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
"E-mail address" : "E-mailová adresa",
3232
"Person principal usernames" : "Identifikátory osoby v organizacích",
3333
"IsCesnetEligibleLastSeen timestamp" : "Poslední přihlášení oprávněnou identitou",
34+
"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>",
35+
"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",
3436
" 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ů.",
3537
"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)",
3638
"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 ",
37-
"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>",
38-
"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",
39+
"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>",
40+
"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",
3941
"https://du.cesnet.cz/en/provozni_pravidla/start" : "https://du.cesnet.cz/cs/provozni_pravidla/start"
4042
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
4143
}

‎core/l10n/cs_CZ.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@
3131
"E-mail address" : "E-mailová adresa",
3232
"Person principal usernames" : "Identifikátory osoby v organizacích",
3333
"IsCesnetEligibleLastSeen timestamp" : "Poslední přihlášení oprávněnou identitou",
34+
"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>",
35+
"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",
3436
" 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ů.",
3537
"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)",
3638
"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 ",
37-
"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>",
38-
"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",
39+
"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>",
40+
"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",
3941
"https://du.cesnet.cz/en/provozni_pravidla/start" : "https://du.cesnet.cz/cs/provozni_pravidla/start"
4042
},"pluralForm" :"nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;"
4143
}

‎core/templates/altmail.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
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'])));
2+
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'])));
33
if ( isset($_['expiration']) ) {
44
print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
55
print_unescaped("\n\n");

‎core/templates/altmail.php.bak‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?php
2+
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'])));
3+
if ( isset($_['expiration']) ) {
4+
print_unescaped($l->t("The share will expire on %s.", array($_['expiration'])));
5+
print_unescaped("\n\n");
6+
}
7+
if (isset($_['personal_note'])) {
8+
// TRANSLATORS personal note in share notification email
9+
print_unescaped($l->t("Personal note from the sender: %s.", [$_['personal_note']]));
10+
print_unescaped("\n\n");
11+
}
12+
// TRANSLATORS term at the end of a mail
13+
p($l->t("Your CESNET Storage Department Team"));
14+
?>
15+
16+
--
17+
<?php p($theme->getName() . ' - ' . $theme->getSlogan()); ?>
18+
<?php print_unescaped("\n".$theme->getBaseUrl());

‎core/templates/internalaltmail.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?php
2-
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'])));
2+
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'])));
33
if ( isset($_['expiration']) ) {
44
print_unescaped($l->t("The share will expire on %s.", [$_['expiration']]));
55
print_unescaped("\n\n");

‎core/templates/internalmail.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<td width="20px">&nbsp;</td>
1313
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
1414
<?php
15-
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'])));
15+
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'])));
1616
if ( isset($_['expiration']) ) {
1717
p($l->t("The share will expire on %s.", [$_['expiration']]));
1818
print_unescaped('<br><br>');

‎core/templates/lostpassword/email.php‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
<table cellspacing="0" cellpadding="0" border="0" width="100%">
2+
<tr><td>
3+
<table cellspacing="0" cellpadding="0" border="0" width="600px">
4+
<tr>
5+
<td bgcolor="<?php p($theme->getMailHeaderColor());?>" width="20px">&nbsp;</td>
6+
<td bgcolor="<?php p($theme->getMailHeaderColor());?>">
7+
<img src="<?php p(\OC::$server->getURLGenerator()->getAbsoluteURL(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($theme->getName()); ?>"/>
8+
</td>
9+
</tr>
10+
<tr><td colspan="2">&nbsp;</td></tr>
11+
<tr>
12+
<td width="20px">&nbsp;</td>
13+
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
14+
<?php
15+
/**
16+
* @author Christopher Schäpers <kondou@ts.unde.re>
17+
*
18+
* @copyright Copyright (c) 2018, ownCloud GmbH
19+
* @license AGPL-3.0
20+
*
21+
* This code is free software: you can redistribute it and/or modify
22+
* it under the terms of the GNU Affero General Public License, version 3,
23+
* as published by the Free Software Foundation.
24+
*
25+
* This program is distributed in the hope that it will be useful,
26+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
27+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
28+
* GNU Affero General Public License for more details.
29+
*
30+
* You should have received a copy of the GNU Affero General Public License, version 3,
31+
* along with this program. If not, see <http://www.gnu.org/licenses/>
32+
*
33+
*/
34+
print_unescaped(\str_replace('{link}', "<a href=\"{$_['link']}\">{$_['link']}</a>", $l->t('Please use the following link to reset your password: {link}')));
35+
print_unescaped("<br><br>");
36+
// TRANSLATORS term at the end of a mail
37+
p($l->t("Cheers!"));
38+
?>
39+
</td>
40+
</tr>
41+
<tr><td colspan="2">&nbsp;</td></tr>
42+
<tr>
43+
<td width="20px">&nbsp;</td>
44+
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
45+
<?php print_unescaped($this->inc('html.mail.footer')); ?>
46+
</td>
47+
</tr>
48+
<tr>
49+
<td colspan="2">&nbsp;</td>
50+
</tr>
51+
</table>
52+
</td></tr>
53+
</table>

‎core/templates/mail.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<td width="20px">&nbsp;</td>
1313
<td style="font-weight:normal; font-size:0.8em; line-height:1.2em; font-family:verdana,'arial',sans;">
1414
<?php
15-
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'])));
15+
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'])));
1616
if ( isset($_['expiration']) ) {
1717
p($l->t("The share will expire on %s.", [$_['expiration']]));
1818
print_unescaped('<br><br>');

0 commit comments

Comments
 (0)