diff options
| author | Johannes <74607597+JohannesGGE@users.noreply.github.com> | 2023-06-22 11:51:33 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-22 11:51:33 +0200 |
| commit | 199b9788e696696f32ded025df0b8c1bb2a8ce02 (patch) | |
| tree | 67670c6d9dbb271ec0703b30fc509e75f14fe19a /apps | |
| parent | 618c3a4817cf3180d760c191623a515ded39f520 (diff) | |
| parent | 3cb89688087b87ed5dea1d58dca92e7b873f8258 (diff) | |
| download | nextcloud-server-199b9788e696696f32ded025df0b8c1bb2a8ce02.tar.gz nextcloud-server-199b9788e696696f32ded025df0b8c1bb2a8ce02.zip | |
Merge pull request #38856 from nextcloud/fix/contacts/3404/put-location-in-proper-place
fix(sab): put location in proper address field
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/dav/lib/CardDAV/Converter.php | 14 | ||||
| -rw-r--r-- | apps/settings/src/components/PersonalInfo/LocationSection.vue | 2 |
2 files changed, 14 insertions, 2 deletions
diff --git a/apps/dav/lib/CardDAV/Converter.php b/apps/dav/lib/CardDAV/Converter.php index c8add1b96a6..b3d8b094d69 100644 --- a/apps/dav/lib/CardDAV/Converter.php +++ b/apps/dav/lib/CardDAV/Converter.php @@ -92,7 +92,19 @@ class Converter { $vCard->add(new Text($vCard, 'TEL', $property->getValue(), ['TYPE' => 'VOICE', 'X-NC-SCOPE' => $scope])); break; case IAccountManager::PROPERTY_ADDRESS: - $vCard->add(new Text($vCard, 'ADR', $property->getValue(), ['TYPE' => 'OTHER', 'X-NC-SCOPE' => $scope])); + // structured prop: https://www.rfc-editor.org/rfc/rfc6350.html#section-6.3.1 + // post office box;extended address;street address;locality;region;postal code;country + $vCard->add( + new Text( + $vCard, + 'ADR', + [ '', '', '', $property->getValue(), '', '', '' ], + [ + 'TYPE' => 'OTHER', + 'X-NC-SCOPE' => $scope, + ] + ) + ); break; case IAccountManager::PROPERTY_TWITTER: $vCard->add(new Text($vCard, 'X-SOCIALPROFILE', $property->getValue(), ['TYPE' => 'TWITTER', 'X-NC-SCOPE' => $scope])); diff --git a/apps/settings/src/components/PersonalInfo/LocationSection.vue b/apps/settings/src/components/PersonalInfo/LocationSection.vue index ceef7c432cd..57811ddf3b0 100644 --- a/apps/settings/src/components/PersonalInfo/LocationSection.vue +++ b/apps/settings/src/components/PersonalInfo/LocationSection.vue @@ -23,7 +23,7 @@ <template> <AccountPropertySection v-bind.sync="location" autocomplete="address-level1" - :placeholder="t('settings', 'Your location')" /> + :placeholder="t('settings', 'Your city')" /> </template> <script> |