From 20edb75f6647aa36c0ae4f58a4aff4d8958604af Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Sun, 29 Jul 2012 10:06:48 -0500
Subject: [PATCH] converted locale to plugins
---
includes/cache.inc | 4 ++--
...er_argument_locale_group.inc => Group.php} | 13 ++++++++++-
...ument_locale_language.inc => Language.php} | 13 ++++++++++-
...ndler_field_locale_group.inc => Group.php} | 13 ++++++++++-
...field_locale_language.inc => Language.php} | 13 ++++++++++-
...ield_locale_link_edit.inc => LinkEdit.php} | 13 ++++++++++-
...eld_node_language.inc => NodeLanguage.php} | 13 ++++++++++-
...dler_filter_locale_group.inc => Group.php} | 11 +++++++++-
...ilter_locale_language.inc => Language.php} | 5 ++++-
...ter_node_language.inc => NodeLanguage.php} | 11 +++++++++-
..._filter_locale_version.inc => Version.php} | 11 +++++++++-
modules/comment.views.inc | 6 ++---
modules/locale.views.inc | 22 +++++++++----------
13 files changed, 122 insertions(+), 26 deletions(-)
rename lib/Drupal/locale/Plugin/views/argument/{views_handler_argument_locale_group.inc => Group.php} (77%)
rename lib/Drupal/locale/Plugin/views/argument/{views_handler_argument_locale_language.inc => Language.php} (76%)
rename lib/Drupal/locale/Plugin/views/field/{views_handler_field_locale_group.inc => Group.php} (63%)
rename lib/Drupal/locale/Plugin/views/field/{views_handler_field_locale_language.inc => Language.php} (80%)
rename lib/Drupal/locale/Plugin/views/field/{views_handler_field_locale_link_edit.inc => LinkEdit.php} (85%)
rename lib/Drupal/locale/Plugin/views/field/{views_handler_field_node_language.inc => NodeLanguage.php} (82%)
rename lib/Drupal/locale/Plugin/views/filter/{views_handler_filter_locale_group.inc => Group.php} (72%)
rename lib/Drupal/locale/Plugin/views/filter/{views_handler_filter_locale_language.inc => Language.php} (84%)
rename lib/Drupal/locale/Plugin/views/filter/{views_handler_filter_node_language.inc => NodeLanguage.php} (78%)
rename lib/Drupal/locale/Plugin/views/filter/{views_handler_filter_locale_version.inc => Version.php} (80%)
diff --git a/includes/cache.inc b/includes/cache.inc
index f01bad040c79..1c554dc780fd 100644
--- a/includes/cache.inc
+++ b/includes/cache.inc
@@ -87,8 +87,6 @@ function _views_data_process_entity_types(&$data) {
* Fetch the plugin data from cache.
*/
function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALSE) {
- $manager = views_get_plugin_manager($type);
-
if (!$type && !$plugin_id) {
$plugins = array();
$plugin_types = array('access', 'argument_default', 'argument_validator', 'cache', 'display_extender', 'display', 'exposed_form', 'localization', 'pager', 'query', 'row', 'style', 'wizard');
@@ -99,6 +97,8 @@ function _views_fetch_plugin_data($type = NULL, $plugin_id = NULL, $reset = FALS
return $plugins;
}
+ $manager = views_get_plugin_manager($type);
+
if (!$plugin_id) {
return $manager->getDefinitions();
}
diff --git a/lib/Drupal/locale/Plugin/views/argument/views_handler_argument_locale_group.inc b/lib/Drupal/locale/Plugin/views/argument/Group.php
similarity index 77%
rename from lib/Drupal/locale/Plugin/views/argument/views_handler_argument_locale_group.inc
rename to lib/Drupal/locale/Plugin/views/argument/Group.php
index 7ced836677ad..23524d4264a4 100644
--- a/lib/Drupal/locale/Plugin/views/argument/views_handler_argument_locale_group.inc
+++ b/lib/Drupal/locale/Plugin/views/argument/Group.php
@@ -5,12 +5,23 @@
* Definition of views_handler_argument_locale_group.
*/
+namespace Drupal\locale\Plugin\views\argument;
+
+use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Argument handler to accept a language.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_locale_group extends views_handler_argument {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_group"
+ * )
+ */
+class Group extends ArgumentPluginBase {
function construct() {
parent::construct('group');
}
diff --git a/lib/Drupal/locale/Plugin/views/argument/views_handler_argument_locale_language.inc b/lib/Drupal/locale/Plugin/views/argument/Language.php
similarity index 76%
rename from lib/Drupal/locale/Plugin/views/argument/views_handler_argument_locale_language.inc
rename to lib/Drupal/locale/Plugin/views/argument/Language.php
index 316d4b153c91..a6f808112505 100644
--- a/lib/Drupal/locale/Plugin/views/argument/views_handler_argument_locale_language.inc
+++ b/lib/Drupal/locale/Plugin/views/argument/Language.php
@@ -5,12 +5,23 @@
* Definition of views_handler_argument_locale_language.
*/
+namespace Drupal\locale\Plugin\views\argument;
+
+use Drupal\views\Plugins\views\argument\ArgumentPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Argument handler to accept a language.
*
* @ingroup views_argument_handlers
*/
-class views_handler_argument_locale_language extends views_handler_argument {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_language"
+ * )
+ */
+class Language extends ArgumentPluginBase {
function construct() {
parent::construct('language');
}
diff --git a/lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_group.inc b/lib/Drupal/locale/Plugin/views/field/Group.php
similarity index 63%
rename from lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_group.inc
rename to lib/Drupal/locale/Plugin/views/field/Group.php
index 393a9487cfea..b95437f24b58 100644
--- a/lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_group.inc
+++ b/lib/Drupal/locale/Plugin/views/field/Group.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_locale_group.
*/
+namespace Drupal\locale\Plugin\views\field;
+
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to translate a group into its readable form.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_locale_group extends views_handler_field {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_group"
+ * )
+ */
+class Group extends FieldPluginBase {
function render($values) {
$groups = module_invoke_all('locale', 'groups');
// Sort the list.
diff --git a/lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_language.inc b/lib/Drupal/locale/Plugin/views/field/Language.php
similarity index 80%
rename from lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_language.inc
rename to lib/Drupal/locale/Plugin/views/field/Language.php
index 8038e2b3023a..d86d456ed16b 100644
--- a/lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_language.inc
+++ b/lib/Drupal/locale/Plugin/views/field/Language.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_locale_language.
*/
+namespace Drupal\locale\Plugin\views\field;
+
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to translate a language into its readable form.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_locale_language extends views_handler_field {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_language"
+ * )
+ */
+class Language extends FieldPluginBase {
function option_definition() {
$options = parent::option_definition();
$options['native_language'] = array('default' => FALSE, 'bool' => TRUE);
diff --git a/lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_link_edit.inc b/lib/Drupal/locale/Plugin/views/field/LinkEdit.php
similarity index 85%
rename from lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_link_edit.inc
rename to lib/Drupal/locale/Plugin/views/field/LinkEdit.php
index 378935517f9d..6fa0a469e18b 100644
--- a/lib/Drupal/locale/Plugin/views/field/views_handler_field_locale_link_edit.inc
+++ b/lib/Drupal/locale/Plugin/views/field/LinkEdit.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_locale_link_edit.
*/
+namespace Drupal\locale\Plugin\views\field;
+
+use Drupal\views\Plugins\views\field\FieldPluginBase;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to present a link to edit a translation.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_locale_link_edit extends views_handler_field {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_link_edit"
+ * )
+ */
+class LinkEdit extends FieldPluginBase {
function construct() {
parent::construct();
$this->additional_fields['lid'] = 'lid';
diff --git a/lib/Drupal/locale/Plugin/views/field/views_handler_field_node_language.inc b/lib/Drupal/locale/Plugin/views/field/NodeLanguage.php
similarity index 82%
rename from lib/Drupal/locale/Plugin/views/field/views_handler_field_node_language.inc
rename to lib/Drupal/locale/Plugin/views/field/NodeLanguage.php
index 467605b03aa0..d350e6ef0fd1 100644
--- a/lib/Drupal/locale/Plugin/views/field/views_handler_field_node_language.inc
+++ b/lib/Drupal/locale/Plugin/views/field/NodeLanguage.php
@@ -5,12 +5,23 @@
* Definition of views_handler_field_node_language.
*/
+namespace Drupal\locale\Plugin\views\field;
+
+use Drupal\node\Plugin\views\field\Node;
+use Drupal\Core\Annotation\Plugin;
+
/**
* Field handler to translate a language into its readable form.
*
* @ingroup views_field_handlers
*/
-class views_handler_field_node_language extends views_handler_field_node {
+
+/**
+ * @Plugin(
+ * plugin_id = "node_language"
+ * )
+ */
+class NodeLanguage extends Node {
function option_definition() {
$options = parent::option_definition();
$options['native_language'] = array('default' => FALSE, 'bool' => TRUE);
diff --git a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_group.inc b/lib/Drupal/locale/Plugin/views/filter/Group.php
similarity index 72%
rename from lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_group.inc
rename to lib/Drupal/locale/Plugin/views/filter/Group.php
index ba9613223e9d..48c38e8cc4a8 100644
--- a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_group.inc
+++ b/lib/Drupal/locale/Plugin/views/filter/Group.php
@@ -5,6 +5,9 @@
* Definition of views_handler_filter_locale_group.
*/
+namespace Drupal\locale\Plugin\views\filter;
+
+use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugins\views\filter\InOperator;
/**
@@ -12,7 +15,13 @@
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_locale_group extends InOperator {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_group"
+ * )
+ */
+class Group extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Group');
diff --git a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_language.inc b/lib/Drupal/locale/Plugin/views/filter/Language.php
similarity index 84%
rename from lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_language.inc
rename to lib/Drupal/locale/Plugin/views/filter/Language.php
index 9725a3135fb1..84ff4d77a236 100644
--- a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_language.inc
+++ b/lib/Drupal/locale/Plugin/views/filter/Language.php
@@ -5,6 +5,9 @@
* Definition of views_handler_filter_locale_language.
*/
+namespace Drupal\locale\Plugin\views\filter;
+
+use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugins\views\filter\InOperator;
/**
@@ -12,7 +15,7 @@
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_locale_language extends InOperator {
+class Language extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Language');
diff --git a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_node_language.inc b/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
similarity index 78%
rename from lib/Drupal/locale/Plugin/views/filter/views_handler_filter_node_language.inc
rename to lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
index bff9f6495e8e..3c518e803c69 100644
--- a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_node_language.inc
+++ b/lib/Drupal/locale/Plugin/views/filter/NodeLanguage.php
@@ -5,6 +5,9 @@
* Definition of views_handler_filter_node_language.
*/
+namespace Drupal\locale\Plugin\views\filter;
+
+use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugins\views\filter\InOperator;
/**
@@ -12,7 +15,13 @@
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_node_language extends InOperator {
+
+/**
+ * @Plugin(
+ * plugin_id = "node_language"
+ * )
+ */
+class NodeLanguage extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Language');
diff --git a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_version.inc b/lib/Drupal/locale/Plugin/views/filter/Version.php
similarity index 80%
rename from lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_version.inc
rename to lib/Drupal/locale/Plugin/views/filter/Version.php
index d5c1f019b15f..b19bbc24cb0a 100644
--- a/lib/Drupal/locale/Plugin/views/filter/views_handler_filter_locale_version.inc
+++ b/lib/Drupal/locale/Plugin/views/filter/Version.php
@@ -5,6 +5,9 @@
* Definition of views_handler_filter_locale_version.
*/
+namespace Drupal\locale\Plugin\views\filter;
+
+use Drupal\Core\Annotation\Plugin;
use Drupal\views\Plugins\views\filter\InOperator;
/**
@@ -12,7 +15,13 @@
*
* @ingroup views_filter_handlers
*/
-class views_handler_filter_locale_version extends InOperator {
+
+/**
+ * @Plugin(
+ * plugin_id = "locale_version"
+ * )
+ */
+class Version extends InOperator {
function get_value_options() {
if (!isset($this->value_options)) {
$this->value_title = t('Version');
diff --git a/modules/comment.views.inc b/modules/comment.views.inc
index cb63d544c93a..b451dc8567c6 100644
--- a/modules/comment.views.inc
+++ b/modules/comment.views.inc
@@ -175,14 +175,14 @@ function comment_views_data() {
'title' => t('Language'),
'help' => t('The language the comment is in.'),
'field' => array(
- 'handler' => 'views_handler_field_locale_language',
+ 'plugin_id' => 'locale_language',
'click sortable' => TRUE,
),
'filter' => array(
- 'handler' => 'views_handler_filter_locale_language',
+ 'plugin_id' => 'locale_language',
),
'argument' => array(
- 'handler' => 'views_handler_argument_locale_language',
+ 'plugin_id' => 'locale_language',
),
'sort' => array(
'plugin_id' => 'standard',
diff --git a/modules/locale.views.inc b/modules/locale.views.inc
index 8f646c779425..b4246fe99d89 100644
--- a/modules/locale.views.inc
+++ b/modules/locale.views.inc
@@ -70,14 +70,14 @@ function locale_views_data() {
'title' => t('Group'),
'help' => t('The group the translation is in.'),
'field' => array(
- 'handler' => 'views_handler_field_locale_group',
+ 'plugin_id' => 'locale_group',
'click sortable' => TRUE,
),
'filter' => array(
- 'handler' => 'views_handler_filter_locale_group',
+ 'plugin_id' => 'locale_group',
),
'argument' => array(
- 'handler' => 'views_handler_argument_locale_group',
+ 'plugin_id' => 'locale_group',
),
);
@@ -104,7 +104,7 @@ function locale_views_data() {
'click sortable' => TRUE,
),
'filter' => array(
- 'handler' => 'views_handler_filter_locale_version',
+ 'plugin_id' => 'locale_version',
),
'argument' => array(
'plugin_id' => 'string',
@@ -116,7 +116,7 @@ function locale_views_data() {
'field' => array(
'title' => t('Edit link'),
'help' => t('Provide a simple link to edit the translations.'),
- 'handler' => 'views_handler_field_locale_link_edit',
+ 'plugin_id' => 'locale_link_edit',
),
);
@@ -154,14 +154,14 @@ function locale_views_data() {
'title' => t('Language'),
'help' => t('The language this translation is in.'),
'field' => array(
- 'handler' => 'views_handler_field_locale_language',
+ 'plugin_id' => 'locale_language',
'click sortable' => TRUE,
),
'filter' => array(
- 'handler' => 'views_handler_filter_locale_language',
+ 'plugin_id' => 'locale_language',
),
'argument' => array(
- 'handler' => 'views_handler_argument_locale_language',
+ 'plugin_id' => 'locale_language',
),
);
@@ -205,14 +205,14 @@ function locale_views_data_alter(&$data) {
'title' => t('Language'),
'help' => t('The language the content is in.'),
'field' => array(
- 'handler' => 'views_handler_field_node_language',
+ 'plugin_id' => 'node_language',
'click sortable' => TRUE,
),
'filter' => array(
- 'handler' => 'views_handler_filter_node_language',
+ 'plugin_id' => 'node_language',
),
'argument' => array(
- 'handler' => 'views_handler_argument_node_language',
+ 'plugin_id' => 'node_language',
),
'sort' => array(
'plugin_id' => 'standard',
--
GitLab