From f880734827210e3d0ce0eb3255a0b7e40c0bcd8c Mon Sep 17 00:00:00 2001
From: Volkan Gezer
Date: Sun, 25 May 2014 12:35:46 +0200
Subject: [PATCH] make user_ldap fully translatable
---
apps/user_ldap/js/settings.js | 2 +-
apps/user_ldap/settings.php | 10 ++++++----
apps/user_ldap/templates/part.settingcontrols.php | 4 ++--
apps/user_ldap/templates/part.wizard-server.php | 8 ++++----
apps/user_ldap/templates/part.wizardcontrols.php | 4 ++--
apps/user_ldap/templates/settings.php | 4 ++--
6 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/apps/user_ldap/js/settings.js b/apps/user_ldap/js/settings.js
index fca2dc13d15..15a02abb065 100644
--- a/apps/user_ldap/js/settings.js
+++ b/apps/user_ldap/js/settings.js
@@ -90,7 +90,7 @@ var LdapConfiguration = {
);
}
$('#ldap_serverconfig_chooser option:selected').removeAttr('selected');
- var html = ''+$('#ldap_serverconfig_chooser option').length+'. Server ';
+ var html = ''+t('user_ldap','{nbServer}. Server', {nbServer: $('#ldap_serverconfig_chooser option').length})+' ';
$('#ldap_serverconfig_chooser option:last').before(html);
LdapWizard.init();
} else {
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 7acc997e288..fcde5df3716 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -46,11 +46,13 @@ $wControls = $wControls->fetchPage();
$sControls = new OCP\Template('user_ldap', 'part.settingcontrols');
$sControls = $sControls->fetchPage();
+$l = \OC_L10N::get('user_ldap');
+
$wizTabs = array();
-$wizTabs[] = array('tpl' => 'part.wizard-server', 'cap' => 'Server');
-$wizTabs[] = array('tpl' => 'part.wizard-userfilter', 'cap' => 'User Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => 'Login Filter');
-$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => 'Group Filter');
+$wizTabs[] = array('tpl' => 'part.wizard-server', 'cap' => $l->t('Server'));
+$wizTabs[] = array('tpl' => 'part.wizard-userfilter', 'cap' => $l->t('User Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-loginfilter', 'cap' => $l->t('Login Filter'));
+$wizTabs[] = array('tpl' => 'part.wizard-groupfilter', 'cap' => $l->t('Group Filter'));
for($i = 0; $i < count($wizTabs); $i++) {
$tab = new OCP\Template('user_ldap', $wizTabs[$i]['tpl']);
diff --git a/apps/user_ldap/templates/part.settingcontrols.php b/apps/user_ldap/templates/part.settingcontrols.php
index 0cdb8ccf16f..dfc49549032 100644
--- a/apps/user_ldap/templates/part.settingcontrols.php
+++ b/apps/user_ldap/templates/part.settingcontrols.php
@@ -3,10 +3,10 @@
t('Test Configuration'));?>
-
t('Help'));?>
-
\ No newline at end of file
+
diff --git a/apps/user_ldap/templates/part.wizard-server.php b/apps/user_ldap/templates/part.wizard-server.php
index 0312c17ab7b..3d4b0feead9 100644
--- a/apps/user_ldap/templates/part.wizard-server.php
+++ b/apps/user_ldap/templates/part.wizard-server.php
@@ -3,14 +3,14 @@
- 1. Server ');
+ t('1. Server'));?> ');
- >. Server:
+ >t('%s. Server:', array($i++)));?>
t('Add Server Configuration'));?>
Delete Configuration
+ name="ldap_action_delete_configuration">t('Delete Configuration'));?>
@@ -68,4 +68,4 @@
-
\ No newline at end of file
+
diff --git a/apps/user_ldap/templates/part.wizardcontrols.php b/apps/user_ldap/templates/part.wizardcontrols.php
index f17b362c737..862e10bdd12 100644
--- a/apps/user_ldap/templates/part.wizardcontrols.php
+++ b/apps/user_ldap/templates/part.wizardcontrols.php
@@ -7,10 +7,10 @@
t('Continue'));?>
-
t('Help'));?>
-
\ No newline at end of file
+
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 03f2b8db090..38043fb34a8 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -4,8 +4,8 @@
$title) { ?>
- Expert
- Advanced
+ t('Expert'));?>
+ t('Advanced'));?>
'.$l->t('Warning: Apps user_ldap and user_webdavauth are incompatible. You may experience unexpected behavior. Please ask your system administrator to disable one of them.').'');
--
2.39.5