diff options
| author | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-07-24 00:36:40 -0700 |
|---|---|---|
| committer | Jan-Christoph Borchardt <hey@jancborchardt.net> | 2013-07-24 00:36:40 -0700 |
| commit | 54263624ea9ca6e6211c2aa72ba7dd2015189476 (patch) | |
| tree | 66e80e3fad82a91dd402582e08f0a97775a93502 /core | |
| parent | 7bb6aab8eea731840d67d5e3aa302c04a593a4e0 (diff) | |
| parent | 1a73e607bdba6d654936bde632acaa4960dec729 (diff) | |
| download | nextcloud-server-54263624ea9ca6e6211c2aa72ba7dd2015189476.tar.gz nextcloud-server-54263624ea9ca6e6211c2aa72ba7dd2015189476.zip | |
Merge pull request #4030 from owncloud/more-themable-strings
More themable strings
Diffstat (limited to 'core')
| -rw-r--r-- | core/templates/installation.php | 7 | ||||
| -rw-r--r-- | core/templates/layout.base.php | 2 | ||||
| -rw-r--r-- | core/templates/layout.guest.php | 6 | ||||
| -rw-r--r-- | core/templates/layout.user.php | 6 | ||||
| -rw-r--r-- | core/templates/mail.php | 2 |
5 files changed, 13 insertions, 10 deletions
diff --git a/core/templates/installation.php b/core/templates/installation.php index 7f2796a4b31..a87853cbef3 100644 --- a/core/templates/installation.php +++ b/core/templates/installation.php @@ -23,7 +23,7 @@ <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <p><?php p($l->t('Your PHP version is vulnerable to the NULL Byte attack (CVE-2006-7243)'));?><br/> - <?php p($l->t('Please update your PHP installation to use ownCloud securely.'));?></p> + <?php p($l->t('Please update your PHP installation to use %s securely.', $defaults->getName() )); ?></p> </fieldset> <?php endif; ?> <?php if(!$_['secureRNG']): ?> @@ -37,7 +37,10 @@ <fieldset class="warning"> <legend><strong><?php p($l->t('Security Warning'));?></strong></legend> <p><?php p($l->t('Your data directory and files are probably accessible from the internet because the .htaccess file does not work.'));?><br> - <?php print_unescaped($l->t('For information how to properly configure your server, please see the <a href="http://doc.owncloud.org/server/5.0/admin_manual/installation.html" target="_blank">documentation</a>.'));?></p> + <?php print_unescaped($l->t( + 'For information how to properly configure your server, please see the <a href="%s" target="_blank">documentation</a>.', + $defaults->getDocBaseUrl().'/server/5.0/admin_manual/installation.html' + )); ?></p> </fieldset> <?php endif; ?> <fieldset id="adminaccount"> diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php index 09e1006d507..2399512eacd 100644 --- a/core/templates/layout.base.php +++ b/core/templates/layout.base.php @@ -10,7 +10,7 @@ <head> <title> - <?php p($defaults->getName()); ?> + <?php p($defaults->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <link rel="shortcut icon" href="<?php print_unescaped(image_path('', 'favicon.png')); ?>" /> diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php index 329744e3824..e20d28970a5 100644 --- a/core/templates/layout.guest.php +++ b/core/templates/layout.guest.php @@ -10,7 +10,7 @@ <head data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> - <?php p($defaults->getName()); ?> + <?php p($defaults->getTitle()); ?> </title> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta name="apple-itunes-app" content="app-id=543672169"> @@ -22,7 +22,7 @@ <?php foreach($_['jsfiles'] as $jsfile): ?> <script type="text/javascript" src="<?php print_unescaped($jsfile); ?>"></script> <?php endforeach; ?> - + <?php foreach($_['headers'] as $header): ?> <?php print_unescaped('<'.$header['tag'].' '); @@ -37,7 +37,7 @@ <body id="body-login"> <div id="login"> <header><div id="header"> - <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" /> + <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($defaults->getName()); ?>" /> <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> </div></header> <?php print_unescaped($_['content']); ?> diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php index dacbe79bd34..87c02a83d3b 100644 --- a/core/templates/layout.user.php +++ b/core/templates/layout.user.php @@ -7,11 +7,11 @@ <!--[if !IE]><!--><html class="ng-csp"><!--<![endif]--> <?php $defaults = new OC_Defaults(); // initialize themable default strings and urls ?> - + <head data-user="<?php p($_['user_uid']); ?>" data-requesttoken="<?php p($_['requesttoken']); ?>"> <title> <?php p(!empty($_['application'])?$_['application'].' | ':''); - p($defaults->getName()); + p($defaults->getTitle()); p(trim($_['user_displayname']) != '' ?' ('.$_['user_displayname'].') ':'') ?> </title> <meta charset="utf-8"> @@ -45,7 +45,7 @@ </div> <header><div id="header"> <a href="<?php print_unescaped(link_to('', 'index.php')); ?>" title="" id="owncloud"><img class="svg" - src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="ownCloud" /></a> + src="<?php print_unescaped(image_path('', 'logo-wide.svg')); ?>" alt="<?php p($defaults->getName()); ?>" /></a> <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div> <ul id="settings" class="svg"> <span id="expand" tabindex="0" role="link"> diff --git a/core/templates/mail.php b/core/templates/mail.php index 562ad82e953..a9fdff06067 100644 --- a/core/templates/mail.php +++ b/core/templates/mail.php @@ -5,7 +5,7 @@ <tr> <td bgcolor="#1d2d44" width="20px"> </td> <td bgcolor="#1d2d44"> -<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="ownCloud"/> +<img src="<?php print_unescaped(OC_Helper::makeURLAbsolute(image_path('', 'logo-mail.gif'))); ?>" alt="<?php p($defaults->getName()); ?>"/> </td> </tr> <tr><td bgcolor="#f8f8f8" colspan="2"> </td></tr> |