Merge branch 'master' into denys-proxy-settings

src/app.config.json

@@ -1,18 +1,64 @@
 {
-  "ecmHost": "http://{hostname}:{port}",
+    "ecmHost": "http://{hostname}:{port}",
-  "application": {
+    "application": {
-      "name": "Alfresco Example Content Application",
+        "name": "Alfresco Example Content Application",
-      "build": "1234"
+        "build": "1234"
-  },
+    },
-  "document-list": {
+    "document-list": {
-      "supportedPageSizes": [25, 50, 100]
+        "supportedPageSizes": [
-  },
+            25,
-  "files": {
+            50,
-      "excluded": [
+            100
-          ".DS_Store",
+        ]
-          "desktop.ini",
+    },
-          "thumbs.db",
+    "files": {
-          ".git"
+        "excluded": [
-      ]
+            ".DS_Store",
-  }
+            "desktop.ini",
+            "thumbs.db",
+            ".git"
+        ]
+    },
+    "languages": [
+        {
+            "key": "de",
+            "label": "German"
+        },
+        {
+            "key": "en",
+            "label": "English"
+        },
+        {
+            "key": "es",
+            "label": "Spanish"
+        },
+        {
+            "key": "fr",
+            "label": "French"
+        },
+        {
+            "key": "it",
+            "label": "Italian"
+        },
+        {
+            "key": "ja",
+            "label": "Japanese"
+        },
+        {
+            "key": "nb",
+            "label": "Norwegian"
+        },
+        {
+            "key": "nl",
+            "label": "Dutch"
+        },
+        {
+            "key": "pt-BR",
+            "label": "Brazilian Portuguese"
+        },
+        {
+            "key": "ru",
+            "label": "Russian"
+        }
+    ]
 }

src/app/components/current-user/current-user.component.html

@@ -11,8 +11,12 @@
     </div>
 
     <mat-menu #userMenu="matMenu" [overlapTrigger]="false">
+        <button mat-menu-item [matMenuTriggerFor]="langMenu">{{ 'APP.LANGUAGE' | translate }}</button>
         <button mat-menu-item adf-logout>
             {{ 'APP.SIGN_OUT' | translate }}
         </button>
     </mat-menu>
+    <mat-menu #langMenu="matMenu">
+        <adf-lanugage-menu></adf-lanugage-menu>
+    </mat-menu>
 </div>

src/assets/i18n/en.json

@@ -1,5 +1,6 @@
 {
     "APP": {
+        "LANGUAGE": "Language",
         "SIGN_IN": "Sign in",
         "SIGN_OUT": "Sign out",
         "NEW_MENU": {