Merge branch 'develop' of https://github.com/trendschau/typemill into develop

system/author/js/vue-meta.js

@@ -2,7 +2,7 @@ const FormBus = new Vue();
 
 Vue.filter('translate', function (value) {
   if (!value) return ''
-  transvalue = value.replace(/[ ]/g,"_").replace(/[.]/g, "_").replace(/[,]/g, "_").replace(/[-]/g, "_").replace(/[,]/g,"_").replace(/[(]/g,"_").replace(/[)]/g,"_").toUpperCase()
+  transvalue = value.replace(/[ ]/g,"_").replace(/[.]/g, "_").replace(/[,]/g, "_").replace(/[-]/g, "_").replace(/[,]/g,"_").toUpperCase()
   translated_string = labels[transvalue]
   if(!translated_string || translated_string.length === 0){
     return value

system/author/languages/de.yaml

@@ -34,8 +34,8 @@ CODE: Code
 COG: Einstellungen
 CONTENT: Inhalt
 COPYRIGHT: Copyright
-CREATED_AT__READ_ONLY_: Erstellt am (nur lesen)
-CREATED_AT__READONLY_: Erstellt am (nur lesen)
+CREATED_AT_(READ_ONLY): Erstellt am (nur lesen)
+CREATED_AT_(READONLY): Erstellt am (nur lesen)
 CREATE_NEW_USER: + Neuen Nutzer
 CREATE_USER: + Nutzer
 CROSS: Kreuz
@@ -91,7 +91,7 @@ ITALIC: kursiv
 LANGUAGE: Language
 LANGUAGE_ADMIN: Sprache (Admin-UI)
 LANGUAGE_ATTR: Sprach-Attribut (website)
-LAST_MODIFIED_LIVE__READONLY_: Live zuletzt geändert (nur lesen)
+LAST_MODIFIED_LIVE_(READONLY): Live zuletzt geändert (nur lesen)
 LAST_NAME: Zuname
 LEFT: Links
 LICENCE: Lizenz
@@ -195,7 +195,7 @@ YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: Du kannst das CSS des T
 SETUP_WELCOME: Setup Willkommen
 HURRA: Hurra
 YOUR_ACCOUNT_HAS_BEEN_CREATED_AND_YOU_ARE_LOGGED_IN_NOW_: Dein Account wurde erstellt und du bist jetzt angemeldet.
-NEXT_STEP: Nächster Schritt:
+NEXT_STEP: Nächster Schritt
 VISIT_THE_AUTHOR_PANEL_AND_SETUP_YOUR_NEW_WEBSITE__YOU_CAN_CONFIGURE_THE_SYSTEM__CHOOSE_THEMES_AND_ADD_PLUGINS_: Besuche die Autorenoberfläche und richte die Seite ein. Du kannst das System konfigurieren, Themes auswählen and Plugins hinzufügen.
 GET_HELP: Hilfe erhalten
 IF_YOU_HAVE_ANY_QUESTIONS__PLEASE_READ_THE: Wenn du Fragen hast, lies bitte die

system/author/languages/en.yaml

@@ -13,16 +13,20 @@ ADD_LEFT_COLUMN: add left column
 ADD_RIGHT_COLUMN: add right column
 ADD_ROW_ABOVE: add row above
 ADD_ROW_BELOW: add row below
+ADMINISTRATOR: administrator
+ALL: all
 ALL_USERS: All users
 ALT_TEXT: Alt-Text
 ALTERNATIVE_TEXT_FOR_THE_HERO_IMAGE: Alternative Text for the hero image
 AUTHOR: Author
+AUTHOR_DESCRIPTION_(MARKDOWN): Author-Description (Markdown)
 BACK_TO_STARTPAGE: back to startpage
 BOLD: bold
 BOTTOM: Bottom
 BROWSE: BROWSE
 BULLET_LIST: Bullet List
 BY: by
+CAN_BE_USED_FOR_AUTHOR_LINE_IN_FRONTEND_: Can be used for author line in frontend.
 CANCEL: cancel
 CAPTION: Caption
 CELL: cell
@@ -36,8 +40,8 @@ COG: cog
 CONTENT: Content
 CONTENT: Content
 COPYRIGHT: Copyright
-CREATED_AT__READ_ONLY_: Created at (readonly)
-CREATED_AT__READONLY_: Created at (read only)
+CREATED_AT_(READ_ONLY): Created at (readonly)
+CREATED_AT_(READONLY): Created at (read only)
 CREATE_NEW_USER: Create New User
 CREATE_USER: Create User
 CROSS: cross
@@ -61,6 +65,7 @@ DRAFT: Draft
 DRAG_A_PICTURE_OR_CLICK_TO_SELECT: upload an image
 DUTCH__FLEMISH: Dutch, Flemish
 EDIT: edit
+EDITOR: editor
 EDIT_USER: Edit User
 E_G_: e.g.
 E_MAIL: E-Mail
@@ -76,6 +81,7 @@ FORMAT: Format
 GENERAL_PRESENTATION: General Presentation
 GERMAN: German
 GOOGLE_SITEMAP: Google Sitemap
+HAS_EDIT_RIGHTS_FOR_THIS_ARTICLE_: Has edit rights for this article.
 HEAD: Head
 HEADLINE_ANCHORS: Headline Anchors
 HEADLINE: Headline
@@ -89,13 +95,14 @@ HR: hr
 IF_NOT_FILLED__THE_DESCRIPTION_IS_EXTRACTED_FROM_CONTENT_: If not filled, the description is extracted from content.
 IMAGE: Image
 IMAGES: Images
-IMAGE_URL__READ_ONLY_: Image URL (read only)
+IMAGE_URL: Image URL
+IMAGE_URL_(READ_ONLY): Image URL (read only)
 ITALIAN: Italian
 ITALIC: italic
 LANGUAGE: Language
 LANGUAGE_ADMIN: Language (admin-ui)
 LANGUAGE_ATTR: Language Attribute (website)
-LAST_MODIFIED_LIVE__READONLY_: Last modified live (readonly)
+LAST_MODIFIED_LIVE_(READONLY): Last modified live (readonly)
 LAST_NAME: Last Name
 LEFT: Left
 LICENCE: Licence
@@ -107,6 +114,7 @@ LOGOUT: Logout
 MANUAL_DATE: Manual date
 MARKDOWN: markdown
 MAXIMUM_SIZE_FOR_AN_IMAGE_IS_5_MB__HERO_IMAGES_ARE_NOT_SUPPORTED_BY_ALL_THEMES_: Maximum size for an image is 5 MB. Hero images are not supported by all themes.
+MEMBER: member
 MENU: Menu
 META_DESCRIPTION: Meta description
 META: meta
@@ -125,6 +133,7 @@ NUMBERED_LIST: Numbered List
 OLIST: olist
 ONLINE: online
 ONLY_THE_FOLLOWING_SPECIAL_CHARACTERS_ARE_ALLOWED: Only the following special characters are allowed:
+OWNER_(USERNAME): owner (username)
 PARAGRAPH: Paragraph
 PASSWORD: Password
 PLEASE_CONFIRM: Please confirm
@@ -132,6 +141,7 @@ PLEASE_CORRECT_THE_ERRORS_ABOVE: Please correct the errors above
 PLUGINS: Plugins
 PLUGIN_STORE: Plugin Store
 POWER_OFF: power-off
+PROFILE_IMAGE: Profile-Image
 PUBLISH: Publish
 QUOTE: Quote
 QUOTES: Quote
@@ -140,6 +150,7 @@ RAW_MARKDOWN_EDITOR: Raw Markdown Editor
 RAW_MODE: raw mode
 RAW: raw
 READONLY: Readonly
+REGISTERED_USERS_ONLY: registered users only
 REMEMBER_TO_BOOKMARK_THIS_PAGE: Remember to bookmark this page
 REQUIRED: Required
 RIGHT: Right
@@ -181,6 +192,7 @@ USE_A_VALID_LANGUAGE_ATTRIBUTE: Use a valid language attribute
 USE_A_VALID_YEAR: Use a valid year
 USED_AS_FALLBACK_WHEN_NO_MANUAL_DATE_IS_SET_: Used as fallback when no manual date is set.
 USERNAME: Username
+USERNAME_(READ_ONLY): Username (read only) 
 USERS: Users
 USER: User
 VIDEO: Video
@@ -193,6 +205,7 @@ VISUAL: visual
 WAIT: wait
 WEBSITE_TITLE: Website Title
 WEB: Web
+WEBSITE_VISIBLE_FOR: Website visible for
 WRITING: Writing
 YEAR: Year
 YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: You can overwrite the theme-css with your own css here.

system/author/languages/fr.yaml

@@ -34,7 +34,7 @@ CODE: Code
 COG: cog
 CONTENT: Contenu
 COPYRIGHT: Copyright
-CREATED_AT__READ_ONLY_: Date de création (lecture seule)
+CREATED_AT_(READ_ONLY): Date de création (lecture seule)
 CREATE_NEW_USER: Créer un nouvel utilisateur
 CREATE_USER: Créer un utilisateur
 CROSS: croix
@@ -90,7 +90,7 @@ ITALIC: Italique
 LANGUAGE: Langue
 LANGUAGE_ADMIN: Langue de l'interface d'administration
 LANGUAGE_ATTR: Langue du site (website)
-LAST_MODIFIED_LIVE__READONLY_: Dernière modification (lecture seule)
+LAST_MODIFIED_LIVE_(READONLY): Dernière modification (lecture seule)
 LAST_NAME: Prénom
 LEFT: Gauche
 LICENCE: Licence
@@ -192,9 +192,9 @@ YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: Vous pouvez surcharger
 SETUP_WELCOME: Bienvenue dans l'installation
 HURRA: Hourrah
 YOUR_ACCOUNT_HAS_BEEN_CREATED_AND_YOU_ARE_LOGGED_IN_NOW_: Votre compte a été créé et vous êtes maintenant connecté
-NEXT_STEP: Prochaine étape:
+NEXT_STEP: Prochaine étape
 VISIT_THE_AUTHOR_PANEL_AND_SETUP_YOUR_NEW_WEBSITE__YOU_CAN_CONFIGURE_THE_SYSTEM__CHOOSE_THEMES_AND_ADD_PLUGINS_: Visitez le volet Auteur et configurez votre nouveau site. Vous pouvez paramétrer le système, choisir un thème et ajouter des plugins.
-GET_HELP: Obtenir de l'aide:
+GET_HELP: Obtenir de l'aide
 IF_YOU_HAVE_ANY_QUESTIONS__PLEASE_READ_THE: Pour toutes questions, veuillez consulter la
 DOCS: documentation
 OR_OPEN_A_NEW_ISSUE_ON: ou ouvrir un nouveau bug sur

system/author/languages/it.yaml

@@ -13,16 +13,20 @@ ADD_LEFT_COLUMN: aggiungi colonna a sinistra
 ADD_RIGHT_COLUMN: aggiungi colonna a destra
 ADD_ROW_ABOVE: aggiungi la riga sopra
 ADD_ROW_BELOW: aggiungi la riga sotto
+ADMINISTRATOR: Amministratore
+ALL: Tutti
 ALL_USERS: Tutti gli utenti
 ALT_TEXT: Testo alternativo
 ALTERNATIVE_TEXT_FOR_THE_HERO_IMAGE: Testo alternativo per l'immagine hero
 AUTHOR: Autore
+AUTHOR_DESCRIPTION_(MARKDOWN): Descrizione dell'autore (Markdown)
 BACK_TO_STARTPAGE: torna alla pagina iniziale
 BOLD: grassetto
 BOTTOM: Sotto
 BROWSE: Sfoglia
 BULLET_LIST: Elenco puntato
 BY: di
+CAN_BE_USED_FOR_AUTHOR_LINE_IN_FRONTEND_: Può essere usato per la linea autore nel sito.
 CANCEL: Annulla
 CAPTION: Didascalia
 CELL: cella
@@ -36,8 +40,8 @@ COG: ingranaggio
 CONTENT: Contenuto
 CONTENT: Contenuto
 COPYRIGHT: Diritti d'autore
-CREATED_AT__READ_ONLY_: Creato il (sola lettura)
-CREATED_AT__READONLY_: Creato il (sola lettura)
+CREATED_AT_(READ_ONLY): Creato il (sola lettura)
+CREATED_AT_(READONLY): Creato il (sola lettura)
 CREATE_NEW_USER: Crea nuovo utente
 CREATE_USER: Crea utente
 CROSS: croce
@@ -60,7 +64,8 @@ DO_YOU_WANT_TO_DISCARD_YOUR_CHANGES_AND_SET_THE_CONTENT_BACK_TO_THE_LIVE_VERSION
 DRAFT: Bozza
 DRAG_A_PICTURE_OR_CLICK_TO_SELECT: trascina un'immagine o fai clic per selezionare
 DUTCH__FLEMISH: Olandese, Fiammingo
-EDIT: modifica
+EDIT: Modifica
+EDITOR: Curatore
 EDIT_USER: Modifica utente
 E_G_: per es.:
 E_MAIL: Posta elettronica
@@ -76,6 +81,7 @@ FORMAT: Format
 GENERAL_PRESENTATION: Presentazione generale
 GERMAN: Tedesco
 GOOGLE_SITEMAP: Sitemap di Google
+HAS_EDIT_RIGHTS_FOR_THIS_ARTICLE_: Ha i diritti di modifica per questo articolo.
 HEAD: Intestazione
 HEADLINE_ANCHORS: Ancoraggi del titolo
 HEADLINE: Titolo
@@ -89,13 +95,14 @@ HR: Linea orizzontale
 IF_NOT_FILLED__THE_DESCRIPTION_IS_EXTRACTED_FROM_CONTENT_: Se non compilato, la descrizione viene estratta dal contenuto.
 IMAGE: Immagine
 IMAGES: Immagini
-IMAGE_URL__READ_ONLY_: Immagine URL (sola lettura)
+IMAGE_URL: URL immagine
+IMAGE_URL_(READ_ONLY): URL immagine (sola lettura)
 ITALIAN: Italiano
 ITALIC: corsivo
 LANGUAGE: Lingua
 LANGUAGE_ADMIN: Lingua (admin-ui)
 LANGUAGE_ATTR: Attributo Lingua (sito)
-LAST_MODIFIED_LIVE__READONLY_: Ultima modifica (sola lettura)
+LAST_MODIFIED_LIVE_(READONLY): Ultima modifica (sola lettura)
 LAST_NAME: Cognome
 LEFT: Sinistra
 LICENCE: Licenza
@@ -107,6 +114,7 @@ LOGOUT: Esci
 MANUAL_DATE: Data manuale
 MARKDOWN: Markdown
 MAXIMUM_SIZE_FOR_AN_IMAGE_IS_5_MB__HERO_IMAGES_ARE_NOT_SUPPORTED_BY_ALL_THEMES_: La dimensione massima per un'immagine è di 5 MB. Le immagini hero non sono supportate da tutti i temi.
+MEMBER: Membro
 MENU: Menu
 META_DESCRIPTION: Descrizione
 META: Metadati
@@ -125,6 +133,7 @@ NUMBERED_LIST: Elenco numerato
 OLIST: Elenchi ordinati
 ONLINE: in linea
 ONLY_THE_FOLLOWING_SPECIAL_CHARACTERS_ARE_ALLOWED: Sono ammessi solo i seguenti caratteri speciali:
+OWNER_(USERNAME): proprietario (nome utente)
 PARAGRAPH: Paragrafo
 PASSWORD: Parola d'ordine
 PLEASE_CONFIRM: Per favore conferma
@@ -132,6 +141,7 @@ PLEASE_CORRECT_THE_ERRORS_ABOVE: Si prega di correggere gli errori sopra
 PLUGINS: Plugin
 PLUGIN_STORE: Deposito plugin
 POWER_OFF: spegni
+PROFILE_IMAGE: Immagine del profilo
 PUBLISH: Pubblica
 QUOTE: Citazione
 QUOTES: Citazione
@@ -140,7 +150,8 @@ RAW: grezzo
 RAW_MARKDOWN_EDITOR: Editore grezzo Markdown
 RAW_MODE: modo grezzo
 READONLY: Sola lettura
-REMEMBER_TO_BOOKMARK_THIS_PAGE: Ricorda di aggiungere questa pagina ai segnalibri
+REGISTERED_USERS_ONLY: Solo utenti registrati
+REMEMBER_TO_BOOKMARK_THIS_PAGE: Ricorda di creare un segnalibro per la pagina
 REQUIRED: Richiesto
 RIGHT: Destra
 ROLE: Ruolo
@@ -181,6 +192,7 @@ USE_A_VALID_LANGUAGE_ATTRIBUTE: Use a valid language attribute
 USE_A_VALID_YEAR: Usa un anno valido
 USED_AS_FALLBACK_WHEN_NO_MANUAL_DATE_IS_SET_: Utilizzato come ripiego quando non è impostata alcuna data manuale.
 USERNAME: Nome utente
+USERNAME_(READ_ONLY): Nome utente (sola lettura)
 USERS: Utenti
 USER: Utente
 VIDEO: Video
@@ -193,6 +205,7 @@ VISUAL: visivo
 WAIT: aspetta
 WEBSITE_TITLE: Titolo del sito
 WEB: Sito
+WEBSITE_VISIBLE_FOR: Sito visibile per
 WRITING: Scrittura
 YEAR: Anno
 YOU_CAN_OVERWRITE_THE_THEME_CSS_WITH_YOUR_OWN_CSS_HERE_: È possibile sovrascrivere il css del tema con il proprio CSS qui.

system/author/languages/nl.yaml

@@ -31,8 +31,8 @@ CODE: Code
 COG: tandwiel
 CONTENT: Inhoud
 COPYRIGHT: Auteursrecht
-CREATED_AT__READ_ONLY_: Gemaakt om (alleen lezen)
-CREATED_AT__READONLY_: Gemaakt om (alleen lezen)
+CREATED_AT_(READ_ONLY): Gemaakt om (alleen lezen)
+CREATED_AT_(READONLY): Gemaakt om (alleen lezen)
 CREATE_NEW_USER: Nieuwe gebruiker maken
 CREATE_USER: Gebruiker maken
 CROSS: kruis
@@ -75,7 +75,7 @@ ITALIC: cursief
 LANGUAGE: Taal
 LANGUAGE_ADMIN: Taal (admin-ui)
 LANGUAGE_ATTR: Language Attribute (website)
-LAST_MODIFIED_LIVE__READONLY_: Laatst gewijzigd live (alleen-lezen)
+LAST_MODIFIED_LIVE_(READONLY): Laatst gewijzigd live (alleen-lezen)
 LAST_NAME: achternaam
 LEFT: Links
 LICENCE: Licentie

system/author/languages/ru.yaml

@@ -36,8 +36,8 @@ COG: cog
 CONTENT: Редактор
 CONTENT: Контент
 COPYRIGHT: Копирайт
-CREATED_AT__READ_ONLY_: Создано в (только просмотр)
-CREATED_AT__READONLY_: Создано в (только просмотр)
+CREATED_AT_(READ_ONLY): Создано в (только просмотр)
+CREATED_AT_(READONLY): Создано в (только просмотр)
 CREATE_NEW_USER: Создание нового пользователя
 CREATE_USER: Создать пользователя
 CROSS: Зачёркнутый
@@ -83,7 +83,7 @@ ITALIC: Наклонный
 LANGUAGE: Язык
 LANGUAGE_ADMIN: Язык (admin-ui)
 LANGUAGE_ATTR: Language Attribute (website)
-LAST_MODIFIED_LIVE__READONLY_: Последнее изменение (только просмотр)
+LAST_MODIFIED_LIVE_(READONLY): Последнее изменение (только просмотр)
 LAST_NAME: Фамилия
 LEFT: Слева
 LICENCE: Лицензия

system/author/partials/fields.twig

@@ -18,7 +18,7 @@
 					<div class="relative w-100 bn br1 bg-tm-green white pa3 ma0 tc"><svg class="icon icon-upload baseline"><use xlink:href="#icon-upload"></use></svg> {{ __('Upload an image') }}</div>
 				</div>
 				<div class="dib w-100 mt3">
-					<label>Image URL</label>
+					<label>{{ __('Image URL') }}</label>
 					<div class="flex">
 						<button class="function-delete-img w-10 bg-tm-gray bn hover-bg-tm-red hover-white">x</button>
 						<input class="function-img-url w-90 mbfix" type="text" name="{{ itemName }}[{{ field.name }}]" value="{{ settings[object][itemName][field.name] }}" readonly>
@@ -69,7 +69,7 @@
 
 			<select id="{{ itemName }}[{{ field.name }}]" name="{{ itemName }}[{{ field.name }}]"{{ field.getAttributeValues() }}{{ field.getAttributes() }}>
 				{% for value,label in options %}
-					<option value="{{ value }}" {{ (value == field.getAttributeValue('value')) ? ' selected' : '' }}>{{ label }}</option>
+					<option value="{{ value }}" {{ (value == field.getAttributeValue('value')) ? ' selected' : '' }}>{{ __(label) }}</option>
 				{% endfor %}
 			</select>
 

system/author/settings/userlist.twig

@@ -14,10 +14,10 @@
 			<ul class="userlist">
 				<li class="row header">
 					<ul>
-						<li class="col username">Username
-						</li><li class="col userrole">Role
-						</li><li class="col email">E-Mail
-						</li><li class="col edit">Edit</li>
+						<li class="col username">{{ __('Username') }}</li>
+						<li class="col userrole">{{ __('Role') }}</li>
+						<li class="col email">{{ __('E-Mail') }}</li>
+						<li class="col edit">{{ __('Edit') }}</li>
 					</ul>
 				</li>
 				{% for user in userdata %}
@@ -25,7 +25,7 @@
 					<li class="row">
 						<ul>
 							<li class="col username">{{ user.username }}
-							</li><li class="col userrole">{{ user.userrole }}
+							</li><li class="col userrole">{{ __(user.userrole) }}
 							</li><li class="col email">{{ user.email }}
 							</li><li class="col edit"><a href="{{ path_for('user.show', {'username' : user.username }) }}">{{ __('edit') }}</a></li>
 						</ul>

system/author/settings/usernew.twig

@@ -27,7 +27,7 @@
 						<label for="userrole">{{ __('Role') }} <abbr title="{{ __('required') }}">*</abbr></label>
 						<select name="userrole" required>
 							{% for role in userrole %}
-								<option value="{{ role }}"{% if (role == old.userrole) %} selected{% endif %}>{{ role }}</option>
+								<option value="{{ role }}"{% if (role == old.userrole) %} selected{% endif %}>{{ __(role) }}</option>
 							{% endfor %}
 						</select>
 						{% if errors.userrole %}