commit 684e26d41446e2649c18b49c0498f8ecac9dd32c
parent 8348b4e60e7614d74aabe49762bf6db6b8a0a440
Author: Jan Dankert <develop@jandankert.de>
Date: Fri, 13 Nov 2020 10:55:51 +0100
Fix: "USE" is a keyword.
Diffstat:
11 files changed, 40 insertions(+), 51 deletions(-)
diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.php b/modules/cms/ui/themes/default/html/views/pageelement/history.php
@@ -94,7 +94,7 @@
</td>
<?php $if8=($publish); if($if8) { ?>
<td><?php echo O::escapeHtml('') ?>
- <strong><?php echo O::escapeHtml(''.@O::lang('PUBLIC').'') ?>
+ <strong><?php echo O::escapeHtml(''.@O::lang('VALUE_PUBLIC').'') ?>
</strong>
</td>
<?php } ?>
@@ -123,8 +123,8 @@
<?php if(!$if8) { ?>
<?php $if9=($usable); if($if9) { ?>
<td class="<?php echo O::escapeHtml('or-act-clickable') ?>"><?php echo O::escapeHtml('') ?>
- <a title="<?php echo O::escapeHtml(''.@O::lang('USE_DESC').'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('post') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('use') ?>" data-id="<?php echo O::escapeHtml(''.@$objectid.'') ?>" data-extra-valueid="<?php echo O::escapeHtml(''.@$valueid.'') ?>" data-extra="<?php echo O::escapeHtml('{\'valueid\':\''.@$valueid.'\'}') ?>" data-data="<?php echo O::escapeHtml('{"action":"pageelement","subaction":"use","id":"'.@$objectid.'","token":"'.@$_token.'","valueid":"'.@$valueid.'","none":"0"}') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?>
- <span><?php echo O::escapeHtml(''.@O::lang('USE').'') ?>
+ <a title="<?php echo O::escapeHtml(''.@O::lang('VALUE_USE_DESC').'') ?>" target="<?php echo O::escapeHtml('_self') ?>" data-type="<?php echo O::escapeHtml('post') ?>" data-action="<?php echo O::escapeHtml('') ?>" data-method="<?php echo O::escapeHtml('use') ?>" data-id="<?php echo O::escapeHtml(''.@$objectid.'') ?>" data-extra-valueid="<?php echo O::escapeHtml(''.@$valueid.'') ?>" data-extra="<?php echo O::escapeHtml('{\'valueid\':\''.@$valueid.'\'}') ?>" data-data="<?php echo O::escapeHtml('{"action":"pageelement","subaction":"use","id":"'.@$objectid.'","token":"'.@$_token.'","valueid":"'.@$valueid.'","none":"0"}') ?>" class="<?php echo O::escapeHtml('or-link') ?>"><?php echo O::escapeHtml('') ?>
+ <span><?php echo O::escapeHtml(''.@O::lang('VALUE_USE').'') ?>
</span>
</a>
</td>
diff --git a/modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml b/modules/cms/ui/themes/default/html/views/pageelement/history.tpl.src.xml
@@ -73,7 +73,7 @@
</column>
<if true="${publish}">
<column>
- <text value="${message:PUBLIC}" type="strong"/>
+ <text value="${message:VALUE_PUBLIC}" type="strong"/>
</column>
</if>
<else>
@@ -101,9 +101,9 @@
<column class="act-clickable">
<link type="post" subaction="use" var1="valueid" value1="${valueid}"
id="${objectid}"
- title="${message:USE_DESC}">
+ title="${message:VALUE_USE_DESC}">
title="${message:USE_DESC}">
- <text value="${message:USE}"/>
+ <text value="${message:VALUE_USE}"/>
</link>
</column>
</if>
diff --git a/modules/language/Language_CN.class.php b/modules/language/Language_CN.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'unknown',
'UP'=>'up',
'UPLOAD'=>'Upload',
-'_USE'=>'Use',
-'USE_DESC'=>'Use this value for editing.',
'USER'=>'User',
'USERS'=>'Users',
'VALUE'=>'Content',
@@ -1326,7 +1324,8 @@ Thank you.',
'APPLY'=>'Apply',
'URL'=>'URL',
'SELF_NAME'=>'中文',
-'USE'=>'Use',
-'PUBLIC'=>'public',
+'VALUE_USE'=>'Use',
+'VALUE_USE_DESC'=>'Use this value for editing.',
+'VALUE_PUBLIC'=>'public',
];}
}
\ No newline at end of file
diff --git a/modules/language/Language_DE.class.php b/modules/language/Language_DE.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'unbekannt',
'UP'=>'hoch',
'UPLOAD'=>'Upload',
-'_USE'=>'Benutzen',
-'USE_DESC'=>'Diesen Inhalt zur Bearbeitung verwenden.',
'USER'=>'Benutzer',
'USERS'=>'Benutzer',
'VALUE'=>'Inhalt',
@@ -1331,7 +1329,8 @@ Vielen Dank.',
'APPLY'=>'Übernehmen',
'URL'=>'Url',
'SELF_NAME'=>'deutsch',
-'USE'=>'Verwenden',
-'PUBLIC'=>'öffentlich',
+'VALUE_USE'=>'Benutzen',
+'VALUE_USE_DESC'=>'Diesen Inhalt zur Bearbeitung verwenden.',
+'VALUE_PUBLIC'=>'öffentlich',
];}
}
\ No newline at end of file
diff --git a/modules/language/Language_EN.class.php b/modules/language/Language_EN.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'unknown',
'UP'=>'up',
'UPLOAD'=>'Upload',
-'_USE'=>'Use',
-'USE_DESC'=>'Use this value for editing.',
'USER'=>'User',
'USERS'=>'Users',
'VALUE'=>'Content',
@@ -1326,7 +1324,8 @@ Thank you.',
'APPLY'=>'Apply',
'URL'=>'URL',
'SELF_NAME'=>'english',
-'USE'=>'Use',
-'PUBLIC'=>'public',
+'VALUE_USE'=>'Use',
+'VALUE_USE_DESC'=>'Use this value for editing.',
+'VALUE_PUBLIC'=>'public',
];}
}
\ No newline at end of file
diff --git a/modules/language/Language_ES.class.php b/modules/language/Language_ES.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'inconnu',
'UP'=>'vers le haut de',
'UPLOAD'=>'Téléchargement',
-'_USE'=>'Employer',
-'USE_DESC'=>'Use this value for editing.',
'USER'=>'Utilisateur',
'USERS'=>'Utilisateurs',
'VALUE'=>'Content',
@@ -1351,7 +1349,8 @@ MENU_INDEX_ADMINISTRATION_DESC =',
'APPLY'=>'Apply',
'URL'=>'URL',
'SELF_NAME'=>'espanol',
-'USE'=>'Use',
-'PUBLIC'=>'public',
+'VALUE_USE'=>'Employer',
+'VALUE_USE_DESC'=>'Use this value for editing.',
+'VALUE_PUBLIC'=>'public',
];}
}
\ No newline at end of file
diff --git a/modules/language/Language_FR.class.php b/modules/language/Language_FR.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'inconnu',
'UP'=>'vers le haut de',
'UPLOAD'=>'Téléchargement',
-'_USE'=>'Employer',
-'USE_DESC'=>'Use this value for editing.',
'USER'=>'Utilisateur',
'USERS'=>'Utilisateurs',
'VALUE'=>'Content',
@@ -1327,7 +1325,8 @@ Merci.',
'APPLY'=>'Apply',
'URL'=>'URL',
'SELF_NAME'=>'francais',
-'USE'=>'Use',
-'PUBLIC'=>'public',
+'VALUE_USE'=>'Employer',
+'VALUE_USE_DESC'=>'Use this value for editing.',
+'VALUE_PUBLIC'=>'public',
];}
}
\ No newline at end of file
diff --git a/modules/language/Language_IT.class.php b/modules/language/Language_IT.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'desconocido',
'UP'=>'encima de',
'UPLOAD'=>'Upload',
-'_USE'=>'Utilizar',
-'USE_DESC'=>'Use this value for editing.',
'USER'=>'Usuario',
'USERS'=>'Usuarios',
'VALUE'=>'Content',
@@ -1327,7 +1325,8 @@ Gracias.',
'APPLY'=>'Apply',
'URL'=>'URL',
'SELF_NAME'=>'italiano',
-'USE'=>'Use',
-'PUBLIC'=>'public',
+'VALUE_USE'=>'Utilizar',
+'VALUE_USE_DESC'=>'Use this value for editing.',
+'VALUE_PUBLIC'=>'public',
];}
}
\ No newline at end of file
diff --git a/modules/language/Language_RU.class.php b/modules/language/Language_RU.class.php
@@ -509,8 +509,6 @@ public function get() { return [
'UNKNOWN'=>'Отменить неизвестных',
'UP'=>'up',
'UPLOAD'=>'Upload',
-'_USE'=>'Загрузить Используйте',
-'USE_DESC'=>'Use this value for editing.',
'USER'=>'Пользователь',
'USERS'=>'Пользователи',
'VALUE'=>'Content',
@@ -1327,7 +1325,8 @@ if you do not know where this mail comes from, please ignore it.',
'APPLY'=>'Apply',
'URL'=>'URL',
'SELF_NAME'=>'русский',
-'USE'=>'Use',
-'PUBLIC'=>'public',
+'VALUE_USE'=>'Загрузить Используйте',
+'VALUE_USE_DESC'=>'Use this value for editing.',
+'VALUE_PUBLIC'=>'public',
];}
}
\ No newline at end of file
diff --git a/modules/language/Messages.class.php b/modules/language/Messages.class.php
@@ -509,8 +509,6 @@ class Messages {
const UNKNOWN = 'UNKNOWN';
const UP = 'UP';
const UPLOAD = 'UPLOAD';
- const _USE = '_USE';
- const USE_DESC = 'USE_DESC';
const USER = 'USER';
const USERS = 'USERS';
const VALUE = 'VALUE';
@@ -1288,6 +1286,7 @@ class Messages {
const APPLY = 'APPLY';
const URL = 'URL';
const SELF_NAME = 'SELF_NAME';
- const USE = 'USE';
- const PUBLIC = 'PUBLIC';
+ const VALUE_USE = 'VALUE_USE';
+ const VALUE_USE_DESC = 'VALUE_USE_DESC';
+ const VALUE_PUBLIC = 'VALUE_PUBLIC';
}
\ No newline at end of file
diff --git a/modules/language/language.yml b/modules/language/language.yml
@@ -2618,16 +2618,6 @@ UPLOAD:
en: Upload
es: Téléchargement
fr: Téléchargement
-_USE:
- de: Benutzen
- en: Use
- es: Employer
- fr: Employer
- it: Utilizar
- ru: Загрузить Используйте
-USE_DESC:
- de: Diesen Inhalt zur Bearbeitung verwenden.
- en: Use this value for editing.
USER:
de: Benutzer
en: User
@@ -6441,9 +6431,16 @@ SELF_NAME:
ru: "русский"
es: espanol
it: italiano
-USE:
+VALUE_USE:
+ de: Benutzen
en: Use
- de: Verwenden
-PUBLIC:
+ es: Employer
+ fr: Employer
+ it: Utilizar
+ ru: Загрузить Используйте
+VALUE_USE_DESC:
+ de: Diesen Inhalt zur Bearbeitung verwenden.
+ en: Use this value for editing.
+VALUE_PUBLIC:
en: public
de: öffentlich
\ No newline at end of file
