From 1af585da6392e72098da232beeef67adbc197534 Mon Sep 17 00:00:00 2001
From: Dries <dries@buytaert.net>
Date: Wed, 27 Feb 2013 16:24:00 -0500
Subject: [PATCH] Issue #1784846 by beltofte, Floydm: Standardize
capitalization on actions in operations in shortcut: 'list links', 'edit
set', 'delete set', 'edit, 'delete'.
---
.../Drupal/shortcut/ShortcutListController.php | 6 +++---
core/modules/shortcut/shortcut.admin.inc | 4 ++--
sites/default/default.settings.php | 15 +++++----------
3 files changed, 10 insertions(+), 15 deletions(-)
diff --git a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
index 401d280fe823..6cf8f9d8c742 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/ShortcutListController.php
@@ -29,18 +29,18 @@ public function buildHeader() {
public function getOperations(EntityInterface $entity) {
$uri = $entity->uri();
$operations['list'] = array(
- 'title' => t('list links'),
+ 'title' => t('List links'),
'href' => $uri['path'],
);
$operations['edit'] = array(
- 'title' => t('edit set'),
+ 'title' => t('Edit set'),
'href' => $uri['path'] . '/edit',
'options' => $uri['options'],
'weight' => 10,
);
if (shortcut_set_delete_access($entity)) {
$operations['delete'] = array(
- 'title' => t('delete set'),
+ 'title' => t('Delete set'),
'href' => $uri['path'] . '/delete',
'options' => $uri['options'],
'weight' => 100,
diff --git a/core/modules/shortcut/shortcut.admin.inc b/core/modules/shortcut/shortcut.admin.inc
index c1731545e319..0e43052f51f6 100644
--- a/core/modules/shortcut/shortcut.admin.inc
+++ b/core/modules/shortcut/shortcut.admin.inc
@@ -222,11 +222,11 @@ function shortcut_set_customize($form, &$form_state, $shortcut_set) {
);
$links['edit'] = array(
- 'title' => t('edit'),
+ 'title' => t('Edit'),
'href' => "admin/config/user-interface/shortcut/link/$mlid",
);
$links['delete'] = array(
- 'title' => t('delete'),
+ 'title' => t('Delete'),
'href' => "admin/config/user-interface/shortcut/link/$mlid/delete",
);
$form['shortcuts']['links'][$mlid]['operations'] = array(
diff --git a/sites/default/default.settings.php b/sites/default/default.settings.php
index 1356d79da990..4c1239ab2493 100644
--- a/sites/default/default.settings.php
+++ b/sites/default/default.settings.php
@@ -286,16 +286,11 @@
/**
* Twig debugging:
*
- * When debugging is enabled:
- * - The markup of each Twig template is surrounded by HTML comments which
- * contain theming information such as template file name suggestions.
- * - The 'dump' function can be used in Twig templates to output information
- * about template variables.
- * - Twig templates are automatically recompiled whenever the source code
- * changes (see twig_auto_reload below).
- *
- * For more information about debugging Twig templates, see
- * http://drupal.org/node/1906392.
+ * When enabled, you can use the 'dump' function in Twig templates to output
+ * information about variables, and templates are automatically recompiled
+ * whenever the source code changes.
+ *
+ * @see http://drupal.org/node/1906392
*
* Not recommended in production environments (Default: FALSE).
*/
--
GitLab