UBO-250 make user profile more generic (#297)

* UBO-250 make user profile more generic * UBO-250 fix password change link if current user is logged in
MyCoRe-Org · Jul 3, 2023 · f92dd86 · f92dd86
1 parent 8ee0e6b
commit f92dd86
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 33 deletions.
diff --git a/ubo-common/src/main/resources/config/ubo-common/messages_de.properties b/ubo-common/src/main/resources/config/ubo-common/messages_de.properties
@@ -1194,27 +1194,27 @@ upload.successful  = Upload erfolgreich
 
 urn.create = URN erzeugen
 
-user.profile                                               = Mein Profil
-user.profile.account                                       = Ihre Benutzerkennung
-user.profile.eMail                                         = Ihre E-Mail-Adresse
-user.profile.id.connection                                 = interne Connection-ID
-user.profile.id.gnd                                        = Ihre GND
-user.profile.id.local                                      = Ihre lokale ID
-user.profile.id.lsf                                        = Ihre LSF iD
-user.profile.id.orcid                                      = Ihre ORCID iD
-user.profile.id.scopus                                     = Ihre SCOPUS Autoren-iD
-user.profile.publications                                  = Ihre Publikationen
+user.profile                                               = Profil
+user.profile.account                                       = Benutzerkennung
+user.profile.eMail                                         = E-Mail-Adresse
+user.profile.id.connection                                 = Interne Connection-ID
+user.profile.id.gnd                                        = GND
+user.profile.id.local                                      = Lokale ID
+user.profile.id.lsf                                        = LSF iD
+user.profile.id.orcid                                      = ORCID iD
+user.profile.id.scopus                                     = SCOPUS Autoren-iD
+user.profile.publications                                  = Publikationen
 user.profile.publications.num.multiple                     = {0} Publikationen
 user.profile.publications.num.none                         = keine Publikationen
 user.profile.publications.num.one                          = eine Publikation
 user.profile.publications.orcid.intro                      = Ihr ORCID-Profil enth\u00E4lt
 user.profile.publications.ubo.intro                        = Die Universit\u00E4tsbibliographie enth\u00E4lt 
-user.profile.publications.ubo.outro                        = \ mit Ihnen eindeutig zugeordneter LSF ID
+user.profile.publications.ubo.outro                        = \ mit diesem Profil eindeutig zugeordneter LSF ID
 user.profile.publications.ubo.published.extro.plural.false = im Status <strong>redaktionell gepr\u00FCft</strong>.
 user.profile.publications.ubo.published.extro.plural.true  = im Status <strong>redaktionell gepr\u00FCft</strong>.
 user.profile.publications.ubo.published.intro.plural.false = Davon ist  
 user.profile.publications.ubo.published.intro.plural.true  = Davon sind 
-user.profile.realName                                      = Ihr Name
+user.profile.realName                                      = Name
 
 video.bitRate                         = Bitrate
 video.bitRate.kBit                    = kBit

diff --git a/ubo-common/src/main/resources/config/ubo-common/messages_en.properties b/ubo-common/src/main/resources/config/ubo-common/messages_en.properties
@@ -1186,28 +1186,28 @@ upload.successful  = Upload successful
 
 urn.create = Create URN
 
-user.profile                                               = My profile
-user.profile.account                                       = Your account
-user.profile.eMail                                         = Your e-mail address
-user.profile.id.connection                                 = internal connection id
-user.profile.id.gnd                                        = Your GND
-user.profile.id.local                                      = Your local ID
-user.profile.id.lsf                                        = Your LSF iD
-user.profile.id.orcid                                      = Your ORCID iD
-user.profile.id.scopus                                     = Your SCOPUS author iD
-user.profile.publications                                  = Your publications
+user.profile                                               = Profile
+user.profile.account                                       = Account
+user.profile.eMail                                         = E-Mail address
+user.profile.id.connection                                 = Internal connection id
+user.profile.id.gnd                                        = GND
+user.profile.id.local                                      = Local ID
+user.profile.id.lsf                                        = LSF iD
+user.profile.id.orcid                                      = ORCID iD
+user.profile.id.scopus                                     = SCOPUS author iD
+user.profile.publications                                  = Publications
 user.profile.publications.num.multiple                     = {0} publications
 user.profile.publications.num.none                         = no publications
 user.profile.publications.num.one                          = one publication
 user.profile.publications.orcid.intro                      = Your ORCID record contains
 user.profile.publications.ubo.intro                        = The university bibliography contains
-user.profile.publications.ubo.outro                        = \ linked to your personal LSF ID
-user.profile.publications.ubo.published.extro.plural.false = is in state <strong> editorially checked</strong>.
-user.profile.publications.ubo.published.extro.plural.true  = are in state <strong> editorially checked</strong>.
+user.profile.publications.ubo.outro                        = \ linked to this LSF ID
+user.profile.publications.ubo.published.extro.plural.false = is in state <strong>editorially checked</strong>.
+user.profile.publications.ubo.published.extro.plural.true  = are in state <strong>editorially checked</strong>.
 user.profile.publications.ubo.published.intro              = With actually
 user.profile.publications.ubo.published.intro.plural.false = Thereof 
 user.profile.publications.ubo.published.intro.plural.true  = Therof 
-user.profile.realName                                      = Your name
+user.profile.realName                                      = Name
 
 video.bitRate                         = Bitrate
 video.bitRate.kBit                    = kBit

diff --git a/ubo-common/src/main/resources/xsl/user.xsl b/ubo-common/src/main/resources/xsl/user.xsl
@@ -415,19 +415,19 @@
             <xsl:value-of select="i18n:translate('component.user2.admin.changedata')" />
           </a>
         </xsl:when>
-        <!-- xsl:when test="not($isCurrentUser)">
-          <a class="btn btn-secondary" href="{$WebApplicationBaseURL}authorization/change-read-user.xed?action=save&amp;id={$uid}">
-            <xsl:value-of select="i18n:translate('component.user2.admin.changedata')" />
-          </a>
-        </xsl:when -->
         <xsl:when test="$isCurrentUser and not(/user/@locked = 'true')">
           <a class="btn btn-secondary" href="{$WebApplicationBaseURL}authorization/change-current-user.xed?action=saveCurrentUser">
             <xsl:value-of select="i18n:translate('component.user2.admin.changedata')" />
           </a>
         </xsl:when>
       </xsl:choose>
-      <xsl:if test="/user/@realm = 'local' and (not($isCurrentUser) or not(/user/@locked = 'true'))">
-        <a class="btn btn-primary" href="{$WebApplicationBaseURL}authorization/change-password.xed?action=password&amp;userName={$uid}">
+      <xsl:if test="/user/@realm = 'local' and $isCurrentUser and not(/user/@locked = 'true')">
+        <a class="btn btn-primary" href="{$WebApplicationBaseURL}authorization/change-password.xed?action=password">
+          <xsl:value-of select="i18n:translate('component.user2.admin.changepw')" />
+        </a>
+      </xsl:if>
+      <xsl:if test="/user/@realm = 'local' and not($isCurrentUser)">
+        <a class="btn btn-primary" href="{$WebApplicationBaseURL}authorization/change-password.xed?action=password&amp;id={$uid}">
           <xsl:value-of select="i18n:translate('component.user2.admin.changepw')" />
         </a>
       </xsl:if>