diff options
| -rw-r--r-- | .eslintrc.js | 1 | ||||
| -rw-r--r-- | l10n/sk.js | 13 | ||||
| -rw-r--r-- | l10n/sk.json | 13 | ||||
| -rw-r--r-- | src/components/Properties/PropertyGroups.vue | 11 | ||||
| -rw-r--r-- | src/main.js | 4 |
5 files changed, 30 insertions, 12 deletions
diff --git a/.eslintrc.js b/.eslintrc.js index f4cdaeac..307f668a 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -1,6 +1,5 @@ module.exports = { globals: { - oc_config: true, appVersion: true }, extends: [ @@ -28,8 +28,12 @@ OC.L10N.register( "Title" : "Funkcia", "This contact was broken and received a fix. Please review the content and click here to save it." : "Tento kontakt bol opravený. Overte prosím obsah a kliknite pre uloženie.", "Download" : "Stiahnuť", + "Clone contact" : "Duplikovať kontakt", "Generate QR Code" : "Vygenerovať QR kód", "Delete" : "Zmazať", + "Contact vCard as qrcode" : "Zobraziť QR kód vCard kontaktu", + "Pick an address book" : "Vybrať adresár", + "Select address book" : "Označiť adresár", "Cancel" : "Zrušiť", "This contact is not yet synced. Edit it to save it to the server." : "Tento kontakt ešte nebol synchronizovaný. Upravte ho a uloží sa na server.", "This contact is in read-only mode. You do not have permission to edit this contact." : "Tento kontakt je iba na čítanie. Nemáte oprávnenie na úpravu tohto kontaktu.", @@ -38,6 +42,8 @@ OC.L10N.register( "Groups" : "Skupiny", "New contact" : "Nový kontakt", "Syntax error. Cannot open the contact." : "Chyba zápisu. Nepodarilo sa otvoriť kontakt.", + "An error occurred while trying to move the contact" : "Pri pokuse o presun kontaktu sa vyskytla chyba", + "An error occurred while trying to copy the contact" : "Pri pokuse o skopírovanie kontaktu sa vyskytla chyba", "No errors" : "Žiadne chyby", "Open your browser console for more details" : "Pre podrobnejšie informácie otvorte konzolu vášho webového prehliadača", "_{failedCount} faulty contact_::_{failedCount} faulty contacts_" : ["{failedCount} vadný kontakt","{failedCount} vadné kontakty","{failedCount} vadných kontaktov","{failedCount} vadných kontaktov"], @@ -55,7 +61,13 @@ OC.L10N.register( "Copied" : "Skopírované", "Can not copy" : "Nepodarilo sa skopírovať", "Copy link" : "Kopírovať odkaz", + "Toggling of address book was not successful" : "Zapnutie/vypnutie adresára nebolo úspešné", + "This will delete the address book and every contacts within it" : "Týmto sa odstráni adresár a všetky kontakty v ňom", "Delete {addressbook} ?" : "Zmazať {addressbook} ?", + "Deletion of address book was not successful." : "Odstránenie adresára nebolo úspešné.", + "Renaming of address book was not successful." : "Premenovanie adresára nebolo úspešné.", + "Address book copied to clipboard" : "Adresár bol skopírovaný do schránky", + "Address book was not copied to clipboard." : "Adresár nebol skopírovaný do schránky", "_Shared with {num} entity_::_Shared with {num} entities_" : ["Zdieľané s {num} entitou","Zdieľané s {num} entitami","Zdieľané s {num} entitami","Zdieľané s {num} entitami"], "Share with users or groups" : "Sprístupniť používateľom alebo skupinám", "No users or groups" : "Žiadny používatelia alebo skupiny", @@ -68,6 +80,7 @@ OC.L10N.register( "Importing is disabled because there are no address books available" : "Nie je možné importovať, pretože neexistuje ani jeden adresár kontaktov", "Choose a vCard file to import" : "Vyberte súbor vCard, ktorý chcete importovať", "Address book name" : "Názov adresára kontaktov", + "An error occurred, unable to create the address book." : "Vyskytla sa chyba, nepodarilo sa vytvoriť adresár.", "First name" : "Krstné meno", "Last name" : "Priezvisko", "Display name" : "Zobrazované meno", diff --git a/l10n/sk.json b/l10n/sk.json index 020a2d72..b9a648bb 100644 --- a/l10n/sk.json +++ b/l10n/sk.json @@ -26,8 +26,12 @@ "Title" : "Funkcia", "This contact was broken and received a fix. Please review the content and click here to save it." : "Tento kontakt bol opravený. Overte prosím obsah a kliknite pre uloženie.", "Download" : "Stiahnuť", + "Clone contact" : "Duplikovať kontakt", "Generate QR Code" : "Vygenerovať QR kód", "Delete" : "Zmazať", + "Contact vCard as qrcode" : "Zobraziť QR kód vCard kontaktu", + "Pick an address book" : "Vybrať adresár", + "Select address book" : "Označiť adresár", "Cancel" : "Zrušiť", "This contact is not yet synced. Edit it to save it to the server." : "Tento kontakt ešte nebol synchronizovaný. Upravte ho a uloží sa na server.", "This contact is in read-only mode. You do not have permission to edit this contact." : "Tento kontakt je iba na čítanie. Nemáte oprávnenie na úpravu tohto kontaktu.", @@ -36,6 +40,8 @@ "Groups" : "Skupiny", "New contact" : "Nový kontakt", "Syntax error. Cannot open the contact." : "Chyba zápisu. Nepodarilo sa otvoriť kontakt.", + "An error occurred while trying to move the contact" : "Pri pokuse o presun kontaktu sa vyskytla chyba", + "An error occurred while trying to copy the contact" : "Pri pokuse o skopírovanie kontaktu sa vyskytla chyba", "No errors" : "Žiadne chyby", "Open your browser console for more details" : "Pre podrobnejšie informácie otvorte konzolu vášho webového prehliadača", "_{failedCount} faulty contact_::_{failedCount} faulty contacts_" : ["{failedCount} vadný kontakt","{failedCount} vadné kontakty","{failedCount} vadných kontaktov","{failedCount} vadných kontaktov"], @@ -53,7 +59,13 @@ "Copied" : "Skopírované", "Can not copy" : "Nepodarilo sa skopírovať", "Copy link" : "Kopírovať odkaz", + "Toggling of address book was not successful" : "Zapnutie/vypnutie adresára nebolo úspešné", + "This will delete the address book and every contacts within it" : "Týmto sa odstráni adresár a všetky kontakty v ňom", "Delete {addressbook} ?" : "Zmazať {addressbook} ?", + "Deletion of address book was not successful." : "Odstránenie adresára nebolo úspešné.", + "Renaming of address book was not successful." : "Premenovanie adresára nebolo úspešné.", + "Address book copied to clipboard" : "Adresár bol skopírovaný do schránky", + "Address book was not copied to clipboard." : "Adresár nebol skopírovaný do schránky", "_Shared with {num} entity_::_Shared with {num} entities_" : ["Zdieľané s {num} entitou","Zdieľané s {num} entitami","Zdieľané s {num} entitami","Zdieľané s {num} entitami"], "Share with users or groups" : "Sprístupniť používateľom alebo skupinám", "No users or groups" : "Žiadny používatelia alebo skupiny", @@ -66,6 +78,7 @@ "Importing is disabled because there are no address books available" : "Nie je možné importovať, pretože neexistuje ani jeden adresár kontaktov", "Choose a vCard file to import" : "Vyberte súbor vCard, ktorý chcete importovať", "Address book name" : "Názov adresára kontaktov", + "An error occurred, unable to create the address book." : "Vyskytla sa chyba, nepodarilo sa vytvoriť adresár.", "First name" : "Krstné meno", "Last name" : "Priezvisko", "Display name" : "Zobrazované meno", diff --git a/src/components/Properties/PropertyGroups.vue b/src/components/Properties/PropertyGroups.vue index d5f9e7ff..700a44dc 100644 --- a/src/components/Properties/PropertyGroups.vue +++ b/src/components/Properties/PropertyGroups.vue @@ -169,14 +169,9 @@ export default { * @returns {boolean} */ validateGroup(groupName) { - // Only allow characters without vcard special chars - const groupRegex = /^[^;,:]+$/gmi - if (groupName.match(groupRegex)) { - this.addContactToGroup(groupName) - this.localValue.push(groupName) - return true - } - return false + this.addContactToGroup(groupName) + this.localValue.push(groupName) + return true }, }, } diff --git a/src/main.js b/src/main.js index 0328d5f6..c752e160 100644 --- a/src/main.js +++ b/src/main.js @@ -57,14 +57,12 @@ Vue.prototype.t = t Vue.prototype.n = n // eslint-disable-next-line Vue.prototype.appVersion = appVersion -// eslint-disable-next-line -Vue.prototype.oc_config = oc_config Vue.prototype.OC = OC Vue.prototype.OCA = OCA // Force redirect if rewrite enabled but accessed through index.php if (window.location.pathname.split('/')[1] === 'index.php' - && oc_config.modRewriteWorking) { + && OC.config.modRewriteWorking) { router.push({ name: 'group', params: { selectedGroup: t('contacts', 'All contacts') }, |