Merge branch 'master' into denys-proxy-settings

This commit is contained in:
Cilibiu Bogdan
2017-10-24 21:32:56 +03:00
committed by GitHub
3 changed files with 67 additions and 16 deletions
+62 -16
View File
@@ -1,18 +1,64 @@
{
"ecmHost": "http://{hostname}:{port}",
"application": {
"name": "Alfresco Example Content Application",
"build": "1234"
},
"document-list": {
"supportedPageSizes": [25, 50, 100]
},
"files": {
"excluded": [
".DS_Store",
"desktop.ini",
"thumbs.db",
".git"
]
}
"ecmHost": "http://{hostname}:{port}",
"application": {
"name": "Alfresco Example Content Application",
"build": "1234"
},
"document-list": {
"supportedPageSizes": [
25,
50,
100
]
},
"files": {
"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"
}
]
}
@@ -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>
+1
View File
@@ -1,5 +1,6 @@
{
"APP": {
"LANGUAGE": "Language",
"SIGN_IN": "Sign in",
"SIGN_OUT": "Sign out",
"NEW_MENU": {