Navbar & translations

core/client/navbar/navbar.html

@@ -27,15 +27,15 @@
               <li class="{{ isActiveRoute 'dashboard' }}">
                 <a href="/dashboard">
                   <i class="fa fa-bar-chart" aria-hidden="true"></i>
-                  {{_ "Dashboard" }}
+                  {{_ "navbar_dashboard" }}
                 </a>
               </li>
             {{/ if }}
           {{/ if }}
           <li class="{{ isActiveRoute 'catalogue' }}">
             <a href="{{ pathFor route='catalogue' }}">
               <i class="fa fa-book" aria-hidden="true"></i>
-              {{_ "masterLayout_sidebar_Catalogue" }}
+              {{_ "navbar_catalogue" }}
             </a>
           </li>
           {{# if currentUser }}
@@ -44,15 +44,15 @@
               <a href="{{ pathFor route='addApi' }}">
                 <i class="fa fa-plus" aria-hidden="true"></i>
 
-                {{_ "masterLayout_sidebar_AddAPIBackend" }}
+                {{_ "navbar_addAPIBackend" }}
               </a>
             </li>
             {{/ if }}
             {{# if isInRole 'admin' }}
               <li class="{{ isActiveRoute 'accountsAdmin' }}">
                 <a href="{{ pathFor route='accountsAdmin' }}">
                   <i class="fa fa-users" aria-hidden="true"></i>
-                  {{_ "masterLayout_sidebar_Users" }}
+                  {{_ "navbar_users" }}
                 </a>
               </li>
             {{/ if }}
@@ -65,13 +65,13 @@
           <li>
             <a class="close-navbar" href="/sign-up">
               <i class="fa fa-user-plus" aria-hidden="true"></i>
-              {{_ "signup" }}
+              {{_ "navbar_signUp" }}
             </a>
           </li>
           <li>
             <a class="close-navbar" href="/sign-in">
               <i class="fa fa-sign-in" aria-hidden="true"></i>
-              {{_ "login" }}
+              {{_ "navbar_signIn" }}
             </a>
           </li>
           {{/ if }}
@@ -84,7 +84,7 @@
           <li>
             <a id="about-button">
               <i class="fa fa-question-circle" aria-hidden="true"></i>
-              {{_ "navbar_aboutButton_text" }}
+              {{_ "navbar_about" }}
             </a>
           </li>
         </ul>

core/lib/i18n/en.i18n.json

@@ -271,12 +271,9 @@
   "homeBody_section3_heading": "Completely open source",
   "homeBody_section3_text": "APinf is powered by API Umbrella and builds a dashboard on top of the API Umbrella features. The solution is fully open source licensed with MIT. It is written in Meteor.js and D3. We like to collaborate, to listen to our users and want to encourage people to become contributors.",
   "homeBody_section3_text_extra": "Find us in ",
-  "homeHeader_apiCatalogue": "API Catalog",
-  "homeHeader_dashboardLink_text": "Dashboard",
-  "homeHeader_signIn": "Sign In",
-  "homeHeader_signUp": "Sign Up",
-  "homeHeader_toggleNavigation": "Toggle navigation",
   "homeFooter_dashboardLink_text": "Dashboard",
+  "homeFooter_signIn": "Sign In",
+  "homeFooter_signUp": "Sign Up",
   "importApiConfiguration_errorMessage": "Config file must be either in .YAML, .YML, .JSON or .TXT format.",
   "import_ApiConfiguration_Drop": "Drop your file here",
   "import_ApiConfiguration_File": "File:",
@@ -309,11 +306,13 @@
   "manageApiDocumentationModal_hints_documentation_link": "Link to the Wiki, Github page or other web resource where the documentation of your API is located",
   "manageApiDocumentationModal_hints_uploadApiDocumentation": "You can also choose to create a new documentation file for your API using Swagger editor",
   "manageApiDocumentationModal_openDocumentationEditor": "Open API documentation editor",
-  "masterLayout_sidebar_APIBackends": "API Backends",
-  "masterLayout_sidebar_AddAPIBackend": "Add API",
-  "masterLayout_sidebar_Catalogue": "Catalog",
-  "masterLayout_sidebar_Users": "Users",
-  "navbar_aboutButton_text": "About",
+  "navbar_addAPIBackend": "Add API",
+  "navbar_about": "About",
+  "navbar_catalogue": "Catalog",
+  "navbar_dashboard": "Dashboard",
+  "navbar_signIn": "Sign In",
+  "navbar_signUp": "Sign Up",
+  "navbar_users": "Users",
   "notAuthorized_Message": "You are not authorized to access this page.",
   "notAuthorized_Title": "Not Authorized",
   "notFound_Message_Part1": "We could not find the page you were looking for.",

core/lib/i18n/fi.i18n.json

@@ -439,12 +439,9 @@
     "homeBody_section3_heading": "T\u00e4ysin avointa l\u00e4hdekoodia",
     "homeBody_section3_text": "APInfin moottorina toimii API Umbrella. APInf tarjoaa k\u00e4ytt\u00f6liittym\u00e4kerroksen API Umbrellan toiminnoille. Ratkaisu on kehitetty avoimena l\u00e4hdekoodina ja lisensoitu MIT-lisenssill\u00e4. K\u00e4ytt\u00f6liittym\u00e4n rakentamiseeen on k\u00e4ytetty Meteor.js- ja D3-teknologioita. Arvostamme yhteisty\u00f6t\u00e4, pyrimme kuuntelemaan k\u00e4ytt\u00e4ji\u00e4mme ja rohkaisemaan ihmisi\u00e4 liittym\u00e4\u00e4n kehitt\u00e4jiksi.",
     "homeBody_section3_text_extra": "L\u00f6yd\u00e4t meid\u00e4t sosiaalisesta mediasta:",
-    "homeHeader_apiCatalogue": "Rajapintaluettelo",
-    "homeHeader_dashboardLink_text": "Analytiikkan\u00e4kym\u00e4",
-    "homeHeader_signIn": "Kirjaudu",
-    "homeHeader_signUp": "Rekister\u00f6idy",
-    "homeHeader_toggleNavigation": "Vaihtele navigaatiota",
     "homeFooter_dashboardLink_text": "Analytiikkan\u00e4kym\u00e4",
+    "homeFooter_signUp": "Rekister\u00f6idy",
+    "homeFooter_signIn": "Kirjaudu",
     "importApiConfiguration_errorMessage": "Konfiguraatiotiedoston tulee olla .YAML-, .YML-, .JSON- tai .TXT-muodossa.",
     "import_ApiConfiguration_Drop": "Raahaa tiedosto t\u00e4h\u00e4n",
     "import_ApiConfiguration_File": "Tiedosto:",
@@ -477,12 +474,13 @@
     "manageApiDocumentationModal_hints_documentation_link": "Linkki Wiki- tai Github-sivuun tai muuhun verkkoresurssiin, josta rajapintasi dokumentaatio on luettavissa.",
     "manageApiDocumentationModal_hints_uploadApiDocumentation": "Voit my\u00f6s luoda uuden dokumentaatiotiedoston rajapinnallesi k\u00e4ytt\u00e4en Swagger-muokkausohjelmaa.",
     "manageApiDocumentationModal_openDocumentationEditor": "Avaa dokumentaation muokkausohjelma",
-    "masterLayout_sidebar_APIBackends": "Rajapinnat",
-    "masterLayout_sidebar_AddAPIBackend": "Lis\u00e4\u00e4 rajapinta",
-    "masterLayout_sidebar_Catalogue": "Luettelo",
-    "masterLayout_sidebar_ManageAPIBackends": "Hallinnoi rajapintoja",
-    "masterLayout_sidebar_Users": "K\u00e4ytt\u00e4j\u00e4t",
-    "navbar_aboutButton_text": "Tietoja",
+    "navbar_about": "Tietoja",
+    "navbar_addAPIBackend": "Lis\u00e4\u00e4 rajapinta",
+    "navbar_catalogue": "Luettelo",
+    "navbar_dashboard": "Analytiikkan\u00e4kym\u00e4",
+    "navbar_signUp": "Rekister\u00f6idy",
+    "navbar_signIn": "Kirjaudu",
+    "navbar_users": "K\u00e4ytt\u00e4j\u00e4t",
     "notAuthorized_Message": "Sinulla ei ole oikeutta tarkastella t\u00e4t\u00e4 sivua.",
     "notAuthorized_Title": "Ei oikeuksia.",
     "notFound_Message_Part1": "Hakemaasi sivua ei l\u00f6ytynyt.",
@@ -619,4 +617,4 @@
     "viewApi_Title": "Tarkastele rajapintaa",
     "visibilityToggle_buttonPrivate": "Muuta yksityiseksi",
     "visibilityToggle_buttonPublic": "Muuta julkiseksi"
-}
+}

home/client/footer/homeFooter.html

@@ -20,7 +20,7 @@
         </div>
         <div class="col-lg-2">
           <ul class="list-inline quicklinks">
-            {{# if User }}
+            {{# if currentUser }}
             <li>
               <a href="{{ pathFor 'dashboard' }}">
                 {{_ "homeFooter_dashboardLink_text" }}
@@ -29,12 +29,12 @@
             {{ else }}
             <li>
               <a href="{{ pathFor 'atSignIn' }}">
-                {{_ "signIn" }}
+                {{_ "homeFooter_signIn" }}
               </a>
             </li>
             <li>
               <a href="{{ pathFor 'atSignUp' }}">
-                {{_ "signUp" }}
+                {{_ "homeFooter_signUp" }}
               </a>
             </li>
             {{/ if }}