Translations: rename MODULAR to MODULE everywhere

This commit is contained in:
Matias Griese
2019-11-20 09:51:58 +02:00
parent d9696a5c93
commit 6fb45b37f4
8 changed files with 18 additions and 17 deletions

View File

@@ -7,6 +7,7 @@
1. [](#improved)
* Improved `permissions` field to add support for displaying calculated permissions
* Grav 1.7: Updated deprecated `$page->modular()` method calls to `$page->isModule()`
* Translations: rename MODULAR to MODULE everywhere
1. [](#bugfix)
* Fixed `permissions` field with nested permissions

View File

@@ -1012,8 +1012,8 @@ class AdminPlugin extends Plugin
'EDITOR',
'PREVIEW',
'FULLSCREEN',
'MODULAR',
'NON_MODULAR',
'MODULE',
'NON_MODULE',
'VISIBLE',
'NON_VISIBLE',
'ROUTABLE',

View File

@@ -10,7 +10,7 @@ form:
section:
type: section
title: PLUGIN_ADMIN.ADD_MODULAR_CONTENT
title: PLUGIN_ADMIN.ADD_MODULE_CONTENT
title:
type: text
@@ -35,7 +35,7 @@ form:
name:
type: select
classes: fancy
label: PLUGIN_ADMIN.MODULAR_TEMPLATE
label: PLUGIN_ADMIN.MODULE_TEMPLATE
help: PLUGIN_ADMIN.PAGE_FILE_HELP
default: default
data-options@: '\Grav\Plugin\AdminPlugin::pagesModularTypes'

View File

@@ -86,7 +86,7 @@ form:
name:
type: select
classes: fancy
label: PLUGIN_ADMIN.MODULAR_TEMPLATE
label: PLUGIN_ADMIN.MODULE_TEMPLATE
default: default
data-options@: '\Grav\Plugin\AdminPlugin::pagesModularTypes'
validate:

View File

@@ -34,7 +34,6 @@ PLUGIN_ADMIN:
NEXT: "Next"
PREVIOUS: "Previous"
ADD_PAGE: "Add Page"
ADD_MODULAR: "Add Modular"
MOVE: "Move"
DELETE: "Delete"
UNSET: "Unset"
@@ -304,11 +303,9 @@ PLUGIN_ADMIN:
FOLDER: "Folder"
ASCENDING: "Ascending"
DESCENDING: "Descending"
ADD_MODULAR_CONTENT: "Add Modular Content"
PAGE_TITLE: "Page Title"
PAGE_TITLE_HELP: "The title of the page"
PAGE: "Page"
MODULAR_TEMPLATE: "Modular Template"
FRONTMATTER: "Frontmatter"
FILENAME: "Filename"
PARENT_PAGE: "Parent Page"
@@ -618,10 +615,7 @@ PLUGIN_ADMIN:
EDITOR: "Editor"
PREVIEW: "Preview"
FULLSCREEN: "Fullscreen"
MODULAR: "Modular"
MODULAR_SETUP: "Modular Setup"
NON_ROUTABLE: "Non-Routable"
NON_MODULAR: "Non-Modular"
NON_VISIBLE: "Non-Visible"
NON_PUBLISHED: "Non-Published"
CHARACTERS: "characters"
@@ -861,3 +855,9 @@ PLUGIN_ADMIN:
SUPER_USER: "Super User"
ALLOWED: "Allowed"
DENIED: "Denied"
MODULE: "Module"
NON_MODULE: "Non-Module"
ADD_MODULE: "Add Module"
MODULE_SETUP: "Module Setup"
MODULE_TEMPLATE: "Module Template"
ADD_MODULE_CONTENT: "Add Module Content"

View File

@@ -10,11 +10,11 @@ import '../utils/storage';
/* @formatter:off */
/* eslint-disable */
const options = [
{ flag: translations.PLUGIN_ADMIN.MODULAR, key: 'Modular', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.MODULE, key: 'Module', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.VISIBLE, key: 'Visible', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.ROUTABLE, key: 'Routable', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.PUBLISHED, key: 'Published', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.NON_MODULAR, key: 'NonModular', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.NON_MODULE, key: 'NonModule', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.NON_VISIBLE, key: 'NonVisible', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.NON_ROUTABLE, key: 'NonRoutable', cat: 'mode' },
{ flag: translations.PLUGIN_ADMIN.NON_PUBLISHED, key: 'NonPublished', cat: 'mode' }

View File

@@ -27,7 +27,7 @@
{% for p in pcol %}
{% set description = (not p.page ? "PLUGIN_ADMIN.FOLDER"|tu ~ ' • ' : "PLUGIN_ADMIN.PAGE"|tu ~ ' • ') ~
(p.isModule ? "PLUGIN_ADMIN.MODULAR"|tu ~ ' • ' : '') ~
(p.isModule ? "PLUGIN_ADMIN.MODULE"|tu ~ ' • ' : '') ~
(p.routable ? "PLUGIN_ADMIN.ROUTABLE"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_ROUTABLE"|tu ~ ' • ') ~
(p.visible ? "PLUGIN_ADMIN.VISIBLE"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_VISIBLE"|tu ~ ' • ') ~
(p.published ? "PLUGIN_ADMIN.PUBLISHED"|tu ~ ' • ' : "PLUGIN_ADMIN.NON_PUBLISHED"|tu ~ ' • ') %}
@@ -159,7 +159,7 @@
<li><a class="button" href="#modal" data-remodal-target="modal">{{ "PLUGIN_ADMIN.ADD_PAGE"|tu }}</a></li>
<li><a class="button" href="#modal-folder" data-remodal-target="modal-folder">{{ "PLUGIN_ADMIN.ADD_FOLDER"|tu }}</a></li>
{% if admin.modularTypes is not empty %}
<li><a class="button" href="#modular" data-remodal-target="modular">{{ "PLUGIN_ADMIN.ADD_MODULAR"|tu }}</a></li>
<li><a class="button" href="#modular" data-remodal-target="modular">{{ "PLUGIN_ADMIN.ADD_MODULE"|tu }}</a></li>
{% endif %}
{% for key, add_modal in config.plugins.admin.add_modals %}
{% if add_modal.show_in|defined('bar') == 'dropdown' %}
@@ -230,7 +230,7 @@
<li><a class="button" href="#modal" data-remodal-target="modal">{{ "PLUGIN_ADMIN.ADD_PAGE"|tu }}</a></li>
<li><a class="button" href="#modal-folder" data-remodal-target="modal-folder">{{ "PLUGIN_ADMIN.ADD_FOLDER"|tu }}</a></li>
{% if admin.modularTypes is not empty %}
<li><a class="button" href="#modular" data-remodal-target="modular">{{ "PLUGIN_ADMIN.ADD_MODULAR"|tu }}</a></li>
<li><a class="button" href="#modular" data-remodal-target="modular">{{ "PLUGIN_ADMIN.ADD_MODULE"|tu }}</a></li>
{% endif %}
</ul>
</div>

View File

@@ -1,4 +1,4 @@
{% set legend = {'VISIBLE':'', 'NON_ROUTABLE':'not-routable', 'NON_VISIBLE':'not-visible', 'MODULAR':'modular'} %}
{% set legend = {'VISIBLE':'', 'NON_ROUTABLE':'not-routable', 'NON_VISIBLE':'not-visible', 'MODULE':'module'} %}
<div id="pages-legend">
<strong>{{ 'PLUGIN_ADMIN.LEGEND'|tu }}:</strong>
<ul>