Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improvements to translations #1320

Merged
merged 4 commits into from Jun 14, 2019

Conversation

Projects
None yet
3 participants
@okahilak
Copy link
Collaborator

commented Jun 5, 2019

No description provided.

@okahilak okahilak force-pushed the improvements-to-translations branch 2 times, most recently from ce81241 to eff9e6e Jun 5, 2019

@okahilak okahilak force-pushed the improvements-to-translations branch from eff9e6e to 963f1b8 Jun 6, 2019

@Macroz
Copy link
Collaborator

left a comment

There are some translations I do not like but I'll rather wait for real user testing than argue them here.

Show resolved Hide resolved resources/translations/en.edn
:change-workflow-error "The resources can't be applied with this application. Change them or make a new application."
:change-workflow-warning "Workflow is different from the workflow of the original application."
:bundling-error "Application bundling not possible."
:bundling-warning "Applications of different resources can't be bundled into one application if they have different forms or workflows."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

I don't think this is an improvement. Maybe "These resources can't be ...". There is no relation to grouping of applications here when you are changing the resources of one application. Doesn't make sense to the user.

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

See also point about normally or regularly below in the Finnish variant.

This comment has been minimized.

Copy link
@UFOPOLI

UFOPOLI Jun 7, 2019

Here I wasn't aware of the context the string would appear in. Fixed.

:license-in-use "License is in use by:"
:resource-in-use "Resource is in use by:"
:workflow-in-use "Workflow is in use by:"}
:errors {:duplicate-resid "Duplicate resource."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

This should really mention the organization because it explains the point.

This comment has been minimized.

Copy link
@UFOPOLI
:form {:accepted-licenses "Accepted terms of use"
:actions "Actions"
:add-comments-not-shown-to-applicant "Add comment (not shown to applicant)"
:add-comments-shown-to-applicant "Add comment (shown to applicant)"
:alert-disabled-resources "The following resources can't be applied anymore."
:alert-disabled-resources "Resources not available."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

This situation relates to a situation where before the resources were available and now they are not anymore. Therefore I think the previous error message is better.

This comment has been minimized.

Copy link
@UFOPOLI

UFOPOLI Jun 7, 2019

Added "enää" / "no longer". The previous message wasn't grammatical to begin with.

:maxlength "(max %1 characters)"
:must-accept-licenses "To be eligible to the resources of this application, each member must accept the following terms of use."
:must-accept-licenses "Accepting the terms of use is required to access the resources."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

How about also mentioning that each member must accept them? It makes it clearer.

This comment has been minimized.

Copy link
@UFOPOLI
:alert-disabled-resources "Seuraavia resursseja ei voi enää hakea."
:add-comments-not-shown-to-applicant "Kommentoi (ei näy hakijalle)"
:add-comments-shown-to-applicant "Kommentoi (näkyy hakijalle)"
:alert-disabled-resources "Resurssit eivät ole haettavissa."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

Same as English that "enää" is important

This comment has been minimized.

Copy link
@UFOPOLI
:licenses "Käyttöehdot"
:maxlength "(enintään %1 merkkiä)"
:must-accept-licenses "Saadakseen oikeudet haettuihin resursseihin, jokaisen hakijan pitää hyväksyä seuraavat käyttöehdot."
:must-accept-licenses "Hakijan on hyväksyttävät käyttöehdot käyttääkseen resursseja."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

See English.

This comment has been minimized.

Copy link
@UFOPOLI
@@ -272,7 +272,7 @@
:logout "Kirjaudu ulos"
:skip-navigation "Siirry sivun pääsisältöön"}
:not-found-page {:not-found "Sivua ei löytynyt"
:page-was-not-found "Tätä sivua ei löytynyt."}
:page-was-not-found "Sivua ei löydy."}

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

This should be matched to the heading. It can be shorter and the main explanation should be longer. See also English.

This comment has been minimized.

Copy link
@UFOPOLI
@@ -286,6 +286,6 @@
:open-search "Avaa haku"
:search-parameters "Hakutermit"}
:unauthorized-page {:unauthorized "Ei käyttöoikeuksia"
:you-are-unauthorized "Sinulla ei ole käyttöoikeuksia tähän sivuun."}
:you-are-unauthorized "Ei sivun käyttöoikeuksia."}

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

This should be matched to the heading. It can be shorter and the main explanation should be longer. See also English.

This comment has been minimized.

Copy link
@UFOPOLI
:forbidden-page {:forbidden "Kielletty"
:you-are-forbidden "Sinulla ei ole pääsyä tähän sivuun."}}}
:you-are-forbidden "Sivun käyttö kielletty."}}}

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 6, 2019

Collaborator

This should be matched to the heading. It can be shorter and the main explanation should be longer. See also English.

This comment has been minimized.

Copy link
@UFOPOLI

UFOPOLI Jun 7, 2019

Isn't this already matched? "Kielletty" vs. "Sivun käyttö kielletty."

@okahilak okahilak changed the title Improvements to translations, from Tero Aalto Improvements to translations Jun 6, 2019

@okahilak okahilak requested a review from Macroz Jun 10, 2019

@okahilak okahilak force-pushed the improvements-to-translations branch 2 times, most recently from 78c9c6e to 6fc1963 Jun 10, 2019

@okahilak okahilak force-pushed the improvements-to-translations branch from 6fc1963 to 0dfacb0 Jun 10, 2019

@Macroz

Macroz approved these changes Jun 12, 2019

Copy link
Collaborator

left a comment

I added a couple clarifications still that I hope you will fix, but otherwise these seem good now and approved for merging. Thanks.

:change-workflow-error "The resources can't be applied with this application. Change them or make a new application."
:change-workflow-warning "Workflow is different from the workflow of the original application."
:bundling-error "Application bundling not possible."
:bundling-warning "Applications of the resources can't normally be bundled into one application if they have different forms or workflows."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 12, 2019

Collaborator

This is the warning that a handler gets when resources of the application have been changed into incompatible ones. The new phrase doesn't make much sense.

How about just keeping the original.

"The resources can't normally be bundled into one application because they have different forms or workflows."

This comment has been minimized.

Copy link
@okahilak

okahilak Jun 14, 2019

Author Collaborator

I think you're right, the original is actually better, as far as I understand correctly what is meant by this warning. Done, in both Finnish and English translations.

:accept-licenses "Hyväksy käyttöehdot"
:add-licenses "Lisää käyttöehto"
:add-member "Lisää jäsen"
:bundling-error "Resursseja ei voi hakea samalla hakemuksella."
:bundling-warning "Resursseja ei tavallisesti voi hakea samalla hakemuksella, koska niillä on eri lomake tai työvuo."

This comment has been minimized.

Copy link
@Macroz

Macroz Jun 12, 2019

Collaborator

There is a concrete case here that after changing the resources, there is now a conflict between the form or workflow so I'd put "koska" instead of "jos".

See the English common version

The resources can't normally be bundled into one application because they have different forms or workflows."

Therefore the LBR version could use language resources here (or just resources).

okahilak added some commits Jun 14, 2019

@okahilak okahilak merged commit 62ccece into master Jun 14, 2019

7 checks passed

WIP Ready for review
Details
ci/circleci: build Your tests passed on CircleCI!
Details
ci/circleci: doo Your tests passed on CircleCI!
Details
ci/circleci: ok Your tests passed on CircleCI!
Details
ci/circleci: test Your tests passed on CircleCI!
Details
ci/circleci: war Your tests passed on CircleCI!
Details
ci/circleci: without-db Your tests passed on CircleCI!
Details

@okahilak okahilak deleted the improvements-to-translations branch Jun 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.