Skip to content

Commit

Permalink
MIR-1278 Split 'mir.accesskey.setInfo' into multiple i18n keys to avo…
Browse files Browse the repository at this point in the history
…id invalid xml during transformation (#955)

* MIR-1278 Split 'mir.accesskey.setInfo' into multiple i18n keys to avoid invalid xml during transformation

* MIR-1278 Applied requested changes. Fixed English for i18n 'mir.help.place '

* MIR-1278 Added comma

* MIR-1278 Added comma, continued

* MIR-1278 Fixed comma
  • Loading branch information
Possommi authored Feb 23, 2024
1 parent 979db3b commit 80d3802
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,13 @@ mir.access = Zugriffsberechtigung
mir.accesskey = Zugriffsschl\u00FCssel
mir.accesskey.manage = Zugriffsschl\u00FCssel verwalten
mir.accesskey.required = Bitte geben Sie einen Zugriffsschl\u00FCssel ein.
mir.accesskey.setInfo = Gegebenenfalls besteht die M\u00F6glichkeit mit einem Zugriffsschl\u00FCssel \u00FCber folgenden <a href="{0}">Link</a> auf das Dokument zuzugreifen.
mir.accesskey.setInfo.leading = Gegebenenfalls besteht die M\u00F6glichkeit, mit einem Zugriffsschl\u00FCssel \u00FCber folgenden
mir.accesskey.setInfo.link = Link
mir.accesskey.setInfo.trailing = auf das Dokument zuzugreifen.
mir.accesskey.setOnUser = Zugriffsschl\u00FCssel aktivieren
mir.actions = Aktionen
mir.actions.noaccess = Um das Dokument zu bearbeiten, melden Sie sich bitte an.
mir.actions.norights = Sie besitzen nicht die ben\u00F6tigten Rechte um das Dokument zu bearbeiten.
mir.actions.norights = Sie besitzen nicht die ben\u00F6tigten Rechte, um das Dokument zu bearbeiten.
mir.admineditor = Bearbeiten im Admin-Editor
mir.affiliation = Zugeh\u00F6rigkeit
mir.articlenumber = Artikelnummer:
Expand Down
10 changes: 6 additions & 4 deletions mir-module/src/main/resources/config/mir/messages_en.properties
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,10 @@ mir.access = Access permissions
mir.accesskey = Access key
mir.accesskey.manage = Manage access keys
mir.accesskey.required = Please input an access key.
mir.accesskey.setInfo = You may access the document with an access key via the following <a href="{0}">link</a>.
mir.accesskey.setOnUser = Activate access key
mir.accesskey.setInfo.leading = You may access the document with an access key via the following
mir.accesskey.setInfo.link = link
mir.accesskey.setInfo.trailing = .
mir.accesskey.setOnUser = Set access key
mir.actions = Actions
mir.actions.noaccess = To edit the document, please log in.
mir.actions.norights = You don't have the rights to edit the document.
Expand Down Expand Up @@ -316,7 +318,7 @@ mir.error.accessKeyRequired = Access to the object <i>"{0}"</
mir.error.blocked = The document is blocked!
mir.error.codes.202 = The request <i>"{0}"</i> was accepted for processing, but was not completed.
mir.error.codes.400 = The request <i>"{0}"</i> sent was syntactically incorrect.
mir.error.codes.401 = You do not have the privilege to acces this page.
mir.error.codes.401 = You do not have the privilege to access this page.
mir.error.codes.403 = The server understood the request <i>"{0}"</i> but refused to fulfill it.
mir.error.codes.404 = The requested URL <i>"{0}"</i> was not found on this server.
mir.error.codes.409 = The request <i>"{0}"</i> could not be completed due to a conflict with the current state of the resource.
Expand Down Expand Up @@ -424,7 +426,7 @@ mir.help.namePart = Partitioning of the name in dif
mir.help.nameType = Type of the name.
mir.help.physical.description.form = A designation of a particular physical presentation of a resource, including the physical form or medium of material for a resource.
mir.help.physical.description.note = Detailed description of the data structure, incl. variable/parameter description, units of measure, data standards used, data types (e.g. numeric, string).
mir.help.place = The former publication of the publication.
mir.help.place = The first mentioned place of publication of the publication.
mir.help.place.country = Country of publication.
mir.help.producer.speaker = A person contributing to a resource by speaking words, such as a lecture, speech, etc.
mir.help.project.acronym = Type your project code here, an autocomplete from the listed OpenAIRE projects is offered too.
Expand Down
9 changes: 7 additions & 2 deletions mir-module/src/main/resources/xsl/layout/mir-layout-utils.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,13 @@
<xsl:template name="displaySetAccessKey">
<xsl:param name="objectId" />
<xsl:variable name="loginURL" select="concat($WebApplicationBaseURL, 'accesskey/set.xed', '?objId=', $objectId, '&amp;url=', encoder:encode(string($RequestURL)))" />
<br></br>
<xsl:value-of disable-output-escaping="yes" select="i18n:translate('mir.accesskey.setInfo', $loginURL)" />
<br/>

<xsl:value-of select="concat(i18n:translate('mir.accesskey.setInfo.leading'), ' ')" />
<a href="{$loginURL}">
<xsl:value-of select="i18n:translate('mir.accesskey.setInfo.link')"/>
</a>
<xsl:value-of select="concat(' ', i18n:translate('mir.accesskey.setInfo.trailing'))" />
</xsl:template>

<xsl:template name="mir.printNotLoggedIn">
Expand Down

0 comments on commit 80d3802

Please sign in to comment.