diff options
author | Christian Hofmaier | 2017-09-22 18:03:56 +0200 |
---|---|---|
committer | Christian Hofmaier | 2017-09-22 18:03:56 +0200 |
commit | eb81313380ff52982e312ea2f68d4b4c4cf65093 (patch) | |
tree | 168814662b6aa166d67daa412e812f092d9ebb8b /modules-available | |
parent | [internetaccess] fixed visibility of save-button (major issue) (diff) | |
download | slx-admin-eb81313380ff52982e312ea2f68d4b4c4cf65093.tar.gz slx-admin-eb81313380ff52982e312ea2f68d4b4c4cf65093.tar.xz slx-admin-eb81313380ff52982e312ea2f68d4b4c4cf65093.zip |
[translation] fixed inconsistencies
Diffstat (limited to 'modules-available')
5 files changed, 154 insertions, 46 deletions
diff --git a/modules-available/translation/lang/de/template-tags.json b/modules-available/translation/lang/de/template-tags.json index 99ec6cea..cb10d3b4 100644 --- a/modules-available/translation/lang/de/template-tags.json +++ b/modules-available/translation/lang/de/template-tags.json @@ -1,5 +1,6 @@ { "lang_createTag": "Tag erstellen", + "lang_clear": "Läutern", "lang_global": "Global", "lang_globalTooltip": "Dieser Tag ist global verf\u00fcgbar und braucht normalerweise nicht explizit f\u00fcr dieses Modul \u00fcbersetzt zu werden", "lang_menuCategories": "Men\u00fckategorien", @@ -7,6 +8,7 @@ "lang_missing": "Fehlend", "lang_missingDeps": "Fehlende Abh\u00e4ngigkeiten", "lang_module": "Modul", + "lang_modullist": "Liste der Module", "lang_otherStrings": "Andere Texte", "lang_sample": "Beispiel", "lang_status": "Status", @@ -16,7 +18,7 @@ "lang_templateHint": "Hinweis: Gelbe Linien zeigen an, dass eine \u00dcbersetzung fehlt, rote Linien, dass ein Tag nicht von dem jeweiligen Template verwendet wird.", "lang_templates": "Templates", "lang_translation": "\u00dcbersetzung", - "lang_translationHeading": "Verwalten der \u00dcbersetzungen", + "lang_translationHeading": "Verwaltung der \u00dcbersetzungen", "lang_unused": "Ungenutzt", "lang_unusedUnreliableHint": "Die Erkennung ungenutzter Tags bezieht nur aktivierte Module mit ein. Es k\u00f6nnte sein, dass ein ungenutzt gemeldeter Tag in einem nicht aktivierten Modul verwendet wird." }
\ No newline at end of file diff --git a/modules-available/translation/lang/en/template-tags.json b/modules-available/translation/lang/en/template-tags.json index 9f0795b1..e7365ca6 100644 --- a/modules-available/translation/lang/en/template-tags.json +++ b/modules-available/translation/lang/en/template-tags.json @@ -1,5 +1,6 @@ { "lang_createTag": "Create Tag", + "lang_clear": "Clear", "lang_global": "Global", "lang_globalTooltip": "This tag is global; usually there is no need to translate it explicitly for this module", "lang_menuCategories": "Menu categories", @@ -7,6 +8,7 @@ "lang_missing": "Missing", "lang_missingDeps": "Missing dependencies", "lang_module": "Module", + "lang_modullist": "List of Modules", "lang_otherStrings": "Other strings", "lang_sample": "Sample", "lang_status": "Status", @@ -16,7 +18,7 @@ "lang_templateHint": "Hint: Yellow lines indicate a translation is missing and red lines indicate a tag is not being used by the template.", "lang_templates": "Templates", "lang_translation": "Translation", - "lang_translationHeading": "Manage translations", + "lang_translationHeading": "Translation Management", "lang_unused": "Unused", "lang_unusedUnreliableHint": "Detection of unused tags only includes currently activated modules. It's possible that a tag marked \"unused\" is actually refered to in a module not activated." }
\ No newline at end of file diff --git a/modules-available/translation/templates/edit.html b/modules-available/translation/templates/edit.html index 082e2cb5..3c66aef6 100644 --- a/modules-available/translation/templates/edit.html +++ b/modules-available/translation/templates/edit.html @@ -1,21 +1,90 @@ -<div class="panel panel-default"> - <div class="panel-heading"> - {{module}} / {{section}} +<h1>{{lang_translationHeading}}: {{module}} / {{section}}</h1> + +<div class="alert alert-info"> + {{lang_templateHint}} +</div> + +<form action="?do=Translation" method="post" class="slx-visible-rows"> + <table id="moduleTable" class="table table-condensed table-hover stupidtable"> + <thead> + <tr> + <th>{{lang_tag}}</th> + <th>{{lang_translation}} (<b>{{language}}</b>)</th> + <th class="hidden-xs">{{lang_sample}}</th> + <th style="text-align: center;">{{lang_clear}}</th> + </tr> + </thead> + <tbody> + {{#tags}} + <tr> + <td class="col-sm-3"> + <div> + {{#unused}} + <span class="label label-danger">{{lang_unused}}</span> + {{/unused}} + {{#missing}} + <span class="label label-warning">{{lang_missing}}</span> + {{/missing}} + {{#isglobal}} + <span class="label label-success" title="{{lang_globalTooltip}}">{{lang_global}}</span> + {{/isglobal}} + {{tag}} + <div class="slx-notebox">{{{notes}}}</div> + </div> + </td> + + <td class="col-sm-4" id="tagid-{{tagid}}"> + {{^big}} + <input type="text" class="form-control switchable" value="{{translation}}" ondblclick="slxMb(this)" name="lang#!#{{tag}}" placeholder="{{placeholder}}"> + {{/big}} + {{#big}} + <textarea rows="3" class="form-control" name="lang#!#{{tag}}" placeholder="{{placeholder}}">{{translation}}</textarea> + {{/big}} + </td> + + <td class="hidden-xs col-sm-4"> + <div class="badge">{{samplelang}}</div> + {{sampletext}} + </td> + + <td class="col-sm-1" style="text-align:center; vertical-align: middle;"> + <button type="button" class="btn btn-danger btn-xs" onclick="slxDelTag({{tagid}})" tabindex="-1"> + <span class="glyphicon glyphicon-remove"></span> + </button> + </td> + </tr> + {{/tags}} + </tbody> + </table> + + + <input type="hidden" name="module" value="{{module}}"> + <input type="hidden" name="destlang" value="{{destlang}}"> + <input type="hidden" name="section" value="{{section}}"> + <input type="hidden" name="subsection" value="{{subsection}}"> + <input type="hidden" name="token" value="{{token}}"> + <div class="text-right"> + <a class="btn btn-default" href='?do=Translation' >{{lang_back}}</a> + <button type="submit" class="btn btn-primary" name="update" value="true"> + <span class="glyphicon glyphicon-floppy-disk"></span> + {{lang_save}} + </button> + <button class="btn btn-success" type="button" onclick="slxAddTag()" > + <span class="glyphicon glyphicon-plus"></span> + {{lang_createTag}} + </button> </div> - <div class="panel-body"> - <p>{{lang_templateAdminHelp}}</p> - <div class="alert alert-info"> - {{lang_templateHint}} - </div> +</form> +<br/> + +<!-- vorherige Version der "Tabelle" geregelt über Divisions + <form action="?do=Translation" method="post" class="slx-visible-rows"> <input type="hidden" name="module" value="{{module}}"> <input type="hidden" name="destlang" value="{{destlang}}"> <input type="hidden" name="section" value="{{section}}"> <input type="hidden" name="subsection" value="{{subsection}}"> <input type="hidden" name="token" value="{{token}}"> - <a class="btn btn-primary" href='?do=Translation' >{{lang_back}}</a> - <button class="btn btn-primary" type="button" onclick="slxAddTag()" >{{lang_createTag}}</button> - <button type="submit" class="btn btn-primary" name="update" value="true">{{lang_save}}</button> <div class="row"> <div class="col-xs-4 col-sm-3">{{lang_tag}}</div> <div class="col-xs-6 col-sm-4">{{lang_translation}} (<b>{{language}}</b>)</div> @@ -26,7 +95,7 @@ <div class="row"> <div class="col-xs-4 col-sm-3"> {{#unused}} - <span class="label label-info">{{lang_unused}}</span> + <span class="label label-danger">{{lang_unused}}</span> {{/unused}} {{#missing}} <span class="label label-warning">{{lang_missing}}</span> @@ -53,23 +122,25 @@ </div> <div class="col-xs-2 col-sm-2 col-lg-1"> <button type="button" class="btn btn-danger btn-xs" onclick="slxDelTag({{tagid}})" tabindex="-1"> - <span class="glyphicon glyphicon-remove"></span> + <span class="glyphicon glyphicon-trash"></span> <span class="hidden-xs">{{lang_delete}}</span> </button> </div> </div> {{/tags}} <div id="newTag"></div> - <a class="btn btn-primary" href='?do=Translation' >{{lang_back}}</a> - <button class="btn btn-primary" type="button" onclick="slxAddTag()" >{{lang_createTag}}</button> - <button type="submit" class="btn btn-primary" name="update" value="true">{{lang_save}}</button> + <br/> + <div class="text-right"> + <a class="btn btn-default" href='?do=Translation' >{{lang_back}}</a> + <button class="btn btn-success" type="button" onclick="slxAddTag()" >{{lang_createTag}}</button> + <button type="submit" class="btn btn-primary" name="update" value="true">{{lang_save}}</button> + </div> </form> - </div> -</div> -<script type="text/javascript"> - var slxNewTagCounter = 0; - function slxAddTag() - { + + + + +Function: $('#newTag').before( '<div class="row" id="new-delete-' + slxNewTagCounter + '">' + ' <div class="col-xs-4 col-sm-3">' + @@ -79,14 +150,42 @@ ' <input type="text" class="form-control" name="new-text[' + slxNewTagCounter + ']">' + ' </div>' + ' <div class="hidden-xs col-sm-4">' + - ' </div>' + + ' </div>' + ' <div class="col-xs-2 col-sm-1">' + ' <button type="button" class="btn btn-danger btn-xs" onclick="slxDelNew(' + slxNewTagCounter + ')" tabindex="-1"><span class="glyphicon glyphicon-remove"></span> {{lang_delete}}</button>' + ' </div>' + '</div>' ); + + + +--> + +<script type="text/javascript"> + var slxNewTagCounter = 0; + function slxAddTag() + { + $('#moduleTable tr:last').after( + '<tr id="new-delete-' + slxNewTagCounter + '">' + + ' <td class="col-sm-3">' + + ' <input type="text" name="new-id[' + slxNewTagCounter + ']" class="form-control">' + + ' </td>' + + ' <td class="col-sm-4">' + + ' <input type="text" class="form-control" name="new-text[' + slxNewTagCounter + ']">' + + ' </td>' + + ' <td class="hidden-xs col-sm-4"></td>' + + ' <td class="col-sm-1" style="text-align:center; vertical-align: middle;">' + + ' <button type="button" class="btn btn-danger btn-xs" onclick="slxDelNew(' + slxNewTagCounter + ')" tabindex="-1">' + + ' <span class="glyphicon glyphicon-remove"></span> ' + + ' </button>' + + ' </td>' + + '</tr>' + ); + slxNewTagCounter++; + } + function slxDelNew(id) { diff --git a/modules-available/translation/templates/module-heading.html b/modules-available/translation/templates/module-heading.html index 540828e9..8e87e22f 100644 --- a/modules-available/translation/templates/module-heading.html +++ b/modules-available/translation/templates/module-heading.html @@ -1 +1 @@ -<h1>{{moduleName}} ({{module}})</h1>
\ No newline at end of file +<h1>{{lang_translationHeading}}: {{module}}</h1>
\ No newline at end of file diff --git a/modules-available/translation/templates/module-list.html b/modules-available/translation/templates/module-list.html index 026e17e9..c0af6a9c 100644 --- a/modules-available/translation/templates/module-list.html +++ b/modules-available/translation/templates/module-list.html @@ -1,25 +1,30 @@ <h1>{{lang_translationHeading}}</h1> <div class="panel panel-default"> - <table class="table"> - <thead> - <tr> - <th>{{lang_module}}</th> - <th>{{lang_status}}</th> - <tr> - </thead> - <tbody> - {{#table}} + <div class="panel-heading"> + {{lang_modullist}} + </div> + <div class="panel-body"> + <table class="table"> + <thead> <tr> - <td> - {{#depfail}} - <div class="pull-right"><span class="red glyphicon glyphicon-exclamation-sign" title="{{lang_missingDeps}}"></span></div> - {{/depfail}} - <a href="?do=Translation&module={{module}}">{{module}}</a> - </td> - <td>{{{status}}}</td> - </tr> - {{/table}} - </tbody> - </table> + <th>{{lang_module}}</th> + <th>{{lang_status}}</th> + <tr> + </thead> + <tbody> + {{#table}} + <tr> + <td> + {{#depfail}} + <div class="pull-right"><span class="red glyphicon glyphicon-exclamation-sign" title="{{lang_missingDeps}}"></span></div> + {{/depfail}} + <a href="?do=Translation&module={{module}}">{{module}}</a> + </td> + <td>{{{status}}}</td> + </tr> + {{/table}} + </tbody> + </table> + </div> </div> |