From bf1824f38b97d01f881b36efa8a90d9556b42a78 Mon Sep 17 00:00:00 2001 From: Veljko Maksimovic Date: Tue, 2 Nov 2021 01:52:51 +0100 Subject: [PATCH 1/6] Initial commit --- core/pom.xml | 6 + pom.xml | 1 + sr_Latn_RS/README.md | 25 + sr_Latn_RS/pom.xml | 223 ++++ sr_Latn_RS/update-versions.sh | 12 + sr_Latn_RS/vivo-rc-script-languages.sh | 21 + sr_Latn_RS/webapp/pom.xml | 47 + .../webapp/i18n/all_sr_Latn_RS.properties | 1028 +++++++++++++++++ .../freemarker/search-help_sr_RS.ftl | 42 + .../templates/freemarker/termsOfUse_sr_RS.ftl | 32 + .../userAccounts-acctCreatedEmail_sr_RS.ftl | 68 ++ ...nts-acctCreatedExternalOnlyEmail_sr_RS.ftl | 42 + ...ccounts-confirmEmailChangedEmail_sr_RS.ftl | 38 + ...rAccounts-firstTimeExternalEmail_sr_RS.ftl | 42 + ...serAccounts-passwordCreatedEmail_sr_RS.ftl | 42 + ...ounts-passwordResetCompleteEmail_sr_RS.ftl | 43 + ...counts-passwordResetPendingEmail_sr_RS.ftl | 57 + 17 files changed, 1769 insertions(+) create mode 100644 sr_Latn_RS/README.md create mode 100644 sr_Latn_RS/pom.xml create mode 100644 sr_Latn_RS/update-versions.sh create mode 100644 sr_Latn_RS/vivo-rc-script-languages.sh create mode 100644 sr_Latn_RS/webapp/pom.xml create mode 100644 sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/search-help_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl create mode 100644 sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl diff --git a/core/pom.xml b/core/pom.xml index c258ffb..5e77505 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -193,6 +193,12 @@ ${project.version} war + + org.vivoweb + vitro-languages-webapp-sr_Latn_RS + ${project.version} + war + diff --git a/pom.xml b/pom.xml index d8e76c4..9c8d54a 100644 --- a/pom.xml +++ b/pom.xml @@ -220,5 +220,6 @@ fr_CA pt_BR de_DE + sr_Latn_RS diff --git a/sr_Latn_RS/README.md b/sr_Latn_RS/README.md new file mode 100644 index 0000000..4f6f391 --- /dev/null +++ b/sr_Latn_RS/README.md @@ -0,0 +1,25 @@ +Vitro-languages +=============== + +Files that enable Vitro (and by extension, VIVO) to operate in languages beyond American English. + +Available language files +------------------------ + +At present, VIVO has been translated into German, Spanish, and Portuguese. You may find the relevant files for each language by searching for files containing _de_DE, _es, and _pt_BR respectively. English uses the prefix _en_US. + +Using the language files +------------------------ + +If the files you want already exist here, you can add them to your VIVO instance by +following the instructions in the VIVO wiki for [Adding a language to VIVO][1]. + +If the files for your desired language do not exist then you may use the files in this repository as a +starting point for doing the translations yourself. Search for the required files for any of the language prefixes above (e.g. _en_US), copy the files, and rename your new files using the appropriate language code [prefix][2]. Please send a note to [the VIVO Tech group][3] +to find out if someone else is already working on a translation. + +If you create a translation, please consider contributing your language files to the VIVO community. + +[1]: https://wiki.duraspace.org/display/VIVODOC110x/Internationalization#Internationalization-AddinganexistinglanguagetoyourVIVOsite +[2]: https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes +[3]: mailto:vivo-tech@googlegroups.com diff --git a/sr_Latn_RS/pom.xml b/sr_Latn_RS/pom.xml new file mode 100644 index 0000000..323f447 --- /dev/null +++ b/sr_Latn_RS/pom.xml @@ -0,0 +1,223 @@ + + + 4.0.0 + + vitro-languages-sr_Latn_RS + pom + + Vitro Languages sr_Latn_RS + Vitro Languages + http://vivoweb.org/ + + + + BSD 3-Clause License + https://raw.github.com/vivo-project/VIVO/develop/LICENSE + repo + + + + + + Graham Triggs + gtriggs@duraspace.org + DuraSpace + http://vivoweb.org/ + + + Jim Blake + jeb228@cornell.edu + Cornell University Library + https://github.com/j2blake + + + John Fereira + jaf30@cornell.edu + Cornell University + https://github.com/fereira + + + + + + scm:git:git@github.com:vivo-project/Vitro-languages.git + scm:git:git@github.com:vivo-project/Vitro-languages.git + git@github.com:vivo-project/Vitro-languages.git + HEAD + + + + ${project.version} + ${basedir} + yyyy-MM-dd HH:mm:ss + ${maven.build.timestamp} + false + / + UTF-8 + + + + webapp + + + + + release-sign-artifacts + + + performRelease + true + + + + + + + org.apache.maven.plugins + maven-source-plugin + + + attach-sources + + jar-no-fork + + + + + + org.sonatype.plugins + nexus-staging-maven-plugin + true + + ossrh + https://oss.sonatype.org/ + true + + + + org.codehaus.mojo + buildnumber-maven-plugin + + + validate + + create + + + + + false + false + 7 + Detached + + + + org.apache.maven.plugins + maven-gpg-plugin + + + sign-artifacts + verify + + sign + + + + + + + + + + + + + + maven-assembly-plugin + 3.1.1 + + + maven-clean-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-jar-plugin + 3.1.2 + + + org.apache.maven.plugins + maven-gpg-plugin + 1.6 + + + org.apache.maven.plugins + maven-source-plugin + 3.1.0 + + + org.apache.maven.plugins + maven-war-plugin + 3.2.3 + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + org.codehaus.mojo + buildnumber-maven-plugin + 1.4 + + + org.sonatype.plugins + nexus-staging-maven-plugin + 1.6.8 + + + + + + + + vivo-project + https://vivo-project.github.io/ + + + ossrh + https://oss.sonatype.org/content/repositories/snapshots + + + ossrh + https://oss.sonatype.org/service/local/staging/deploy/maven2/ + + + + org.vivoweb + vitro-languages + 1.12.1-SNAPSHOT + + 1.12.1-SNAPSHOT + org.vivoweb + diff --git a/sr_Latn_RS/update-versions.sh b/sr_Latn_RS/update-versions.sh new file mode 100644 index 0000000..79dccd3 --- /dev/null +++ b/sr_Latn_RS/update-versions.sh @@ -0,0 +1,12 @@ +#!/bin/sh + +if [ -z "$1" ] + then + echo 'New version number required eg. 1.11.0-RC-1' + exit 1 +fi + +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1 +cd installer +mvn versions:set -DgenerateBackupPoms=false -DnewVersion=$1 +cd .. diff --git a/sr_Latn_RS/vivo-rc-script-languages.sh b/sr_Latn_RS/vivo-rc-script-languages.sh new file mode 100644 index 0000000..7226eea --- /dev/null +++ b/sr_Latn_RS/vivo-rc-script-languages.sh @@ -0,0 +1,21 @@ +#!/bin/bash +# RC Script for languages + +RC_VERSION=1.11.1 +RC_NUM=1 + +git checkout master +git pull +git push origin master:rel-${RC_VERSION}-RC + + +git checkout rel-${RC_VERSION}-RC +git tag -a "rel-${RC_VERSION}-RC-${RC_NUM}" -m "rel-${RC_VERSION}-RC-${RC_NUM}" +git push origin --tags + + +# Created Branch and Tag Examples +# (Branch) https://github.com/vivo-project/Vitro-languages/tree/rel-1.11.1-RC +# (Tag) https://github.com/vivo-project/Vitro-languages/tree/rel-1.11.1-RC-1 +# (Branch) https://github.com/vivo-project/VIVO-languages/tree/rel-1.11.1-RC +# (Tag) https://github.com/vivo-project/VIVO-languages/tree/rel-1.11.1-RC-1 diff --git a/sr_Latn_RS/webapp/pom.xml b/sr_Latn_RS/webapp/pom.xml new file mode 100644 index 0000000..c17ba07 --- /dev/null +++ b/sr_Latn_RS/webapp/pom.xml @@ -0,0 +1,47 @@ + + + 4.0.0 + + org.vivoweb + vitro-languages-webapp-sr_Latn_RS + 1.12.1-SNAPSHOT + war + + + org.vivoweb + vitro-languages-sr_Latn_RS + 1.12.1-SNAPSHOT + .. + + + Vitro Languages for Web App sr_Latn_RS + + + + + org.apache.maven.plugins + maven-war-plugin + + false + WEB-INF/lib/*.jar + false + + + true + + + + + + maven-clean-plugin + + + + overlays + + + + + + + diff --git a/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties b/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties new file mode 100644 index 0000000..cd5f8a9 --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties @@ -0,0 +1,1028 @@ +# +# Text strings for the controllers and templates +# +# Default (English) +# +save_changes=Sačuvajte promene +save_entry=Sačuvajte entitet +select_existing=Odaberite postojeći +select_an_existing=Odaberite postojeći +add_an_entry_to=Dodajte entitet tipa +change_entry_for=Promenite unos za: +add_new_entry_for=Dodajte novi unos za: +change_text_for=Promenite tekst za: +cancel_link = Poništite +cancel_title = poništite +required_fields = obavezna polja +or = ili +alt_error_alert = Ikonica za upozorenje o grešci +alt_confirmation = Ikonica za potvrdu +for = za +email_address = Email adresa +first_name = Ime +last_name = Prezime +roles = Uloge +status = Status + +ascending_order = uzlazni redosled +descending_order = opadajući redosled +select_one = Odaberite jednu + +type_more_characters = unesite više karaktera +no_match = nema podudaranja + +request_failed = Zahtev nije uspeo. Molimo Vas kontaktirajte vašeg administratora. + +# +# Image upload pages +# +upload_page_title = Odabir slike +upload_page_title_with_name = Odabir slike za {0} +upload_heading = Odabir slike + +replace_page_title = Zamena slike +replace_page_title_with_name = Zamena slike za {0} + +crop_page_title = Isecite sliku +crop_page_title_with_name = Isecite sliku za {0} + +current_photo = Trenutna slika +upload_photo = Postavite sliku +replace_photo = Zamenite sliku +photo_types = (JPEG, GIF ili PNG) +maximum_file_size = Najveća veličina fajla: {0} megabajta +minimum_image_dimensions = Najmanje dimenzije slike: {0} x {1} piksela + +cropping_caption = Your profile photo will look like the image below. +cropping_note = To make adjustments, you can drag around and resize the photo to the right. \ +When you are happy with your photo click the "Save Photo" button. + +alt_thumbnail_photo = Individual photo +alt_image_to_crop = Image to be cropped +alt_preview_crop = Preview of photo cropped + +delete_link = Obrišite fotografiju +submit_upload = Postavite fotografiju +submit_save = Sačuvajte fotografiju + +confirm_delete = Are you sure you want to delete this photo? + +imageUpload.errorNoURI = Niste uneli URI za entitet +imageUpload.errorUnrecognizedURI = URI koji ste uneli ne pripada ni jednom entitetu: ''{0}'' +imageUpload.errorNoImageForCropping = There is no image file to be cropped. +imageUpload.errorImageTooSmall = Slika koju hoćete da postavite mora biti makar {0} piksela visoka i {1} piksela siroka. +imageUpload.errorUnknown = Došlo je do greške pri obradi slike. Molimo Vas odaberete neku drugu sliku. +imageUpload.errorFileTooBig = Odaberite sliku koja zauzima manje od {0} megabajta. +imageUpload.errorUnrecognizedFileType = ''{0}'' ne spada u prepoznatljive formate za slike. Molimo Vas odaberite fajl JPEG, GIF, ili PNG formata. +imageUpload.errorNoPhotoSelected = Molimo Vas odaberite sliku. +imageUpload.errorBadMultipartRequest = Došlo je do greške prilikom parsiranja 'multi-part' zahteva prilikom postavljanja slike. +imageUpload.errorFormFieldMissing = Forma ne sadrži polje ''{0}''. + +# +# User Accounts pages +# +account_management = Upravljanje Nalozima +user_accounts_link = Korisnički nalozi +user_accounts_title = korisnički nalozi + +login_count = Broj prijava +last_login = Poslednja prijava + +add_new_account = Dodajte novi nalog +edit_account = Izmenite nalog +external_auth_only = Autentifikacije isključivo puta eksternih servisa +reset_password = Resetujte lozinku +reset_password_note = Napomena: Uputstva za resetovanje lozinkee će biti \ +poslata na email adresu koju ste uneli. Lozinka neće biti resetovana \ +sve dok korisnik ne klikne na link koji se nalazi u email-u. +new_password = Nova lozinka +confirm_password = Ponovite novu lozinku +minimum_password_length = Lozinka mora da sadrži između {0} i {1} karaktera. +leave_password_unchanged = Ako ovo polje ostavite prazno lozinka neće biti promenjena. +confirm_initial_password = Promenite početnu lozinku + +new_account_1 = Novi nalog za +new_account_2 = je uspešno kreiran. +new_account_title = novi nalog +new_account_notification = Email sa uputstvina za aktiviranje naloga i \ +kreiranje lozinke je poslat na adresu {0} +updated_account_1 = Nalog za +updated_account_2 = je ažuriran. +updated_account_title = ažuriran nalog +updated_account_notification = Email sa instrukcijama za \ +resetovanje lozinke je poslat na adresu {0}. \ +Lozinka neće biti resetovana sve dok korisnik ne klikne na link u email-u. +deleted_accounts = {0} {0, choice, 0#naloga|1#nalog|1 + +<#if origination?has_content && origination == "helpLink"> +

Search Tips

+ + Nazad na rezultate + +<#else> +

Saveti za pretragu

+ +
    +
  • Pretraga treba da bude jednostavna! Koristite kratke, pojedinačne izraze osim ako Vaša pretraga vraća previše rezultata.
    • +
  • Koristite navodnike kako bi ste tražili čitave fraze -- npr. "savijanje proteina".
    • +
  • Izuzev boolean operatora, pretrage NE RAZLIKUJU mala i velika slova, te su izrazi "Ženeva" i "ženeva" ekvivalentni
    • +
  • Ako niste sigurni kako pravilno da napišete reč, stavite ~ na kraj izraza po kom radite pretragu -- npr. cabage~ će pronaći cabbage, steven~ će pronaći Stephen i Stefan (i ostala slična imena).
    • +
+ +

Saveti za naprednu pretragu

+ + +${stylesheets.add('')} + diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_RS.ftl new file mode 100644 index 0000000..675d0ac --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_RS.ftl @@ -0,0 +1,32 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +
+

Uslovi korišćenja

+ +

Odricanje

+

Ovaj ${termsOfUse.siteName} veb sajt sadrži materijal—tekstualne informacije, citiranje radova, + linkove, i slike—koje obezbeđuje ${termsOfUse.siteHost} i druga fizička i pravna lica. + Informacije koje se mogu zaštititi autorskim pravima i koje se nalze na VIVO veb sajtu i koje su dostupne kao "Resource Description Framework" (RDF) podaci + na ${termsOfUse.siteHost} su namenjene za javno korišćenje i slobodnu distribuciju pod uslovima korišćenja + Creative Commons CC-BY 3.0 licence koja Vam dozvoljava + da kopirate, distribuirate, i prikazujete ove informacije pod uslovon da navedete da informacije potiču sa + ${termsOfUse.siteHost}. Sve informacije koje se ne mogu zaštititi autorskim pravima su vam dostupne pod + "CC0 odricanjem". Međutim, izvorni dokumenti, + slike ili veb stranice koje su priložene na VIVO sajtu, ili do kojih vode linkovi sa VIVO sajta možda sadrže informacije koje su pod zaštitom autorskih prava i treba da se + koriste i distribuiraju u skladu sa uslovima korišćenja koji idu uz pomenuti izvorni materija. +

+ +

Odricanje od odgovornosti

+

${termsOfUse.siteHost?cap_first} ne garantuje ništa, niti preuzima bilo kakvu pravnu odgovornost za preciznost, + kompletnost, aktuelnost ili korist bilo kog materijala koji je prikazan na, ili distribuiran od strane + ${termsOfUse.siteName} veb sajta niti predstavlja da korišćenje sadržaja neće narušiti pravo o privatnom vlasništvu. + ${termsOfUse.siteHost?cap_first} se odriče svih garancije koje se vežu za informacije prikazane na veb sajtu. Na svoju odgovornost + se oslanjate na bilo koje informacije. Ni u kom slučaju ${termsOfUse.siteHost} neće odgovarati za štetu + koja je nastala koristeći ${siteName} veb sajt ili sadržaj koji se nalazi na njemu.

+ +

Disclaimer of Endorsement

+

Reference na bilo koji komercijalni proizvod, proces, ili servis po nazivu, + zaštoitnom znaku, proizvođaču, ili nečemu drugom ne implicira saradnju, reklamu ili preporuku od strane + ${termsOfUse.siteHost}. Pogledi i stavovi autora koji su ovde izraženi nisu odraz stavova + ${termsOfUse.siteHost} te ne treba da se koriste za reklamiranje.

+
diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl new file mode 100644 index 0000000..b7513fe --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl @@ -0,0 +1,68 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrda da je nalog kreiran. --> + +<#assign subject = "Vaš ${siteName} nalog je kreiran." /> + +<#assign html> + + + ${subject} + + +

+ ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Čestitamo! +

+ +

+ Kreirali smo vaš novi nalog za ${siteName}, povezan sa ${userAccount.emailAddress} email adresom. +

+ +

+ Ako niste zatražili kreiranje novog naloga možete ignorisati ovaj email. + Zahtev će isteći za 30 dana. +

+ +

+ Kliknite link ispod kako bi ste kreirali lozinku za Vaš novi nalog koristeći naše zaštićene servere. +

+ +

+ ${passwordLink} +

+ +

+ Ako link iznad ne funkcioniše, možete ga kopirati i nalepiti direktno unutar Vašeg pretraživača. +

+ +

+ Hvala Vam! +

+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Česttitamo! + +Kreirali smo vaš novi nalog za ${siteName}, +povezan sa ${userAccount.emailAddress} email adresom. + +Ako niste zatražili kreiranje novog naloga možete ignorisati ovaj email. +Zahtev će isteći za 30 dana. + +Nalepite link koji se nalazi ispred u navigacioni bar Vašeg pretraživača kako bi ste +kreirali lozinku za Vaš nov nalog koristeći naše zaštićene servere. + +${passwordLink} + +Hvala Vam! + + +<@email subject=subject html=html text=text /> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl new file mode 100644 index 0000000..b08dad1 --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl @@ -0,0 +1,42 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrda da je nalog kreiran. --> + +<#assign subject = "Vaš ${siteName} nalog je kreiran." /> + +<#assign html> + + + ${subject} + + +

+ ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Čestitamo! +

+ +

+ Kreirali smo novi VIVO nalog povezan sa ${userAccount.emailAddress} email adresom. +

+ +

+ Hvala! +

+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Čestitamo! + +Kreirali smo novi VIVO nalog povezan sa ${userAccount.emailAddress} email adresom. + +Hvala! + + +<@email subject=subject html=html text=text /> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl new file mode 100644 index 0000000..04d24df --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl @@ -0,0 +1,38 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrda da je korisnik promenio email adresu sa kojom je povezan nalog. --> + +<#assign subject = "Your ${siteName} email account has been changed." /> + +<#assign html> + + + ${subject} + + +

+ Pozdrav, ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Nedavno ste promenili email adresu povezanu sa nalogom za korisnika + ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Hvala Vam. +

+ + + + +<#assign text> +Pozdrav, ${userAccount.firstName} ${userAccount.lastName} + +Nedavno ste promenili email adresu povezanu sa nalogom za korisnika +${userAccount.firstName} ${userAccount.lastName} + +Hvala Vam. + + +<@email subject=subject html=html text=text /> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_RS.ftl new file mode 100644 index 0000000..2dff6a1 --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_RS.ftl @@ -0,0 +1,42 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrda da je nalog kreiran za korisnika koji koristi eksternu autentifikaciju. --> + +<#assign subject = "Vaš ${siteName} nalog je kreiran." /> + +<#assign html> + + + ${subject} + + +

+ ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Čestitamo! +

+ +

+ Kreirali smo novi VIVO nalog povezan sa ${userAccount.emailAddress} email adresom. +

+ +

+ Hvala! +

+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Čestitamo! + +Kreirali smo novi VIVO nalog povezan sa ${userAccount.emailAddress} email adresom. + +Hvala! + + +<@email subject=subject html=html text=text /> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_RS.ftl new file mode 100644 index 0000000..5676033 --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_RS.ftl @@ -0,0 +1,42 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrda da je kreirana lozinka. --> + +<#assign subject = "Vaša ${siteName} lozinka je uspešno kreirana." /> + +<#assign html> + + + ${subject} + + +

+ ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Lozinka je uspešno kreirana. +

+ +

+ Vaša nova lozinka povezana sa nalogom ${userAccount.emailAddress} je kreirana. +

+ +

+ Hvala Vam. +

+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Lozinka je uspešno kreirana. + +Vaša nova lozinka povezana sa nalogom ${userAccount.emailAddress} je kreirana. + +Hvala Vam. + + +<@email subject=subject html=html text=text /> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl new file mode 100644 index 0000000..5c0e403 --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl @@ -0,0 +1,43 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrda da je lozinka resetovana. --> + +<#assign subject = "Your ${siteName} password changed." /> + +<#assign html> + + + ${subject} + + + +

+ ${userAccount.firstName} ${userAccount.lastName} +

+ +

+ Lozinka je uspešno promenjena. +

+ +

+ Vaša lozinka povezana sa nalogom ${userAccount.emailAddress} je promenjena. +

+ +

+ Hvala Vam. +

+ + + + +<#assign text> +${userAccount.firstName} ${userAccount.lastName} + +Lozinka je uspešno promenjena. + +Vaša lozinka povezana sa nalogom ${userAccount.emailAddress} je promenjena. + +Hvala Vam. + + +<@email subject=subject html=html text=text /> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl new file mode 100644 index 0000000..eeb3c33 --- /dev/null +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl @@ -0,0 +1,57 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- Potvrdni mejl za resetovanje korisničke lozinke --> + +<#assign subject = "${siteName} reset password request" /> + +<#assign html> + + + ${subject} + + +

+ Poštovani: +

+ +

+ Dobili smo zahtev za resetovanje šifre za Vaš ${siteName} nalog (${userAccount.emailAddress}). +

+ +

+ Molimo Vas da pratite dole navedene instrukcije kako bi ste nastavili sa resetovanjem Vaše lozinke. +

+ +

+ Ako niste zahtevali resetovanje lozinke možete ignorisati ovaj mejl. + Ovaj zahtev će isteći za 30 dana. +

+ +

+ Kliknite na link ispod ili ga kopirajte u navigacioni bar vašek pretraživača kako bi ste resetovali + Vašu lozinku koristeći naše zaštićene servere. +

+ +

${passwordLink}

+ +

Hvala Vam!

+ + + + +<#assign text> +Poštovani: + +Dobili smo zahtev za resetovanje šifre za Vaš ${siteName} nalog (${userAccount.emailAddress}). + +Molimo Vas da pratite dole navedene instrukcije kako bi ste nastavili sa resetovanjem Vaše lozinke. + +Kliknite na link ispod ili ga kopirajte u navigacioni bar vašek pretraživača kako bi ste resetovali +Vašu lozinku koristeći naše zaštićene servere. + +${passwordLink} + +Hvala Vam! + + +<@email subject=subject html=html text=text /> From c2a8cdd21c1397b4832a4b66475f38d2925d1053 Mon Sep 17 00:00:00 2001 From: Veljko Maksimovic Date: Wed, 6 Apr 2022 01:39:41 +0200 Subject: [PATCH 2/6] fixed all requested changes --- sr_Latn_RS/pom.xml | 21 --- .../webapp/i18n/all_sr_Latn_RS.properties | 130 +++++------------- .../freemarker/search-help_sr_RS.ftl | 2 +- .../userAccounts-acctCreatedEmail_sr_RS.ftl | 4 +- ...ccounts-confirmEmailChangedEmail_sr_RS.ftl | 2 +- ...ounts-passwordResetCompleteEmail_sr_RS.ftl | 2 +- ...counts-passwordResetPendingEmail_sr_RS.ftl | 2 +- 7 files changed, 44 insertions(+), 119 deletions(-) diff --git a/sr_Latn_RS/pom.xml b/sr_Latn_RS/pom.xml index 323f447..f21382f 100644 --- a/sr_Latn_RS/pom.xml +++ b/sr_Latn_RS/pom.xml @@ -17,27 +17,6 @@ - - - Graham Triggs - gtriggs@duraspace.org - DuraSpace - http://vivoweb.org/ - - - Jim Blake - jeb228@cornell.edu - Cornell University Library - https://github.com/j2blake - - - John Fereira - jaf30@cornell.edu - Cornell University - https://github.com/fereira - - - <#if origination?has_content && origination == "helpLink"> -

Search Tips

+

Saveti za Pretragu

Nazad na rezultate diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl index b7513fe..a2a4034 100644 --- a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl @@ -49,7 +49,7 @@ <#assign text> ${userAccount.firstName} ${userAccount.lastName} -Česttitamo! +Čestitamo! Kreirali smo vaš novi nalog za ${siteName}, povezan sa ${userAccount.emailAddress} email adresom. @@ -57,7 +57,7 @@ povezan sa ${userAccount.emailAddress} email adresom. Ako niste zatražili kreiranje novog naloga možete ignorisati ovaj email. Zahtev će isteći za 30 dana. -Nalepite link koji se nalazi ispred u navigacioni bar Vašeg pretraživača kako bi ste +Nalepite link koji se nalazi ispred u navigacioni bar Vašeg pretraživača kako biste kreirali lozinku za Vaš nov nalog koristeći naše zaštićene servere. ${passwordLink} diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl index 04d24df..9e0be20 100644 --- a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl @@ -2,7 +2,7 @@ <#-- Potvrda da je korisnik promenio email adresu sa kojom je povezan nalog. --> -<#assign subject = "Your ${siteName} email account has been changed." /> +<#assign subject = "Vaš ${siteName} email nalog je promenjen." /> <#assign html> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl index 5c0e403..77b23dc 100644 --- a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl @@ -2,7 +2,7 @@ <#-- Potvrda da je lozinka resetovana. --> -<#assign subject = "Your ${siteName} password changed." /> +<#assign subject = "Vaša ${siteName} lozinka je promenjena." /> <#assign html> diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl index eeb3c33..f454968 100644 --- a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl +++ b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl @@ -2,7 +2,7 @@ <#-- Potvrdni mejl za resetovanje korisničke lozinke --> -<#assign subject = "${siteName} reset password request" /> +<#assign subject = "${siteName} zahtev za reset lozinke" /> <#assign html> From 327e44991e8831104c2c728f7d6fcc245c5409ee Mon Sep 17 00:00:00 2001 From: Veljko Maksimovic Date: Wed, 6 Apr 2022 16:37:47 +0200 Subject: [PATCH 3/6] Implemented changes requested by lidijaivanovic --- .../webapp/i18n/all_sr_Latn_RS.properties | 82 +++++++++---------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties b/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties index 07b3280..243bea4 100644 --- a/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties +++ b/sr_Latn_RS/webapp/src/main/webapp/i18n/all_sr_Latn_RS.properties @@ -31,7 +31,7 @@ select_one = Odaberite jednu type_more_characters = unesite više karaktera no_match = nema podudaranja -request_failed = Zahtev nije uspeo. Molimo Vas kontaktirajte vašeg administratora. +request_failed = Zahtev nije uspeo. Molimo Vas kontaktirajte Vašeg administratora. # # Image upload pages @@ -53,23 +53,23 @@ photo_types = (JPEG, GIF ili PNG) maximum_file_size = Najveća veličina fajla: {0} megabajta minimum_image_dimensions = Najmanje dimenzije slike: {0} x {1} piksela -cropping_caption = Your profile photo will look like the image below. -cropping_note = To make adjustments, you can drag around and resize the photo to the right. \ -When you are happy with your photo click the "Save Photo" button. +cropping_caption = Vaša profilna slika će izgledati kao fotografila ispor. +cropping_note = Možete pomerati i promeniti veličinu slike sa desne strane kako bi ste je prilagodili. \ +Kada budete zadovoljni sa izgledom slike, pritisnije dugme "Sačuvajte fotografiju". -alt_thumbnail_photo = Individual photo -alt_image_to_crop = Image to be cropped -alt_preview_crop = Preview of photo cropped +alt_thumbnail_photo = Fotografija osobe +alt_image_to_crop = Slika koja treba da se iseče +alt_preview_crop = Izgled slike koju sečete delete_link = Obrišite fotografiju submit_upload = Postavite fotografiju submit_save = Sačuvajte fotografiju -confirm_delete = Are you sure you want to delete this photo? +confirm_delete = Da li ste sigurni da želite da obrišete ovu fotografiju? imageUpload.errorNoURI = Niste uneli URI za entitet imageUpload.errorUnrecognizedURI = URI koji ste uneli ne pripada ni jednom entitetu: ''{0}'' -imageUpload.errorNoImageForCropping = There is no image file to be cropped. +imageUpload.errorNoImageForCropping = Ne postoji datoteka slike koju želite da isečete. imageUpload.errorImageTooSmall = Slika koju hoćete da postavite mora biti makar {0} piksela visoka i {1} piksela siroka. imageUpload.errorUnknown = Došlo je do greške pri obradi slike. Molimo Vas odaberete neku drugu sliku. imageUpload.errorFileTooBig = Odaberite sliku koja zauzima manje od {0} megabajta. @@ -81,7 +81,7 @@ imageUpload.errorFormFieldMissing = Forma ne sadrži polje ''{0}''. # # User Accounts pages # -account_management = Upravljanje Nalozima +account_management = Upravljanje nalozima user_accounts_link = Korisnički nalozi user_accounts_title = korisnički nalozi @@ -90,9 +90,9 @@ last_login = Poslednja prijava add_new_account = Dodajte novi nalog edit_account = Izmenite nalog -external_auth_only = Autentifikacije isključivo puta eksternih servisa +external_auth_only = Autentifikacije isključivo putem eksternih servisa reset_password = Resetujte lozinku -reset_password_note = Napomena: Uputstva za resetovanje lozinkee će biti \ +reset_password_note = Napomena: Uputstva za resetovanje lozinke će biti \ poslata na email adresu koju ste uneli. Lozinka neće biti resetovana \ sve dok korisnik ne klikne na link koji se nalazi u email-u. new_password = Nova lozinka @@ -115,7 +115,7 @@ Lozinka neće biti resetovana sve dok korisnik ne klikne na link u email-u. deleted_accounts = {0} {0, choice, 0#naloga|1#nalog|1 Date: Fri, 8 Apr 2022 11:38:57 +0200 Subject: [PATCH 4/6] Changed pom.xml version within sr_Latn_RS to 1.12.3-SNAPSHOT --- sr_Latn_RS/pom.xml | 4 ++-- sr_Latn_RS/webapp/pom.xml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sr_Latn_RS/pom.xml b/sr_Latn_RS/pom.xml index f21382f..1764db1 100644 --- a/sr_Latn_RS/pom.xml +++ b/sr_Latn_RS/pom.xml @@ -195,8 +195,8 @@ org.vivoweb vitro-languages - 1.12.1-SNAPSHOT + 1.12.3-SNAPSHOT - 1.12.1-SNAPSHOT + 1.12.3-SNAPSHOT org.vivoweb diff --git a/sr_Latn_RS/webapp/pom.xml b/sr_Latn_RS/webapp/pom.xml index c17ba07..a422753 100644 --- a/sr_Latn_RS/webapp/pom.xml +++ b/sr_Latn_RS/webapp/pom.xml @@ -4,13 +4,13 @@ org.vivoweb vitro-languages-webapp-sr_Latn_RS - 1.12.1-SNAPSHOT + 1.12.3-SNAPSHOT war org.vivoweb vitro-languages-sr_Latn_RS - 1.12.1-SNAPSHOT + 1.12.3-SNAPSHOT .. From 3be66bd320ff07c17a47edcf8fb4b89488d0094c Mon Sep 17 00:00:00 2001 From: Veljko Maksimovic Date: Tue, 19 Apr 2022 16:16:48 +0200 Subject: [PATCH 5/6] Since a new pom.xml file was added, I added sr_Latn_RS configuration --- core/webapp/pom.xml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/core/webapp/pom.xml b/core/webapp/pom.xml index 23a1eb0..378750d 100644 --- a/core/webapp/pom.xml +++ b/core/webapp/pom.xml @@ -53,12 +53,18 @@ ${project.version} war - + org.vivoweb vitro-languages-webapp-ru_RU ${project.version} war + + org.vivoweb + vitro-languages-webapp-sr_Latn_RS + ${project.version} + war + From 1d493e9dc3dfa586cf31fb5d4dfd0c5ab69db225 Mon Sep 17 00:00:00 2001 From: Veljko Maksimovic Date: Wed, 20 Apr 2022 03:31:49 +0200 Subject: [PATCH 6/6] Renamed ftl files to have sr_Latn_RS extention instead of sr_RS --- .../{search-help_sr_RS.ftl => search-help_sr_Lant_RS.ftl} | 0 .../{termsOfUse_sr_RS.ftl => termsOfUse_sr_Latn_RS.ftl} | 0 ...ail_sr_RS.ftl => userAccounts-acctCreatedEmail_sr_Latn_RS.ftl} | 0 ...l => userAccounts-acctCreatedExternalOnlyEmail_sr_Latn_RS.ftl} | 0 ...S.ftl => userAccounts-confirmEmailChangedEmail_sr_Latn_RS.ftl} | 0 ..._RS.ftl => userAccounts-firstTimeExternalEmail_sr_Latn_RS.ftl} | 0 ...sr_RS.ftl => userAccounts-passwordCreatedEmail_sr_Latn_RS.ftl} | 0 ...ftl => userAccounts-passwordResetCompleteEmail_sr_Latn_RS.ftl} | 0 ....ftl => userAccounts-passwordResetPendingEmail_sr_Latn_RS.ftl} | 0 9 files changed, 0 insertions(+), 0 deletions(-) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{search-help_sr_RS.ftl => search-help_sr_Lant_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{termsOfUse_sr_RS.ftl => termsOfUse_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-acctCreatedEmail_sr_RS.ftl => userAccounts-acctCreatedEmail_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl => userAccounts-acctCreatedExternalOnlyEmail_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-confirmEmailChangedEmail_sr_RS.ftl => userAccounts-confirmEmailChangedEmail_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-firstTimeExternalEmail_sr_RS.ftl => userAccounts-firstTimeExternalEmail_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-passwordCreatedEmail_sr_RS.ftl => userAccounts-passwordCreatedEmail_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-passwordResetCompleteEmail_sr_RS.ftl => userAccounts-passwordResetCompleteEmail_sr_Latn_RS.ftl} (100%) rename sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/{userAccounts-passwordResetPendingEmail_sr_RS.ftl => userAccounts-passwordResetPendingEmail_sr_Latn_RS.ftl} (100%) diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/search-help_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/search-help_sr_Lant_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/search-help_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/search-help_sr_Lant_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/termsOfUse_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedEmail_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-acctCreatedExternalOnlyEmail_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-confirmEmailChangedEmail_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-firstTimeExternalEmail_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordCreatedEmail_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetCompleteEmail_sr_Latn_RS.ftl diff --git a/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl b/sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_Latn_RS.ftl similarity index 100% rename from sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_RS.ftl rename to sr_Latn_RS/webapp/src/main/webapp/templates/freemarker/userAccounts-passwordResetPendingEmail_sr_Latn_RS.ftl