From 03813b40af165195d9f8bda08458f3a95c91fbc3 Mon Sep 17 00:00:00 2001
From: Florian Scholdei <florian.scholdei@cloudogu.com>
Date: Fri, 18 Jan 2019 10:25:35 +0100
Subject: [PATCH] updated profile navigation + some naming changes

---
 scm-ui/public/locales/en/commons.json         | 7 +++----
 scm-ui/public/locales/en/repos.json           | 6 +++---
 scm-ui/public/locales/en/users.json           | 6 +++---
 scm-ui/src/containers/Profile.js              | 8 +++-----
 scm-ui/src/repos/containers/RepositoryRoot.js | 4 ++--
 scm-ui/src/users/containers/SingleUser.js     | 4 ++--
 6 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/scm-ui/public/locales/en/commons.json b/scm-ui/public/locales/en/commons.json
index 3196f3a328..ca4a1c87bf 100644
--- a/scm-ui/public/locales/en/commons.json
+++ b/scm-ui/public/locales/en/commons.json
@@ -43,13 +43,12 @@
     "previous": "Previous"
   },
   "profile": {
-    "navigation-label": "Navigation",
-    "actions-label": "Actions",
+    "navigationLabel": "Profile Navigation",
+    "informationNavLink": "Information",
+    "changePasswordNavLink": "Change password",
     "username": "Username",
     "displayName": "Display Name",
     "mail": "E-Mail",
-    "information": "Information",
-    "change-password": "Change password",
     "error-title": "Error",
     "error-subtitle": "Cannot display profile",
     "error": "Error",
diff --git a/scm-ui/public/locales/en/repos.json b/scm-ui/public/locales/en/repos.json
index a1b006a1da..68f5b4a53b 100644
--- a/scm-ui/public/locales/en/repos.json
+++ b/scm-ui/public/locales/en/repos.json
@@ -17,13 +17,13 @@
     "create-button": "Create"
   },
   "repository-root": {
-    "error-title": "Error",
-    "error-subtitle": "Unknown repository error",
     "navigationLabel": "Repository Navigation",
     "historyNavLink": "Commits",
     "informationNavLink": "Information",
     "permissionsNavLink": "Permissions",
-    "sourcesNavLink": "Sources"
+    "sourcesNavLink": "Sources",
+    "errorTitle": "Error",
+    "errorSubtitle": "Unknown repository error"
   },
   "create": {
     "title": "Create Repository",
diff --git a/scm-ui/public/locales/en/users.json b/scm-ui/public/locales/en/users.json
index e7a637bc2b..e388081504 100644
--- a/scm-ui/public/locales/en/users.json
+++ b/scm-ui/public/locales/en/users.json
@@ -34,12 +34,12 @@
     "subtitle": "Create a new user"
   },
   "single-user": {
-    "error-title": "Error",
-    "error-subtitle": "Unknown user error",
     "navigationLabel": "User Navigation",
     "informationNavLink": "Information",
     "editNavLink": "Edit",
-    "setPasswordNavLink": "Set password"
+    "setPasswordNavLink": "Set password",
+    "errorTitle": "Error",
+    "errorSubtitle": "Unknown user error"
   },
   "validation": {
     "mail-invalid": "This email is invalid",
diff --git a/scm-ui/src/containers/Profile.js b/scm-ui/src/containers/Profile.js
index b40f5f3ee0..b28a8cd705 100644
--- a/scm-ui/src/containers/Profile.js
+++ b/scm-ui/src/containers/Profile.js
@@ -69,13 +69,11 @@ class Profile extends React.Component<Props, State> {
           </div>
           <div className="column">
             <Navigation>
-              <Section label={t("profile.navigation-label")}>
-                <NavLink to={`${url}`} label={t("profile.information")} />
-              </Section>
-              <Section label={t("profile.actions-label")}>
+              <Section label={t("profile.navigationLabel")}>
+                <NavLink to={`${url}`} label={t("profile.informationNavLink")} />
                 <NavLink
                   to={`${url}/password`}
-                  label={t("profile.change-password")}
+                  label={t("profile.changePasswordNavLink")}
                 />
               </Section>
             </Navigation>
diff --git a/scm-ui/src/repos/containers/RepositoryRoot.js b/scm-ui/src/repos/containers/RepositoryRoot.js
index bdfa74d5d7..9fcae12c53 100644
--- a/scm-ui/src/repos/containers/RepositoryRoot.js
+++ b/scm-ui/src/repos/containers/RepositoryRoot.js
@@ -80,8 +80,8 @@ class RepositoryRoot extends React.Component<Props> {
     if (error) {
       return (
         <ErrorPage
-          title={t("repository-root.error-title")}
-          subtitle={t("repository-root.error-subtitle")}
+          title={t("repository-root.errorTitle")}
+          subtitle={t("repository-root.errorSubtitle")}
           error={error}
         />
       );
diff --git a/scm-ui/src/users/containers/SingleUser.js b/scm-ui/src/users/containers/SingleUser.js
index c980585141..1662d213c5 100644
--- a/scm-ui/src/users/containers/SingleUser.js
+++ b/scm-ui/src/users/containers/SingleUser.js
@@ -80,8 +80,8 @@ class SingleUser extends React.Component<Props> {
     if (error) {
       return (
         <ErrorPage
-          title={t("single-user.error-title")}
-          subtitle={t("single-user.error-subtitle")}
+          title={t("single-user.errorTitle")}
+          subtitle={t("single-user.errorSubtitle")}
           error={error}
         />
       );