diff options
| -rw-r--r-- | apps/files/appinfo/app.php | 2 | ||||
| -rw-r--r-- | apps/user_ldap/lib/user/user.php | 12 | ||||
| -rw-r--r-- | apps/user_ldap/templates/part.settingcontrols.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/templates/part.wizardcontrols.php | 4 | ||||
| -rw-r--r-- | apps/user_ldap/templates/settings.php | 2 | ||||
| -rw-r--r-- | core/l10n/sq.js | 4 | ||||
| -rw-r--r-- | core/l10n/sq.json | 4 | ||||
| -rw-r--r-- | core/templates/login.php | 2 | ||||
| -rw-r--r-- | core/templates/lostpassword/resetpassword.php | 2 | ||||
| -rw-r--r-- | lib/l10n/tr.js | 1 | ||||
| -rw-r--r-- | lib/l10n/tr.json | 1 | ||||
| -rw-r--r-- | settings/l10n/tr.js | 1 | ||||
| -rw-r--r-- | settings/l10n/tr.json | 1 | ||||
| -rw-r--r-- | settings/templates/personal.php | 6 |
14 files changed, 30 insertions, 16 deletions
diff --git a/apps/files/appinfo/app.php b/apps/files/appinfo/app.php index 94360786ac3..174531bdfcc 100644 --- a/apps/files/appinfo/app.php +++ b/apps/files/appinfo/app.php @@ -34,7 +34,7 @@ 'id' => 'files_index', 'order' => 0, 'href' => $urlGenerator->linkToRoute('files.view.index'), - 'icon' => \OCP\Util::imagePath('core', 'places/files.svg'), + 'icon' => $urlGenerator->imagePath('core', 'places/files.svg'), 'name' => $l->t('Files'), ]; }); diff --git a/apps/user_ldap/lib/user/user.php b/apps/user_ldap/lib/user/user.php index 9bf505c5c22..23aba0e0d85 100644 --- a/apps/user_ldap/lib/user/user.php +++ b/apps/user_ldap/lib/user/user.php @@ -24,12 +24,12 @@ namespace OCA\user_ldap\lib\user; -use OCA\user_ldap\lib\user\IUserTools; use OCA\user_ldap\lib\Connection; use OCA\user_ldap\lib\FilesystemHelper; use OCA\user_ldap\lib\LogWrapper; use OCP\IAvatarManager; use OCP\IConfig; +use OCP\Image; use OCP\IUserManager; /** @@ -55,7 +55,7 @@ class User { */ protected $fs; /** - * @var \OCP\Image + * @var Image */ protected $image; /** @@ -101,13 +101,13 @@ class User { * LDAP interaction * @param IConfig $config * @param FilesystemHelper $fs - * @param \OCP\Image $image any empty instance + * @param Image $image any empty instance * @param LogWrapper $log * @param IAvatarManager $avatarManager * @param IUserManager $userManager */ public function __construct($username, $dn, IUserTools $access, - IConfig $config, FilesystemHelper $fs, \OCP\Image $image, + IConfig $config, FilesystemHelper $fs, Image $image, LogWrapper $log, IAvatarManager $avatarManager, IUserManager $userManager) { $this->access = $access; @@ -432,7 +432,9 @@ class User { } if(!is_null($email)) { $user = $this->userManager->get($this->uid); - $user->setEMailAddress($email); + if (!is_null($user)) { + $user->setEMailAddress($email); + } } } diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php index fb5deb1897d..4dc57eae6d2 100644 --- a/apps/user_ldap/templates/part.settingcontrols.php +++ b/apps/user_ldap/templates/part.settingcontrols.php @@ -2,9 +2,9 @@ <button type="button" class="ldap_action_test_connection" name="ldap_action_test_connection"> <?php p($l->t('Test Configuration'));?> </button> - <a href="<?php p(\OC::$server->getURLGenerator()->linkToDocs('admin-ldap')); ?>" + <a href="<?php p(link_to_docs('admin-ldap')); ?>" target="_blank" rel="noreferrer"> - <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" + <img src="<?php print_unescaped(image_path('', 'actions/info.png')); ?>" style="height:1.75ex" /> <?php p($l->t('Help'));?> </a> diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php index 19d6de94ebe..4760aa0d8ef 100644 --- a/apps/user_ldap/templates/part.wizardcontrols.php +++ b/apps/user_ldap/templates/part.wizardcontrols.php @@ -8,9 +8,9 @@ <button class="ldap_action_continue" name="ldap_action_continue" type="button"> <?php p($l->t('Continue'));?> </button> - <a href="<?php p(\OC::$server->getURLGenerator()->linkToDocs('admin-ldap')); ?>" + <a href="<?php p(link_to_docs('admin-ldap')); ?>" target="_blank" rel="noreferrer"> - <img src="<?php print_unescaped(OCP\Util::imagePath('', 'actions/info.png')); ?>" + <img src="<?php print_unescaped(image_path('', 'actions/info.png')); ?>" style="height:1.75ex" /> <span class="ldap_grey"><?php p($l->t('Help'));?></span> </a> diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 23e6d5591a9..bae16691ba0 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -120,5 +120,5 @@ style('user_ldap', 'settings'); </fieldset> </div> <!-- Spinner Template --> - <img class="ldapSpinner hidden" src="<?php p(\OCP\Util::imagePath('core', 'loading.gif')); ?>"> + <img class="ldapSpinner hidden" src="<?php p(image_path('core', 'loading.gif')); ?>"> </form> diff --git a/core/l10n/sq.js b/core/l10n/sq.js index fa97053bf61..3c6bed4f276 100644 --- a/core/l10n/sq.js +++ b/core/l10n/sq.js @@ -3,6 +3,8 @@ OC.L10N.register( { "Couldn't send mail to following users: %s " : "S’u dërgua dot e-mail përdoruesve vijues: %s ", "Preparing update" : "Po përgatitet përditësimi", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Po kontrollohet tabela %s", "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua", "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua", "Maintenance mode is kept active" : "Mënyra mirëmbajtje është mbajtur e aktivizuar", @@ -202,6 +204,7 @@ OC.L10N.register( "Hello {name}" : "Tungjatjeta {name}", "_download %n file_::_download %n files_" : ["shkarko %n kartelë","shkarko %n kartela"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Përmirësimi po kryhet, braktisja e kësaj faqeje mund ta ndërpresë procesin në disa mjedise.", + "Updating to {version}" : "Po përditësohet me {version}", "An error occurred." : "Ndodhi një gabim.", "Please reload the page." : "Ju lutemi, ringarkoni faqen.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Përditësimi qe i pasuksesshëm. Për më tepër të dhëna <a href=\"{url}\">shihni postimin te forumi ynë</a> lidhur me këtë çështje.", @@ -300,6 +303,7 @@ OC.L10N.register( "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutemi, para se të vazhdoni më tej, sigurohuni që baza e të dhënave, dosja e formësimeve dhe dosja e të dhënave janë kopjeruajtur.", "Start update" : "Fillo përditësimin", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Për të shmangur çaste bllokimi pune me instalime të mëdha, mundeni të ekzekutoni urdhrin vijues që nga drejtoria juaj e instalimit:", + "Detailed logs" : "Regjistrime të hollësishme", "This %s instance is currently in maintenance mode, which may take a while." : "Kjo instancë %s hëpërhë gjendet nën mënyrën mirëmbajtje, çka mund të zgjasë ca.", "This page will refresh itself when the %s instance is available again." : "Kjo faqe do të rifreskohet vetiu, sapo instanca %s të jetë sërish gati." }, diff --git a/core/l10n/sq.json b/core/l10n/sq.json index 0f299bc1480..44be6240eb9 100644 --- a/core/l10n/sq.json +++ b/core/l10n/sq.json @@ -1,6 +1,8 @@ { "translations": { "Couldn't send mail to following users: %s " : "S’u dërgua dot e-mail përdoruesve vijues: %s ", "Preparing update" : "Po përgatitet përditësimi", + "[%d / %d]: %s" : "[%d / %d]: %s", + "[%d / %d]: Checking table %s" : "[%d / %d]: Po kontrollohet tabela %s", "Turned on maintenance mode" : "Mënyra e mirëmbajtjes u aktivizua", "Turned off maintenance mode" : "Mënyra e mirëmbajtjes u çaktivizua", "Maintenance mode is kept active" : "Mënyra mirëmbajtje është mbajtur e aktivizuar", @@ -200,6 +202,7 @@ "Hello {name}" : "Tungjatjeta {name}", "_download %n file_::_download %n files_" : ["shkarko %n kartelë","shkarko %n kartela"], "The upgrade is in progress, leaving this page might interrupt the process in some environments." : "Përmirësimi po kryhet, braktisja e kësaj faqeje mund ta ndërpresë procesin në disa mjedise.", + "Updating to {version}" : "Po përditësohet me {version}", "An error occurred." : "Ndodhi një gabim.", "Please reload the page." : "Ju lutemi, ringarkoni faqen.", "The update was unsuccessful. For more information <a href=\"{url}\">check our forum post</a> covering this issue." : "Përditësimi qe i pasuksesshëm. Për më tepër të dhëna <a href=\"{url}\">shihni postimin te forumi ynë</a> lidhur me këtë çështje.", @@ -298,6 +301,7 @@ "Please make sure that the database, the config folder and the data folder have been backed up before proceeding." : "Ju lutemi, para se të vazhdoni më tej, sigurohuni që baza e të dhënave, dosja e formësimeve dhe dosja e të dhënave janë kopjeruajtur.", "Start update" : "Fillo përditësimin", "To avoid timeouts with larger installations, you can instead run the following command from your installation directory:" : "Për të shmangur çaste bllokimi pune me instalime të mëdha, mundeni të ekzekutoni urdhrin vijues që nga drejtoria juaj e instalimit:", + "Detailed logs" : "Regjistrime të hollësishme", "This %s instance is currently in maintenance mode, which may take a while." : "Kjo instancë %s hëpërhë gjendet nën mënyrën mirëmbajtje, çka mund të zgjasë ca.", "This page will refresh itself when the %s instance is available again." : "Kjo faqe do të rifreskohet vetiu, sapo instanca %s të jetë sërish gati." },"pluralForm" :"nplurals=2; plural=(n != 1);" diff --git a/core/templates/login.php b/core/templates/login.php index ef89d227d24..9934d4988d9 100644 --- a/core/templates/login.php +++ b/core/templates/login.php @@ -33,7 +33,7 @@ script('core', [ <?php endif; ?> <div id="message" class="hidden"> <img class="float-spinner" alt="" - src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"> + src="<?php p(image_path('core', 'loading-dark.gif'));?>"> <span id="messageText"></span> <!-- the following div ensures that the spinner is always inside the #message div --> <div style="clear: both;"></div> diff --git a/core/templates/lostpassword/resetpassword.php b/core/templates/lostpassword/resetpassword.php index 49ced424648..02e82fe6947 100644 --- a/core/templates/lostpassword/resetpassword.php +++ b/core/templates/lostpassword/resetpassword.php @@ -34,7 +34,7 @@ script('core', 'lostpassword'); </p> <input type="submit" id="submit" value="<?php p($l->t('Reset password')); ?>" /> <p class="text-center"> - <img class="hidden" id="float-spinner" src="<?php p(\OCP\Util::imagePath('core', 'loading-dark.gif'));?>"/> + <img class="hidden" id="float-spinner" src="<?php p(image_path('core', 'loading-dark.gif'));?>"/> </p> </fieldset> </form> diff --git a/lib/l10n/tr.js b/lib/l10n/tr.js index 0751030e107..a829153eeef 100644 --- a/lib/l10n/tr.js +++ b/lib/l10n/tr.js @@ -60,6 +60,7 @@ OC.L10N.register( "Archives of type %s are not supported" : "%s arşiv türü desteklenmiyor", "Failed to open archive when installing app" : "Uygulama kurulurken arşiv dosyası açılamadı", "App does not provide an info.xml file" : "Uygulama info.xml dosyası sağlamıyor", + "App cannot be installed because appinfo file cannot be read." : "uygulama yüklenemiyor çünkü appinfo dosyası okunamıyor.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "İmza denetlenemedi. Lütfen uygulama yöneticisi ile iletişime geçin ve yönetici ekranınıza bakın.", "App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor", "App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor", diff --git a/lib/l10n/tr.json b/lib/l10n/tr.json index 09e0010836d..a5340ed3008 100644 --- a/lib/l10n/tr.json +++ b/lib/l10n/tr.json @@ -58,6 +58,7 @@ "Archives of type %s are not supported" : "%s arşiv türü desteklenmiyor", "Failed to open archive when installing app" : "Uygulama kurulurken arşiv dosyası açılamadı", "App does not provide an info.xml file" : "Uygulama info.xml dosyası sağlamıyor", + "App cannot be installed because appinfo file cannot be read." : "uygulama yüklenemiyor çünkü appinfo dosyası okunamıyor.", "Signature could not get checked. Please contact the app developer and check your admin screen." : "İmza denetlenemedi. Lütfen uygulama yöneticisi ile iletişime geçin ve yönetici ekranınıza bakın.", "App can't be installed because of not allowed code in the App" : "Uygulama, izin verilmeyen kodlar barındırdığından kurulamıyor", "App can't be installed because it is not compatible with this version of ownCloud" : "ownCloud sürümünüz ile uyumsuz olduğu için uygulama kurulamıyor", diff --git a/settings/l10n/tr.js b/settings/l10n/tr.js index 7514577afde..8013439c267 100644 --- a/settings/l10n/tr.js +++ b/settings/l10n/tr.js @@ -84,6 +84,7 @@ OC.L10N.register( "Uninstall" : "Kaldır", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Uygulama etkinleştirildi fakat güncellenmesi gerekiyor. 5 saniye içinde güncelleme sayfasına yönlendirileceksiniz.", "App update" : "Uygulama güncellemesi", + "No apps found for {query}" : "sorgulayabilmeniz için hiçbir uygulama bulunmamakta", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", "Valid until {date}" : "{date} tarihine kadar geçerli", "Delete" : "Sil", diff --git a/settings/l10n/tr.json b/settings/l10n/tr.json index 863533a4ed8..753d22ef65c 100644 --- a/settings/l10n/tr.json +++ b/settings/l10n/tr.json @@ -82,6 +82,7 @@ "Uninstall" : "Kaldır", "The app has been enabled but needs to be updated. You will be redirected to the update page in 5 seconds." : "Uygulama etkinleştirildi fakat güncellenmesi gerekiyor. 5 saniye içinde güncelleme sayfasına yönlendirileceksiniz.", "App update" : "Uygulama güncellemesi", + "No apps found for {query}" : "sorgulayabilmeniz için hiçbir uygulama bulunmamakta", "An error occurred. Please upload an ASCII-encoded PEM certificate." : "Bir hata oluştu. Lütfen ASCII-kodlanmış PEM sertifikasını yükleyin.", "Valid until {date}" : "{date} tarihine kadar geçerli", "Delete" : "Sil", diff --git a/settings/templates/personal.php b/settings/templates/personal.php index 302feddcb42..29bf240e7e3 100644 --- a/settings/templates/personal.php +++ b/settings/templates/personal.php @@ -170,15 +170,15 @@ if($_['passwordChangeSupported']) { <div id="clientsbox" class="section clientsbox"> <h2><?php p($l->t('Get the apps to sync your files'));?></h2> <a href="<?php p($_['clients']['desktop']); ?>" rel="noreferrer" target="_blank"> - <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'desktopapp.svg')); ?>" + <img src="<?php print_unescaped(image_path('core', 'desktopapp.svg')); ?>" alt="<?php p($l->t('Desktop client'));?>" /> </a> <a href="<?php p($_['clients']['android']); ?>" rel="noreferrer" target="_blank"> - <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'googleplay.png')); ?>" + <img src="<?php print_unescaped(image_path('core', 'googleplay.png')); ?>" alt="<?php p($l->t('Android app'));?>" /> </a> <a href="<?php p($_['clients']['ios']); ?>" rel="noreferrer" target="_blank"> - <img src="<?php print_unescaped(OCP\Util::imagePath('core', 'appstore.svg')); ?>" + <img src="<?php print_unescaped(image_path('core', 'appstore.svg')); ?>" alt="<?php p($l->t('iOS app'));?>" /> </a> |