Merge branch 'master' of https://github.com/owncloud/contacts into ldap

l10n/de.php

@@ -219,6 +219,8 @@
 "Title" => "Titel",
 "Organization" => "Organisation",
 "Birthday" => "Geburtstag",
+"Website" => "Webseite",
+"Instant messaging" => "Instant Messaging",
 "Notes go here..." => "Notizen hier hinein...",
 "Add field..." => "Feld hinzufügen...",
 "Instant Messaging" => "Instant Messaging",

l10n/de/contacts.po

@@ -42,9 +42,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 00:50-0400\n"
+"POT-Creation-Date: 2014-04-11 00:48-0400\n"
-"PO-Revision-Date: 2014-04-08 04:50+0000\n"
+"PO-Revision-Date: 2014-04-10 18:20+0000\n"
-"Last-Translator: I Robot\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/owncloud/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -140,7 +140,7 @@ msgstr "Zusammenführung fehlgeschlagen. Fehler beim Speichern des Kontakts. "
 msgid "Select photo"
 msgstr "Wähle  ein Foto"
 
-#: js/app.js:705 js/app.js:1675
+#: js/app.js:705 js/app.js:1679
 msgid "Network or server error. Please inform administrator."
 msgstr "Netzwerk- oder Serverfehler. Bitte Administrator informieren."
 
@@ -191,11 +191,11 @@ msgstr "OK"
 msgid "Could not find contact: {id}"
 msgstr "Kontakt nicht gefunden: {id}"
 
-#: js/app.js:1630
+#: js/app.js:1634
 msgid "Edit profile picture"
 msgstr "Profilbild bearbeiten"
 
-#: js/app.js:1634
+#: js/app.js:1638
 msgid "Crop photo"
 msgstr "Foto zuschneiden"
 
@@ -215,17 +215,17 @@ msgstr "Fehler beim Analysieren des Geburtstages {bday}"
 msgid "The backend does not support multi-byte characters."
 msgstr "Das Backend unterstüzt keine Multibyte-Zeichen."
 
-#: js/contacts.js:2222
+#: js/contacts.js:2224
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Einige zum Löschen vorgemerkte Kontakte wurden noch nicht gelöscht. Bitte warten."
 
-#: js/contacts.js:2233
+#: js/contacts.js:2235
 msgid "Click to undo deletion of {num} contacts"
 msgstr "Klicken um das Löschen von {num} Kontakten rückgängig zu machen."
 
-#: js/contacts.js:2242
+#: js/contacts.js:2244
 msgid "Cancelled deletion of {num} contacts"
 msgstr "Die Löschung von {num} Kontakten wurde abgebrochen"
 
@@ -964,11 +964,11 @@ msgstr "Geburtstag"
 
 #: templates/contacts.php:332
 msgid "Website"
-msgstr ""
+msgstr "Webseite"
 
 #: templates/contacts.php:337
 msgid "Instant messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: templates/contacts.php:343
 msgid "Notes go here..."

l10n/de_DE.php

@@ -219,6 +219,8 @@
 "Title" => "Titel",
 "Organization" => "Organisation",
 "Birthday" => "Geburtstag",
+"Website" => "Webseite",
+"Instant messaging" => "Instant Messaging",
 "Notes go here..." => "Notizen hier hinein...",
 "Add field..." => "Feld hinzufügen...",
 "Instant Messaging" => "Instant Messaging",

l10n/de_DE/contacts.po

@@ -47,9 +47,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 00:50-0400\n"
+"POT-Creation-Date: 2014-04-11 00:48-0400\n"
-"PO-Revision-Date: 2014-04-08 04:50+0000\n"
+"PO-Revision-Date: 2014-04-10 18:20+0000\n"
-"Last-Translator: I Robot\n"
+"Last-Translator: Mario Siegmann <mario_siegmann@web.de>\n"
 "Language-Team: German (Germany) (http://www.transifex.com/projects/p/owncloud/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -145,7 +145,7 @@ msgstr "Zusammenführung fehlgeschlagen. Fehler beim Speichern des Kontakts."
 msgid "Select photo"
 msgstr "Wählen Sie ein Foto"
 
-#: js/app.js:705 js/app.js:1675
+#: js/app.js:705 js/app.js:1679
 msgid "Network or server error. Please inform administrator."
 msgstr "Netzwerk- oder Serverfehler. Bitte informieren Sie den Administrator."
 
@@ -196,11 +196,11 @@ msgstr "OK"
 msgid "Could not find contact: {id}"
 msgstr "Der Kontakt {id} wurde nicht gefunden"
 
-#: js/app.js:1630
+#: js/app.js:1634
 msgid "Edit profile picture"
 msgstr "Profilbild bearbeiten"
 
-#: js/app.js:1634
+#: js/app.js:1638
 msgid "Crop photo"
 msgstr "Foto zuschneiden"
 
@@ -220,17 +220,17 @@ msgstr "Fehler beim Analysieren des Geburtstages {bday}"
 msgid "The backend does not support multi-byte characters."
 msgstr "Das Backend unterstüzt keine Multibyte-Zeichen."
 
-#: js/contacts.js:2222
+#: js/contacts.js:2224
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Einige zum Löschen vorgemerkte Kontakte wurden noch nicht gelöscht. Bitte warten."
 
-#: js/contacts.js:2233
+#: js/contacts.js:2235
 msgid "Click to undo deletion of {num} contacts"
 msgstr "Klicken Sie hier um das Löschen von {num} Kontakten rückgängig zu machen"
 
-#: js/contacts.js:2242
+#: js/contacts.js:2244
 msgid "Cancelled deletion of {num} contacts"
 msgstr "Die Löschung von {num} Kontakten wurde abgebrochen"
 
@@ -969,11 +969,11 @@ msgstr "Geburtstag"
 
 #: templates/contacts.php:332
 msgid "Website"
-msgstr ""
+msgstr "Webseite"
 
 #: templates/contacts.php:337
 msgid "Instant messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: templates/contacts.php:343
 msgid "Notes go here..."

l10n/fr.php

@@ -219,6 +219,8 @@
 "Title" => "Titre",
 "Organization" => "Société",
 "Birthday" => "Anniversaire",
+"Website" => "Site web",
+"Instant messaging" => "Messagerie instantanée",
 "Notes go here..." => "Remarques…",
 "Add field..." => "Ajouter un champ ...",
 "Instant Messaging" => "Messagerie instantanée",

l10n/fr/contacts.po

@@ -36,9 +36,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-08 00:50-0400\n"
+"POT-Creation-Date: 2014-04-11 00:48-0400\n"
-"PO-Revision-Date: 2014-04-08 04:50+0000\n"
+"PO-Revision-Date: 2014-04-10 11:40+0000\n"
-"Last-Translator: I Robot\n"
+"Last-Translator: Christophe Lherieau <skimpax@gmail.com>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -134,7 +134,7 @@ msgstr "Échec de la fusion. Erreur d'enregistrement du contact."
 msgid "Select photo"
 msgstr "Sélectionner une photo"
 
-#: js/app.js:705 js/app.js:1675
+#: js/app.js:705 js/app.js:1679
 msgid "Network or server error. Please inform administrator."
 msgstr "Erreur de serveur ou du réseau. Veuillez contacter votre administrateur."
 
@@ -185,11 +185,11 @@ msgstr "OK"
 msgid "Could not find contact: {id}"
 msgstr "Impossible de trouver le contact : {id}"
 
-#: js/app.js:1630
+#: js/app.js:1634
 msgid "Edit profile picture"
 msgstr "Éditer l'image de profil"
 
-#: js/app.js:1634
+#: js/app.js:1638
 msgid "Crop photo"
 msgstr "Recadrer la photo"
 
@@ -209,17 +209,17 @@ msgstr "Erreur lors de l’analyse de l’anniversaire {bday}"
 msgid "The backend does not support multi-byte characters."
 msgstr "L'infrastructure ne supporte pas les caractères multi-octets."
 
-#: js/contacts.js:2222
+#: js/contacts.js:2224
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Certains contacts sont marqués pour être supprimés, mais ne le sont pas encore. Veuillez attendre que l'opération se termine."
 
-#: js/contacts.js:2233
+#: js/contacts.js:2235
 msgid "Click to undo deletion of {num} contacts"
 msgstr "Cliquer pour annuler la suppression de {num} contacts"
 
-#: js/contacts.js:2242
+#: js/contacts.js:2244
 msgid "Cancelled deletion of {num} contacts"
 msgstr "Suppression annulée pour {num} contacts"
 
@@ -958,11 +958,11 @@ msgstr "Anniversaire"
 
 #: templates/contacts.php:332
 msgid "Website"
-msgstr ""
+msgstr "Site web"
 
 #: templates/contacts.php:337
 msgid "Instant messaging"
-msgstr ""
+msgstr "Messagerie instantanée"
 
 #: templates/contacts.php:343
 msgid "Notes go here..."

l10n/it/contacts.po

@@ -17,9 +17,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-10 00:48-0400\n"
+"POT-Creation-Date: 2014-04-11 00:48-0400\n"
-"PO-Revision-Date: 2014-04-09 23:00+0000\n"
+"PO-Revision-Date: 2014-04-10 22:34+0000\n"
-"Last-Translator: idetao <marcxosm@gmail.com>\n"
+"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/owncloud/language/it/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -115,7 +115,7 @@ msgstr "Unione non riuscita. Errore durante il salvataggio del contatto."
 msgid "Select photo"
 msgstr "Seleziona la foto"
 
-#: js/app.js:705 js/app.js:1675
+#: js/app.js:705 js/app.js:1679
 msgid "Network or server error. Please inform administrator."
 msgstr "Errore di rete o del server. Informa l'amministratore."
 
@@ -166,11 +166,11 @@ msgstr "OK"
 msgid "Could not find contact: {id}"
 msgstr "Impossibile trovare il contatto: {id}"
 
-#: js/app.js:1630
+#: js/app.js:1634
 msgid "Edit profile picture"
 msgstr "Modifica l'immagine del profilo"
 
-#: js/app.js:1634
+#: js/app.js:1638
 msgid "Crop photo"
 msgstr "Ritaglia foto"
 
@@ -190,17 +190,17 @@ msgstr "Errore durante l'elaborazione della data di nascita {bday}"
 msgid "The backend does not support multi-byte characters."
 msgstr "Il motore non supporta i caratteri multi-byte."
 
-#: js/contacts.js:2222
+#: js/contacts.js:2224
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr "Alcuni contatti sono marcati per l'eliminazione, ma non sono stati ancora rimossi. Attendi fino al completamento dell'operazione."
 
-#: js/contacts.js:2233
+#: js/contacts.js:2235
 msgid "Click to undo deletion of {num} contacts"
 msgstr "Un clic per annullare l'eliminazione di {num} contatti"
 
-#: js/contacts.js:2242
+#: js/contacts.js:2244
 msgid "Cancelled deletion of {num} contacts"
 msgstr "Eliminazione di {num} contatti annullata"
 

l10n/templates/contacts.pot

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud contacts 5.0.0\n"
 "Report-Msgid-Bugs-To: translations@owncloud.org\n"
-"POT-Creation-Date: 2014-04-10 00:48-0400\n"
+"POT-Creation-Date: 2014-04-11 00:48-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -105,7 +105,7 @@ msgstr ""
 msgid "Select photo"
 msgstr ""
 
-#: js/app.js:705 js/app.js:1675
+#: js/app.js:705 js/app.js:1679
 msgid "Network or server error. Please inform administrator."
 msgstr ""
 
@@ -156,11 +156,11 @@ msgstr ""
 msgid "Could not find contact: {id}"
 msgstr ""
 
-#: js/app.js:1630
+#: js/app.js:1634
 msgid "Edit profile picture"
 msgstr ""
 
-#: js/app.js:1634
+#: js/app.js:1638
 msgid "Crop photo"
 msgstr ""
 
@@ -180,17 +180,17 @@ msgstr ""
 msgid "The backend does not support multi-byte characters."
 msgstr ""
 
-#: js/contacts.js:2222
+#: js/contacts.js:2224
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
 msgstr ""
 
-#: js/contacts.js:2233
+#: js/contacts.js:2235
 msgid "Click to undo deletion of {num} contacts"
 msgstr ""
 
-#: js/contacts.js:2242
+#: js/contacts.js:2244
 msgid "Cancelled deletion of {num} contacts"
 msgstr ""
 

lib/controller/addressbookcontroller.php

@@ -13,13 +13,25 @@ use OCA\Contacts\App,
 	OCA\Contacts\JSONResponse,
 	OCA\Contacts\Utils\JSONSerializer,
 	OCA\Contacts\Controller,
-	OCP\AppFramework\Http;
+	OCP\AppFramework\Http,
+	OCP\AppFramework\IApi,
+	OCP\IRequest;
 
 /**
  * Controller class For Address Books
  */
 class AddressBookController extends Controller {
 
+	/**
+	 * @var \OCP\AppFramework\IApi
+	 */
+	protected $api;
+
+	public function __construct($appName, IRequest $request, App $app, IApi $api) {
+		parent::__construct($appName, $request, $app);
+		$this->api = $api;
+	}
+
 	/**
 	 * @NoAdminRequired
 	 * @NoCSRFRequired

lib/dispatcher.php

@@ -75,7 +75,8 @@ class Dispatcher extends MainApp {
 		});
 		$this->container->registerService('AddressBookController', function(IAppContainer $container) use($app) {
 			$request = $container->query('Request');
-			return new AddressBookController($this->appName, $request, $app);
+			$api = $container->query('API');
+			return new AddressBookController($this->appName, $request, $app, $api);
 		});
 		$this->container->registerService('BackendController', function(IAppContainer $container) use($app) {
 			$request = $container->query('Request');