Merge pull request django-cms#2290 from ArtisAvotins/develop

Fixed a typo in both documentation and code. The word 'labes' is used instead of 'labels'

Author: yakky

cms/test_utils/cli.py

@@ -205,7 +205,7 @@ def configure(db_url, **extra):
                 'plugin_modules': {
                     'LinkPlugin': 'Different Grouper'
                 },
-                'plugin_labes': {
+                'plugin_labels': {
                     'LinkPlugin': 'Add a link'
                 }
             },

cms/utils/placeholder.py

@@ -14,7 +14,7 @@ def get_toolbar_plugin_struct(plugins_list, slot, page, parent=None):
     The dictionary contains the label, the classname and the module for the
     plugin.
     Names and modules can be defined on a per-placeholder basis using
-    'plugin_modules' and 'plugin_labes' attributes in CMS_PLACEHOLDER_CONF
+    'plugin_modules' and 'plugin_labels' attributes in CMS_PLACEHOLDER_CONF
 
     :param plugins_list: list of plugins valid for the placeholder
     :param slot: placeholder slot name
@@ -35,7 +35,7 @@ def get_toolbar_plugin_struct(plugins_list, slot, page, parent=None):
                 continue
 
         modules = get_placeholder_conf("plugin_modules", slot, template, default={})
-        names = get_placeholder_conf("plugin_labes", slot, template, default={})
+        names = get_placeholder_conf("plugin_labels", slot, template, default={})
         main_list.append({'value': plugin.value,
                           'name': force_unicode(names.get(plugin.value, plugin.name)),
                           'module': force_unicode(modules.get(plugin.value, plugin.module))})

docs/getting_started/configuration.rst

@@ -96,7 +96,7 @@ Example::
             'plugin_modules': {
                 'LinkPlugin': 'Extra',
             }.
-            'plugin_labes': {
+            'plugin_labels': {
                 'LinkPlugin': 'Add a link',
             }.
         },
@@ -139,7 +139,7 @@ plugins, as shown above with ``base.html content``.
     A dictionary of plugins and custom module names to group plugin in the
     toolbar UI.
 
-``plugin_labes``
+``plugin_labels``
     A dictionary of plugins and custom labels to show in the toolbar UI.
 
 ``child_classes``