Add language selection to attendee section

appinfo/application.php

@@ -38,8 +38,10 @@ public function __construct($params=[]) {
 		$container->registerService('ContactController', function(IAppContainer $c) {
 			$request = $c->query('Request');
 			$contacts = $c->getServer()->getContactsManager();
+			$config = $c->getServer()->getConfig();
+			$l10nFactory = $c->getServer()->getL10NFactory();
 
-			return new Controller\ContactController($c->getAppName(), $request, $contacts);
+			return new Controller\ContactController($c->getAppName(), $request, $contacts, $config, $l10nFactory);
 		});
 
 		$container->registerService('EmailController', function(IAppContainer $c) {
@@ -81,8 +83,10 @@ public function __construct($params=[]) {
 			$userSession = $c->getServer()->getUserSession();
 			$config = $c->getServer()->getConfig();
 			$urlGenerator = $c->getServer()->getURLGenerator();
+			$l10nFactory = $c->getServer()->getL10NFactory();
+			$l10n = $c->getServer()->getL10N($c->query('AppName'));
 
-			return new Controller\ViewController($c->getAppName(), $request, $userSession, $config, $urlGenerator);
+			return new Controller\ViewController($c->getAppName(), $request, $userSession, $config, $urlGenerator, $l10nFactory, $l10n);
 		});
 	}
 

controller/contactcontroller.php

@@ -24,7 +24,9 @@
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\Contacts\IManager;
+use OCP\IConfig;
 use OCP\IRequest;
+use OCP\L10N\IFactory;
 
 class ContactController extends Controller {
 
@@ -34,15 +36,29 @@ class ContactController extends Controller {
 	 */
 	private $contacts;
 
+	/**
+	 * @var IConfig
+	 */
+	private $config;
+
+	/**
+	 * @var IFactory
+	 */
+	private $l10nFactory;
+
 
 	/**
 	 * @param string $appName
 	 * @param IRequest $request an instance of the request
 	 * @param IManager $contacts
+	 * @param IConfig $config
+	 * @param IFactory $l10nFactory
 	 */
-	public function __construct($appName, IRequest $request, IManager $contacts) {
+	public function __construct($appName, IRequest $request, IManager $contacts, IConfig $config, IFactory $l10nFactory) {
 		parent::__construct($appName, $request);
 		$this->contacts = $contacts;
+		$this->config = $config;
+		$this->l10nFactory = $l10nFactory;
 	}
 
 
@@ -88,6 +104,7 @@ public function searchLocation($location) {
 	public function searchAttendee($search) {
 		$result = $this->contacts->search($search, ['FN', 'EMAIL']);
 
+		$defaultLang = $this->l10nFactory->findLanguage();
 		$contacts = [];
 		foreach ($result as $r) {
 			if (!isset($r['EMAIL'])) {
@@ -99,9 +116,12 @@ public function searchAttendee($search) {
 				$r['EMAIL'] = [$r['EMAIL']];
 			}
 
+			$lang = $this->getPreferredLanguageFromUidOrDefault($r['UID'], $defaultLang);
+
 			$contacts[] = [
 					'email' => $r['EMAIL'],
-					'name' => $name
+					'name' => $name,
+					'language' => $lang
 			];
 		}
 
@@ -123,4 +143,15 @@ private function getNameFromContact(array $r) {
 
 		return $name;
 	}
+
+	/**
+	 * Returns the preferred language of a given user uid or $default instead
+	 *
+	 * @param string $uid
+	 * @param string $default
+	 * @return string
+	 */
+	private function getPreferredLanguageFromUidOrDefault($uid, $default) {
+		return $this->config->getUserValue($uid, 'core', 'lang', $default);
+	}
 }

controller/viewcontroller.php

@@ -31,6 +31,8 @@
 use OCP\IRequest;
 use OCP\IUserSession;
 use OCP\IURLGenerator;
+use OCP\IL10N;
+use OCP\L10N\IFactory;
 
 class ViewController extends Controller {
 
@@ -49,19 +51,46 @@ class ViewController extends Controller {
 	 */
 	private $userSession;
 
+	/**
+	 * @var IFactory
+	 */
+	private $l10nFactory;
+
+	// TODO(artur): Duplicate: Refactor Language --> NC:Server:PersonalInfo.php
+	const COMMON_LANGUAGE_CODES = [
+		'en', 'es', 'fr', 'de', 'de_DE', 'ja', 'ar', 'ru', 'nl', 'it',
+		'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
+	];
+
+	/**
+	 * @var [type]
+	 */
+	private $l;
+
 	/**
 	 * @param string $appName
 	 * @param IRequest $request an instance of the request
 	 * @param IUserSession $userSession
 	 * @param IConfig $config
 	 * @param IURLGenerator $urlGenerator
+	 * @param IFactory $l10nFactory
+	 * @param IL10N $l
 	 */
-	public function __construct($appName, IRequest $request, IUserSession $userSession,
-								IConfig $config, IURLGenerator $urlGenerator) {
+	public function __construct(
+		$appName,
+		IRequest $request,
+		IUserSession $userSession,
+		IConfig $config,
+		IURLGenerator $urlGenerator,
+		IFactory $l10nFactory,
+		IL10N $l
+	) {
 		parent::__construct($appName, $request);
 		$this->config = $config;
 		$this->userSession = $userSession;
 		$this->urlGenerator = $urlGenerator;
+		$this->l10nFactory = $l10nFactory;
+		$this->l = $l;
 	}
 
 	/**
@@ -98,6 +127,65 @@ public function index() {
 			$initialView = 'month';
 		}
 
+		// TODO(artur): Duplicate: Refactor Language --> NC:Server:PersonalInfo.php
+		$forceLanguage = $this->config->getSystemValue('force_language', false);
+		if($forceLanguage !== false) {
+			return [];
+		}
+
+		$userLang = $this->config->getUserValue($userId, 'core', 'lang', $this->l10nFactory->findLanguage());
+		$languageCodes = $this->l10nFactory->findAvailableLanguages();
+
+		$commonLanguages = [];
+		$languages = [];
+
+		foreach($languageCodes as $lang) {
+			$l = \OC::$server->getL10N('settings', $lang);
+			// TRANSLATORS this is the language name for the language switcher in the personal settings and should be the localized version
+			$potentialName = (string) $l->t('__language_name__');
+			if($l->getLanguageCode() === $lang && substr($potentialName, 0, 1) !== '_') {//first check if the language name is in the translation file
+				$ln = array('code' => $lang, 'name' => $potentialName);
+			} elseif ($lang === 'en') {
+				$ln = ['code' => $lang, 'name' => 'English (US)'];
+			}else{//fallback to language code
+				$ln=array('code'=>$lang, 'name'=>$lang);
+			}
+
+			// put appropriate languages into appropriate arrays, to print them sorted
+			// used language -> common languages -> divider -> other languages
+			if ($lang === $userLang) {
+				$userLang = $ln;
+			} elseif (in_array($lang, self::COMMON_LANGUAGE_CODES)) {
+				$commonLanguages[array_search($lang, self::COMMON_LANGUAGE_CODES)]=$ln;
+			} else {
+				$languages[]=$ln;
+			}
+		}
+
+		// if user language is not available but set somehow: show the actual code as name
+		if (!is_array($userLang)) {
+			$userLang = [
+				'code' => $userLang,
+				'name' => $userLang,
+			];
+		}
+
+		ksort($commonLanguages);
+
+		// sort now by displayed language not the iso-code
+		usort( $languages, function ($a, $b) {
+			if ($a['code'] === $a['name'] && $b['code'] !== $b['name']) {
+				// If a doesn't have a name, but b does, list b before a
+				return 1;
+			}
+			if ($a['code'] !== $a['name'] && $b['code'] === $b['name']) {
+				// If a does have a name, but b doesn't, list a before b
+				return -1;
+			}
+			// Otherwise compare the names
+			return strcmp($a['name'], $b['name']);
+		});
+
 		return new TemplateResponse('calendar', 'main', array_merge($templateParameters, [
 			'initialView' => $initialView,
 			'emailAddress' => $emailAddress,
@@ -107,6 +195,9 @@ public function index() {
 			'isPublic' => false,
 			'isEmbedded' => false,
 			'token' => '',
+			'activelanguage' => $userLang,
+			'commonlanguages' => $commonLanguages,
+			'languages' => $languages
 		]));
 	}
 

css/app/globals.css

@@ -75,3 +75,7 @@
 .icon-embed {
 	background-image: url('../../img/embed.svg') !important;
 }
+
+.display-inline-block {
+	display: inline-block;
+}

js/app/controllers/attendeecontroller.js

@@ -62,7 +62,8 @@ app.controller('AttendeeController', function($scope, AutoCompletionService) {
 					'role': 'REQ-PARTICIPANT',
 					'rsvp': 'TRUE',
 					'partstat': 'NEEDS-ACTION',
-					'cutype': 'INDIVIDUAL'
+					'cutype': 'INDIVIDUAL',
+					'language': OC.getLocale() // Use current user's timezone as a default value
 				}
 			});
 		}
@@ -96,7 +97,8 @@ app.controller('AttendeeController', function($scope, AutoCompletionService) {
 					arr.push({
 						displayname: displayname,
 						email: email,
-						name: attendee.name
+						name: attendee.name,
+						language: attendee.language
 					});
 				});
 			});
@@ -114,7 +116,8 @@ app.controller('AttendeeController', function($scope, AutoCompletionService) {
 				role: 'REQ-PARTICIPANT',
 				rsvp: 'TRUE',
 				partstat: 'NEEDS-ACTION',
-				cutype: 'INDIVIDUAL'
+				cutype: 'INDIVIDUAL',
+				language: item.language
 			}
 		});
 		$scope.nameofattendee = '';

js/app/models/simpleEventModel.js

@@ -51,7 +51,8 @@ app.factory('SimpleEvent', function () {
 		'cutype',
 		'cn',
 		'delegated-from',
-		'delegated-to'
+		'delegated-to',
+		'language'
 	];
 
 	const organizerParameters = [

templates/part.eventsattendees.php

@@ -63,6 +63,29 @@
 						id="attendeeno_{{$id}}"/>
 					<label class="optionallabel" for="attendeeno_{{$id}}"><?php p($l->t('Does not attend'));?></label>
 				</div>
+				<div class="display-inline-block full-width">
+					<label class="label" for="attendeelang_{{$id}"><?php p($l->t('Language')); ?>:</label>
+					<select class="event-select pull-left"
+						ng-model="attendee.parameters.language"
+						ng-selected="attendee.parameters.language"
+						id="attendeelang_{{$id}}">
+
+						<option value="<?php p($_['activelanguage']['code']); ?>">
+							<?php p($_['activelanguage']['name']); ?>
+						</option>
+						<?php foreach($_['commonlanguages'] as $language): ?>
+						<option value="<?php p($language['code']); ?>">
+							<?php p($language['name']); ?>
+						</option>
+						<?php endforeach; ?>
+						<optgroup label="––––––––––"></optgroup>
+						<?php foreach($_['languages'] as $language): ?>
+						<option value="<?php p($language['code']); ?>">
+							<?php p($language['name']); ?>
+						</option>
+						<?php endforeach; ?>
+					</select>
+				</div>
 			</div>
 		</li>
 	</ul>

tests/js/unit/models/simpleEventModelSpec.js

@@ -545,7 +545,8 @@ END:VCALENDAR`;
 				cutype: 'INDIVIDUAL',
 				cn: 'bar@foo.com',
 				'delegated-from': undefined,
-				'delegated-to': undefined
+				'delegated-to': undefined,
+				language: undefined
 			},
 			type: 'cal-address',
 			value: 'mailto:bar@foo.com'
@@ -602,7 +603,8 @@ END:VCALENDAR`;
 					cutype: 'INDIVIDUAL',
 					cn: 'bar@foo.com',
 					'delegated-from': undefined,
-					'delegated-to': undefined
+					'delegated-to': undefined,
+					language: undefined
 				},
 				type: 'cal-address',
 				value: 'mailto:bar@foo.com'
@@ -615,7 +617,8 @@ END:VCALENDAR`;
 					cutype: 'INDIVIDUAL',
 					cn: 'foo@bar.com',
 					'delegated-from': undefined,
-					'delegated-to': undefined
+					'delegated-to': undefined,
+					language: undefined
 				},
 				type: 'cal-address',
 				value: 'mailto:foo@bar.com'
@@ -1398,7 +1401,8 @@ END:VCALENDAR`;
 						cutype: 'INDIVIDUAL',
 						cn: 'bar@foo.com',
 						'delegated-from': undefined,
-						'delegated-to': undefined
+						'delegated-to': undefined,
+						language: undefined
 					},
 					type: 'cal-address',
 					value: 'mailto:bar@foo.com'

tests/php/controller/contactcontrollerTest.php

@@ -26,6 +26,8 @@ class ContactControllerTest extends \PHPUnit_Framework_TestCase {
 	private $appName;
 	private $request;
 	private $contacts;
+	private $config;
+	private $l10nFactory;
 
 	private $controller;
 
@@ -37,9 +39,15 @@ public function setUp() {
 		$this->contacts = $this->getMockBuilder('OCP\Contacts\IManager')
 			->disableOriginalConstructor()
 			->getMock();
+		$this->config = $this->getMockBuilder('OCP\Contacts\IConfig')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->l10nFactory = $this->getMockBuilder('OCP\Contacts\IFactory')
+			->disableOriginalConstructor()
+			->getMock();
 
 		$this->controller = new ContactController($this->appName,
-			$this->request, $this->contacts);
+			$this->request, $this->contacts, $this->config, $this->l10nFactory);
 	}
 
 	public function testSearchLocation() {