Merge pull request #1741 from t-bucchi/feature/phonetic-3.3.0

nextcloud · Aug 13, 2020 · 2b4c5d7 · 2b4c5d7
2 parents 752bb14 + b3eec9e
commit 2b4c5d7
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/src/components/Properties/PropertyText.vue b/src/components/Properties/PropertyText.vue
@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<div v-if="propModel" :class="`grid-span-${gridLength}`" class="property">
+	<div v-if="propModel" :class="`grid-span-${gridLength} property-${propName}`" class="property">
 		<!-- title if first element -->
 		<PropertyTitle v-if="isFirstProperty && propModel.icon"
 			:icon="propModel.icon"

diff --git a/src/components/Settings/SettingsSortContacts.vue b/src/components/Settings/SettingsSortContacts.vue
@@ -57,6 +57,14 @@ export default {
 					label: t('contacts', 'Last name'),
 					key: 'lastName',
 				},
+				{
+					label: t('contacts', 'Phonetic first name'),
+					key: 'phoneticFirstName',
+				},
+				{
+					label: t('contacts', 'Phonetic last name'),
+					key: 'phoneticLastName',
+				},
 				{
 					label: t('contacts', 'Display name'),
 					key: 'displayName',

diff --git a/src/models/contact.js b/src/models/contact.js
@@ -460,6 +460,36 @@ export default class Contact {
 		return this.displayName
 	}
 
+	/**
+	 * Return the phonetic first name if exists
+	 * Returns the first name or displayName otherwise
+	 *
+	 * @readonly
+	 * @memberof Contact
+	 * @returns {string} phoneticFirstName|firstName|displayName
+	 */
+	get phoneticFirstName() {
+		if (this.vCard.hasProperty('x-phonetic-first-name')) {
+			return this.vCard.getFirstPropertyValue('x-phonetic-first-name')
+		}
+		return this.firstName
+	}
+
+	/**
+	 * Return the phonetic last name if exists
+	 * Returns the displayName otherwise
+	 *
+	 * @readonly
+	 * @memberof Contact
+	 * @returns {string} lastName|displayName
+	 */
+	get phoneticLastName() {
+		if (this.vCard.hasProperty('x-phonetic-last-name')) {
+			return this.vCard.getFirstPropertyValue('x-phonetic-last-name')
+		}
+		return this.lastName
+	}
+
 	/**
 	 * Return all the properties as Property objects
 	 *

diff --git a/src/models/rfcProps.js b/src/models/rfcProps.js
@@ -62,6 +62,14 @@ const properties = {
 			ActionCopyNtoFN,
 		],
 	},
+	'x-phonetic-first-name': {
+		readableName: t('contacts', 'Phonetic first name'),
+		force: 'text',
+	},
+	'x-phonetic-last-name': {
+		readableName: t('contacts', 'Phonetic last name'),
+		force: 'text',
+	},
 	note: {
 		readableName: t('contacts', 'Notes'),
 		icon: 'icon-rename',
@@ -346,6 +354,8 @@ if (locales.length > 0) {
 const fieldOrder = [
 	'org',
 	'title',
+	'x-phonetic-first-name',
+	'x-phonetic-last-name',
 	'tel',
 	'email',
 	'adr',

diff --git a/src/store/addressbooks.js b/src/store/addressbooks.js
@@ -345,7 +345,8 @@ const actions = {
 	 */
 	async getContactsFromAddressBook(context, { addressbook }) {
 		return addressbook.dav
-			.findAllAndFilterBySimpleProperties(['EMAIL', 'UID', 'CATEGORIES', 'FN', 'ORG', 'N'])
+			.findAllAndFilterBySimpleProperties(['EMAIL', 'UID', 'CATEGORIES', 'FN', 'ORG', 'N',
+				'X-PHONETIC-FIRST-NAME', 'X-PHONETIC-LAST-NAME'])
 			.then((response) => {
 				// We don't want to lose the url information
 				// so we need to parse one by one