Skip to content
This repository has been archived by the owner on Dec 6, 2022. It is now read-only.

Removed dateTimeWithPrecision_fr_CA.ftl and added properties required to work with improved dateTimeWithPrecision.ftl #89

Merged
merged 3 commits into from Jan 29, 2021

Conversation

nicalico
Copy link
Contributor

@nicalico nicalico commented Jan 28, 2021

Fix to : https://jira.lyrasis.org/browse/VIVO-1877
Related PR :

What it does

Adds the properties required to make dateTimeWithPrecision.ftl core file universal (vivo-project/Vitro#203).
Also, removed unnecessary dateTimeWithPrecision_fr_CA.ftl file

How to test it

Browse to Events > [some event] > Overview > date/time interval > add and check labels in the form.
Fix has been tested with fr_CA, en_CA, en_US, pt_BR, de_DE and es contexts.

… to work with improved dateTimeWithPrecision.ftl
@dofeldsc
Copy link
Contributor

The german translation is good with the exception of
label.dateTimeWithPrecision.hour_capitalized = Uhrzeit
should be
label.dateTimeWithPrecision.hour_capitalized = Stunde

@nicalico
Copy link
Contributor Author

@dofeldsc While searching Urhzeit to correct it, I found that it is the term used elsewhere... Should I leave it as is?
image

@dofeldsc
Copy link
Contributor

In my opinion, the other two should rather be "Zeitintervall", "Uhrzeit" means time in german..."Zeit" also means time. But for intervals it should be "Zeitintervall". Correct me if i am wrong my german speaking friends :)

@hauschke
Copy link
Member

No correction. Date-Time-Intervall shouls be Zeitraum or Zeitintervall. I would prefer Zeitraum.

@nicalico
Copy link
Contributor Author

Gentlemen, I had my fair share of deutsche grammar arguments in another life, and proved many time how clueless I was. I'll let you confer and decide what to do here.

@dofeldsc
Copy link
Contributor

dofeldsc commented Jan 28, 2021

We had a brief discussion and were able to agree on the following
label.dateTimeWithPrecision.hour_capitalized = Stunde
incomplete_date_time_interval = unvollständiges Datums-/ Zeitintervall
incomplete_date_time_value = unvollständiger Datums-/ Zeitwert

@nicalico
Copy link
Contributor Author

@awoods An agreement was reached on German translation.

@gneissone
Copy link
Member

Since the template file is part of core Vitro, shouldn't these i18n strings be in the Vitro-languages repo instead of this one?

@gneissone gneissone self-requested a review January 28, 2021 20:14
@nicalico
Copy link
Contributor Author

@gneissone Makes sense. label.dateTimeWithPrecision.year_capitalized was already there, and I merely added the rest underneath. If it's deemed preferable, I'll move all those properties in the corresponding /vitro-languages/[locale]/webapp/src/main/webapp/i18n/all_[locale].properties

@awoods
Copy link
Member

awoods commented Jan 28, 2021

Agreed. Aligning Vitro-language updates with Vitro, and VIVO-language updates with VIVO is the pattern to follow. Among other things, it allows for the continued use of Vitro as a standalone project.

@nicalico
Copy link
Contributor Author

Will do.

@nicalico
Copy link
Contributor Author

Since it was not a full revert to the original files, and since I'm not mastering squash, I just went with a new commit. Sorry for the mess.

@awoods awoods merged commit e448c48 into vivo-project:sprint-i18n Jan 29, 2021
@nicalico nicalico deleted the VIVO-1877 branch January 29, 2021 14:59
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
5 participants