From ad74571352c4ece2e6e6b71d9e13676f749da013 Mon Sep 17 00:00:00 2001
From: Henning Leutz <leutz@pcsg.de>
Date: Tue, 13 Jan 2015 17:13:45 +0100
Subject: [PATCH] locale -> translation
---
bin/AreaWindow.js | 2 +-
bin/BrickAreas.js | 2 +-
bin/BrickEdit.js | 11 ++--
bin/Manager.js | 22 ++++----
bin/Site/Area.js | 20 +++----
bin/Site/Category.js | 2 +-
lib/QUI/Bricks/Brick.php | 2 +-
locale.xml | 117 +++++++++++++++++++++++++++++++++++++--
8 files changed, 142 insertions(+), 36 deletions(-)
diff --git a/bin/AreaWindow.js b/bin/AreaWindow.js
index 9e39edc..eb93e48 100644
--- a/bin/AreaWindow.js
+++ b/bin/AreaWindow.js
@@ -31,7 +31,7 @@ define('package/quiqqer/bricks/bin/AreaWindow', [
],
options : {
- title : 'Projekt Brickbereiche',
+ title : QUILocale.get( 'quiqqer/bricks', 'area.window.title' ),
projectName : false,
projectLang : false,
maxHeight : 500,
diff --git a/bin/BrickAreas.js b/bin/BrickAreas.js
index ce76692..b8d22bd 100644
--- a/bin/BrickAreas.js
+++ b/bin/BrickAreas.js
@@ -71,7 +71,7 @@ define('package/quiqqer/bricks/bin/BrickAreas', [
this.$Buttons = this.$Elm.getElement( '.quiqqer-bricks-brickareas-buttons' );
new QUIButton({
- text : 'Brickbereich hinzufügen',
+ text : QUILocale.get( 'quiqqer/bricks', 'brick.edit.area.add' ),
styles : {
width : '100%'
},
diff --git a/bin/BrickEdit.js b/bin/BrickEdit.js
index e67403d..dc21992 100644
--- a/bin/BrickEdit.js
+++ b/bin/BrickEdit.js
@@ -126,26 +126,25 @@ define('package/quiqqer/bricks/bin/BrickEdit', [
var Container = new Element('div', {
'html' : '<label>' +
' <span class="quiqqer-bricks-brickedit-label-text">' +
- ' Title' +
+ QUILocale.get( 'quiqqer/system', 'title' ) +
' </span>' +
' <input type="text" name="title" />' +
'</label>' +
'<label>' +
' <span class="quiqqer-bricks-brickedit-label-text">' +
- ' Brick Beschreibung' +
+ QUILocale.get( 'quiqqer/bricks', 'brick.edit.description' ) +
' </span>' +
' <textarea name="description"></textarea>' +
'</label>'+
'<label>' +
' <span class="quiqqer-bricks-brickedit-label-text">' +
- ' Brick Typ' +
+ QUILocale.get( 'quiqqer/bricks', 'brick.edit.type' ) +
' </span>' +
' <select name="type"></select>' +
'</label>'+
-
'<label class="quiqqer-bricks-areas">' +
' <span class="quiqqer-bricks-brickedit-label-text">' +
- ' Erlaubte Brickbereiche' +
+ QUILocale.get( 'quiqqer/bricks', 'brick.edit.allowed.areas' ) +
' </span>' +
'</label>'
}).inject( this.$Elm );
@@ -270,7 +269,7 @@ define('package/quiqqer/bricks/bin/BrickEdit', [
{
new Element('label', {
html : '<span class="quiqqer-bricks-brickedit-label-editor">' +
- 'Brick Inhalt' +
+ QUILocale.get( 'quiqqer/bricks', 'brick.edit.content' ) +
'</span>'
}).inject( this.$Elm );
diff --git a/bin/Manager.js b/bin/Manager.js
index d71697a..0e88f00 100644
--- a/bin/Manager.js
+++ b/bin/Manager.js
@@ -149,7 +149,7 @@ define('package/quiqqer/bricks/bin/Manager', [
this.addButton(
new QUIButton({
- text : 'Brick hinzufügen',
+ text : QUILocale.get( lg, 'manager.button.add' ),
name : 'brick-add',
disabled : true,
events : {
@@ -160,7 +160,7 @@ define('package/quiqqer/bricks/bin/Manager', [
this.addButton(
new QUIButton({
- text : 'Markierte Blöcke löschen',
+ text : QUILocale.get( lg, 'manager.button.delete' ),
name : 'brick-delete',
disabled : true,
events : {
@@ -313,7 +313,7 @@ define('package/quiqqer/bricks/bin/Manager', [
var self = this;
new QUIConfirm({
- title : 'Neuen Brick hinzufügen',
+ title : QUILocale.get( lg, 'manager.window.create.title' ),
icon : 'icon-th',
maxHeight : 300,
maxWidth : 400,
@@ -332,13 +332,13 @@ define('package/quiqqer/bricks/bin/Manager', [
'<label>' +
' <span class="quiqqer-bricks-create-label-text">' +
- ' Title' +
+ QUILocale.get( lg, 'manager.window.create.label.title' ) +
' </span>' +
' <input type="text" name="title" />' +
'</label>' +
'<label>' +
' <span class="quiqqer-bricks-create-label-text">' +
- ' Brick Typ' +
+ QUILocale.get( lg, 'manager.window.create.label.type' ) +
' </span>' +
' <select name="type"></select>' +
'</label>'
@@ -425,6 +425,7 @@ define('package/quiqqer/bricks/bin/Manager', [
maxHeight : 300,
maxWidth : 600,
autoclose : false,
+ title : QUILocale.get( lg, 'manager.window.delete.title' ),
events :
{
onOpen : function(Win)
@@ -440,9 +441,9 @@ define('package/quiqqer/bricks/bin/Manager', [
Content.set(
'html',
-
- '<h1>Möchten Sie folgende Brick-IDs wirklich löschen</h1>' +
- lists
+ QUILocale.get( lg, 'manager.window.delete.information', {
+ list : lists
+ })
);
},
@@ -473,7 +474,8 @@ define('package/quiqqer/bricks/bin/Manager', [
var self = this,
Sheet = this.createSheet({
- title : 'Brick editieren'
+ title : QUILocale.get( lg, 'brick.sheet.edit.title' ),
+ icon : 'icon-edit'
});
Sheet.addEvents({
@@ -500,7 +502,7 @@ define('package/quiqqer/bricks/bin/Manager', [
Sheet.addButton({
textimage : 'icon-save',
- text : 'Speichern',
+ text : QUILocale.get( 'quiqqer/system', 'save' ),
styles : {
width : 200
},
diff --git a/bin/Site/Area.js b/bin/Site/Area.js
index fbd1c64..2e27d89 100644
--- a/bin/Site/Area.js
+++ b/bin/Site/Area.js
@@ -82,7 +82,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
);
this.$AddButton = new QUIButton({
- text : 'Brick hinzufügen',
+ text : QUILocale.get( lg, 'site.area.button.add' ),
textimage : 'icon-plus',
disable : true,
events : {
@@ -148,7 +148,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
/**
* Add a brick by its brick data
- * @param {Array} brickData
+ * @param {Object} brickData - { brickId:1, inheritance:1 }
*/
addBrick : function(brickData)
{
@@ -220,7 +220,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
Select = Elm.getElement( 'select' );
new QUIButton({
- title : 'Baustein löschen',
+ title : QUILocale.get( lg, 'site.area.button.delete' ),
icon : 'icon-remove',
events :
{
@@ -231,7 +231,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
}).inject( Elm );
new QUIButton({
- title : 'Baustein-Einstellungen',
+ title : QUILocale.get( lg, 'site.area.button.settings' ),
icon : 'icon-gear',
events :
{
@@ -274,7 +274,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
var self = this;
new QUIPopup({
- title : 'Baustein hinzufügen',
+ title : QUILocale.get( lg, 'site.area.window.add' ),
icon : 'icon-th',
maxWidth : 500,
maxHeight : 600,
@@ -323,10 +323,10 @@ define('package/quiqqer/bricks/bin/Site/Area', [
openBrickDeleteDialog : function(BrickElement)
{
new QUIConfirm({
- title : 'Baustein löschen?',
+ title : QUILocale.get( lg, 'site.area.window.delete.title' ),
icon : 'icon-remove',
- text : 'Baustein wirklich löschen?',
- information : 'Möchten Sie den Baustein für diese Seite wirklich löschen?',
+ text : QUILocale.get( lg, 'site.area.window.delete.text' ),
+ information : QUILocale.get( lg, 'site.area.window.delete.information' ),
maxHeight : 300,
maxWidth : 500,
events :
@@ -346,7 +346,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
openBrickSettingDialog : function(Select)
{
new QUIConfirm({
- title : 'Baustein-Einstellungen',
+ title : QUILocale.get( lg, 'site.area.window.settings.title' ),
icon : 'icon-gear',
maxWidth : 400,
maxHeight : 300,
@@ -363,7 +363,7 @@ define('package/quiqqer/bricks/bin/Site/Area', [
'<form>' +
' <label>' +
' <input type="checkbox" name="inheritance" />' +
- ' Baustein wird vererbt' +
+ QUILocale.get( lg, 'site.area.window.settings.setting.inheritance' ) +
' </label>' +
'</form>'
);
diff --git a/bin/Site/Category.js b/bin/Site/Category.js
index 550e59c..7bdbc45 100644
--- a/bin/Site/Category.js
+++ b/bin/Site/Category.js
@@ -120,7 +120,7 @@ define('package/quiqqer/bricks/bin/Site/Category', [
areas[ AC.getAttribute( 'name' ) ] = AC.getData();
}
-console.log( areas );
+
Site.setAttribute( 'quiqqer.bricks.areas', JSON.encode( areas ) );
},
diff --git a/lib/QUI/Bricks/Brick.php b/lib/QUI/Bricks/Brick.php
index 5f2b6fb..8853f65 100644
--- a/lib/QUI/Bricks/Brick.php
+++ b/lib/QUI/Bricks/Brick.php
@@ -110,7 +110,7 @@ public function create()
$Control = $this->_getControl();
if ( !$Control ) {
- throw new QUI\Exception( 'Control not found. Brick could not be create' );
+ throw new QUI\Exception( 'Control not found. Brick could not be created' );
}
$Control->setAttributes( $this->getSettings() );
diff --git a/locale.xml b/locale.xml
index b3924ca..baaab29 100644
--- a/locale.xml
+++ b/locale.xml
@@ -3,14 +3,14 @@
<groups name="quiqqer/bricks" datatype="php,js">
<locale name="menu.bricks.text">
- <de><![CDATA[Brickverwaltung]]></de>
+ <de><![CDATA[Bausteine]]></de>
<en><![CDATA[Bricks-Manager]]></en>
</locale>
<!-- Standard Bricks -->
<locale name="brick.content.title">
- <de><![CDATA[Brick:Inhalt]]></de>
+ <de><![CDATA[Baustein:Inhalt]]></de>
<en><![CDATA[Brick:Content]]></en>
</locale>
<locale name="brick.content.description">
@@ -19,7 +19,7 @@
</locale>
<locale name="brick.control.breadcrumb.title">
- <de><![CDATA[Brick:Bradcrumb]]></de>
+ <de><![CDATA[Baustein:Bradcrumb]]></de>
<en><![CDATA[Brick:Bradcrumb]]></en>
</locale>
<locale name="brick.control.breadcrumb.description">
@@ -28,7 +28,7 @@
</locale>
<locale name="brick.control.contact.title">
- <de><![CDATA[Brick:Kontakt]]></de>
+ <de><![CDATA[Baustein:Kontakt]]></de>
<en><![CDATA[Brick:Contact]]></en>
</locale>
<locale name="brick.control.contact.description">
@@ -39,13 +39,119 @@
<groups name="quiqqer/bricks" datatype="php">
<locale name="site.panel.bricks.category.title">
- <de><![CDATA[Blöcke]]></de>
+ <de><![CDATA[Bausteine]]></de>
<en><![CDATA[Bricks]]></en>
</locale>
</groups>
<groups name="quiqqer/bricks" datatype="js">
+ <locale name="brick.type">
+ <de><![CDATA[Baustein-Typ]]></de>
+ <en><![CDATA[Brick type]]></en>
+ </locale>
+
+ <locale name="site.area.button.add">
+ <de><![CDATA[Baustein hinzufügen]]></de>
+ <en><![CDATA[Add a Brick]]></en>
+ </locale>
+ <locale name="site.area.button.delete">
+ <de><![CDATA[Baustein löschen]]></de>
+ <en><![CDATA[Delete the Brick]]></en>
+ </locale>
+ <locale name="site.area.button.settings">
+ <de><![CDATA[Baustein-Einstellungen]]></de>
+ <en><![CDATA[Brick settings]]></en>
+ </locale>
+ <locale name="site.area.window.add">
+ <de><![CDATA[Baustein hinzufügen]]></de>
+ <en><![CDATA[Add a Brick]]></en>
+ </locale>
+
+ <locale name="site.area.window.delete.title">
+ <de><![CDATA[Baustein löschen?]]></de>
+ <en><![CDATA[Delete the Brick?]]></en>
+ </locale>
+ <locale name="site.area.window.delete.text">
+ <de><![CDATA[Baustein wirklich löschen?]]></de>
+ <en><![CDATA[Really delete the Brick?]]></en>
+ </locale>
+ <locale name="site.area.window.delete.information">
+ <de><![CDATA[Möchten Sie den Baustein für diese Seite wirklich löschen?]]></de>
+ <en><![CDATA[Do you really want to delete the Brick for this page?]]></en>
+ </locale>
+
+ <locale name="site.area.window.settings.title">
+ <de><![CDATA[Baustein-Einstellungen]]></de>
+ <en><![CDATA[Brick settings]]></en>
+ </locale>
+ <locale name="site.area.window.settings.setting.inheritance">
+ <de><![CDATA[Baustein wird vererbt]]></de>
+ <en><![CDATA[Brick is inherited]]></en>
+ </locale>
+
+ <locale name="area.window.title">
+ <de><![CDATA[Baustein-Zonen]]></de>
+ <en><![CDATA[Brick areas]]></en>
+ </locale>
+ <locale name="brick.edit.area.add">
+ <de><![CDATA[Baustein-Zone hinzufügen]]></de>
+ <en><![CDATA[Add a Brick area]]></en>
+ </locale>
+
+ <locale name="brick.sheet.edit.title">
+ <de><![CDATA[Baustein bearbeiten]]></de>
+ <en><![CDATA[Edit Brick]]></en>
+ </locale>
+ <locale name="brick.edit.description">
+ <de><![CDATA[Baustein Beschreibung]]></de>
+ <en><![CDATA[Brick description]]></en>
+ </locale>
+ <locale name="brick.edit.type">
+ <de><![CDATA[Baustein-Typ]]></de>
+ <en><![CDATA[Brick type]]></en>
+ </locale>
+ <locale name="brick.edit.allowed.areas">
+ <de><![CDATA[Erlaubte Baustein-Zonen]]></de>
+ <en><![CDATA[Allowed Brick areas]]></en>
+ </locale>
+ <locale name="brick.edit.content">
+ <de><![CDATA[Baustein-Inhalt]]></de>
+ <en><![CDATA[Brick content]]></en>
+ </locale>
+
+ <locale name="manager.button.add">
+ <de><![CDATA[Baustein hinzufügen]]></de>
+ <en><![CDATA[Add a Brick]]></en>
+ </locale>
+ <locale name="manager.button.delete">
+ <de><![CDATA[Markierte Bausteine löschen]]></de>
+ <en><![CDATA[Delete marked Bricks]]></en>
+ </locale>
+ <locale name="manager.window.create.title">
+ <de><![CDATA[Neuen Baustein hinzufügen]]></de>
+ <en><![CDATA[Create a new Brick]]></en>
+ </locale>
+ <locale name="manager.window.create.label.title">
+ <de><![CDATA[Baustein Titel]]></de>
+ <en><![CDATA[Brick title]]></en>
+ </locale>
+ <locale name="manager.window.create.label.type">
+ <de><![CDATA[Baustein Typ]]></de>
+ <en><![CDATA[Brick type]]></en>
+ </locale>
+ <locale name="manager.window.delete.title">
+ <de><![CDATA[Bausteine löschen]]></de>
+ <en><![CDATA[Delete Bricks]]></en>
+ </locale>
+ <locale name="manager.window.delete.information">
+ <de><![CDATA[<h1>Möchten Sie folgende Baustein-IDs wirklich löschen?</h1>[list]]]></de>
+ <en><![CDATA[<h1>Do you really want to delete the following Brick-IDs?</h1>[list]]]></en>
+ </locale>
+ <locale name="manager.brick.edit.btn.save">
+ <de><![CDATA[]]></de>
+ <en><![CDATA[]]></en>
+ </locale>
</groups>
@@ -55,7 +161,6 @@
<de><![CDATA[Bausteine]]></de>
<en><![CDATA[Bricks]]></en>
</locale>
-
<locale name="quiqqer.blocks.edit._title">
<de><![CDATA[Darf Bausteine bearbeiten / editieren.]]></de>
<en><![CDATA[Can edit Bricks.]]></en>
--
GitLab