' . '
' . t('ThemeKey allows you to define simple or sophisticated Theme Switching Rules. Using these rules you are able to use a different theme depending on current path, taxonomy terms, language, node type and many many more properties. It can also be easily extended to support additional properties as exposed by other modules.') . '
' . + return '' . t('ThemeKey allows you to define simple or sophisticated Theme Switching Rules. Using these rules you can use a different theme depending on current path, taxonomy terms, language, node type and many, many more properties. It can also be easily extended to support additional properties, as exposed by other modules.') . '
' . '' . $text_1 . '
'. drupal_get_form('themekey_help_tutorials_form', FALSE) . drupal_get_form('themekey_help_examples_form', FALSE) . @@ -216,7 +216,7 @@ function themekey_help($path, $arg) { /** * Replacement for drupal_set_message() during ThemeKey's initialization. - * drupal_set_message() might call init_theme() to early which causes ThemeKey + * drupal_set_message() might call init_theme() too early, which causes ThemeKey * to not switch the theme. * * themekey_set_debug_message() put the untranslated messages on a stack and @@ -272,8 +272,8 @@ function themekey_footer() { /** * Returns the content of $_GET['q'] as expected. - * Therefor $_GET['q'] gets transformed if necessary. - * P.e. ajax views rewrites the q parameter. + * Therefore, $_GET['q'] gets transformed if necessary. + * E.g., Ajax Views rewrites the q parameter. * * @return string */ Index: themekey_admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_admin.inc,v retrieving revision 1.20.2.15 diff -u -p -r1.20.2.15 themekey_admin.inc --- themekey_admin.inc 14 Oct 2010 19:56:07 -0000 1.20.2.15 +++ themekey_admin.inc 31 Oct 2010 12:00:14 -0000 @@ -272,8 +272,8 @@ function themekey_form_alter(&$form, $fo if ('drupal:path:wildcard' != $value_2['property']['#default_value'] || ('drupal:path:wildcard' == $value_2['property']['#default_value'] && $value_2['wildcard']['#default_value'] == $value_1['wildcard']['#default_value'])) { - // We have two identical rules with same 'indention' in a chain. - // This is allowed only if first one has childs and second one has none and one isn't the parent of the other + // We have two identical rules with the same 'indention' in a chain. + // This is allowed only if the first rule has children and second has none and one isn't the parent of the other if (!$value_2['parent']['#default_value'] == $value_1['id']['#value']) { $has_childs_1 = FALSE; $has_childs_2 = FALSE; @@ -434,7 +434,7 @@ function themekey_settings_form() { '#type' => 'checkbox', '#title' => t('Property drupal:path is case sensitive'), '#default_value' => variable_get('themekey_path_case_sensitive', 0), - '#description' => t('Drupal paths are case insesitive by default. Modules like Global Redirect might change this behavior.') + '#description' => t('Drupal paths are case-insensitive by default. Modules like Global Redirect might change this behavior.') ); $form['settings']['themekey_allthemes'] = array( @@ -448,14 +448,14 @@ function themekey_settings_form() { '#type' => 'checkbox', '#title' => t('Force custom theme overriding'), '#default_value' => variable_get('themekey_override_custom_theme', 0), - '#description' => t('Select this option to force ThemeKey to set the custom theme. Otherwise ThemeKey will set the custom theme only if it\'s not already set by a different module.' . t('Note: This tutorial uses some ThemeKey properties from an additional module called !themekey_properties_link.', array('!themekey_properties_link' => l(t('!path', array('!path' => 'ThemeKey Properties')), 'http://drupal.org/project/themekey_properties'))) . '
' . '' . t("In this tutorial you'll learn how to define ThemeKey rules and how to cascade them to achieve sophisticated rule chains.") . '
' . -'' . t("The use case is to use a different theme during conent creation for premium users, p.e. you don't want to show advertisements or you want to show some advanced help blocks ...") . '
' . -'' . t('Therefor you created two user roles called "premium user" and "standard user". Using ThemeKey it\'s easy to create a rule that switches the theme in general if a user\'s role is "premium user":') . '
' .
+'
' . t("The use case is to use a different theme during content creation for premium users, e.g., you don't want to show advertisements or you want to show some advanced help blocks ...") . '
' . +'' . t('Therefore you created two user roles called "premium user" and "standard user". Using ThemeKey it\'s easy to create a rule that switches the theme if a user\'s role is "premium user":') . '
' .
'
' . t('The same way we can create a rule that switches the theme if a content creation form is requested. To do this for any kind of content we use ThemeKey\'s drupal:path property and it\'s wildcard feature:') . '
' .
+'
' . t('Similarly, we can also create a rule that switches the theme if a content creation form is requested. To do this for any kind of content we use ThemeKey\'s drupal:path property and its wildcard feature:') . '
' .
'
' . t('But having these two seperated rules is not what our use case described. To implement our use case we have to cascade or "chain" both rules. Using the cross in front of a rule you can move any rule up and down or indent it. The chain we need should like this:') . '
' .
+'
' . t('But having these two separate rules is not what our use case describes. To implement our use case, we have to cascade or "chain" both rules. By dragging on the cross icon in front of a rule, you can move any rule up and down or indent it. The chain we need should like this:') . '
' .
'
' . t('Now using this chain ThemeKey only switches the theme on content creation forms if the current user\'s role is "premium user". Non premium users will use current system standard theme.') . '
' . -'' . t('You might noticed that the theme select box disapeared for the first rule as you intented the second one. That\'s because both seperated rules became one.') . '
' . +'' . t('Now using this chain, ThemeKey only switches the theme on content creation forms if the current user\'s role is "premium user". Non-premium users will use the current standard system theme.') . '
' . +'' . t('You might have noticed that the theme select box disappeared for the first rule as you indented the second one. That\'s because both separate rules became one.') . '
' . '' . t('Now it\'s possible to extend our chain to use another dedicated theme on content creation forms for "standard users".') . '
' .
'
' . t('If you have more than these two roles in your system and you simply want use a theme for premium users and one for non premium users on content creation pages you don\'t need to add one rule per role like decribed above. In this case it\'s easier to change the latest rule we added and say any other rule than "premium user" using ThemeKey\'s not operator "!".') . '
' .
+'
' . t('If you have more than these two roles in your system and you simply want to use one theme for premium users and another for non-premium users, on content creation pages, you don\'t need to add one rule per role, as described above. In this case, it\'s easier to change the latest rule we added and say any other rule other than "premium user", using ThemeKey\'s not operator "!".') . '
' .
'
' . t('Now we implemented our use case using chained ThemeKey rules and you can add more rules to ThemeKey\'s Rule Chain to implement different use cases. The only decision you have to take is the order the rules are checked by ThemeKey on every page request. To demonstrate this let\'s add another rule that switches the theme if the user uses an iPhone to access your page.') . '
' .
+'
' . t('Now that we have implemented our use case using chained ThemeKey rules, you can add more rules to ThemeKey\'s Rule Chain to implement different use cases. The only decision you have to make is the order the rules are checked by ThemeKey on every page request. To demonstrate this, let\'s add another rule that switches the theme if the user uses an iPhone to access your page.') . '
' .
'
' . t('What happens now is that ThemeKey switches to a special theme for iPhones as soon as the user uses such a device to access you page because ThemeKey stops processing the rules if a rule or one set of chained rules matched. This means that content creation forms are shown using the iPhone theme as well no matter which role is assigned to the current user.') . '
' . -'' . t('I think that\'s a good choice. If you move the iPhone rule below the chain for the content cration form these forms will use the configured themes even on the iPhone which might not be suitable to display them.') . '
' . -'' . t('If you like to treat node creation forms differently even on the iPhone you should "chain" a dedicated set of rules for that.') . '
' .
+'
' . t('What happens now is that ThemeKey switches to a special theme for iPhones whenever the user accesses your page using such a device, because ThemeKey stops processing the rules if a rule, or one set of chained rules, matches. This means that content creation forms are shown using the iPhone theme, regardless of the role assigned to the current user.') . '
' . +'' . t('I think that\'s a good choice. If you move the iPhone rule below the chain for the content cration form, these forms will use the configured themes even on the iPhone, which might not be suitable for displaying them.') . '
' . +'' . t('If you\'d like to treat node creation forms differently, even on the iPhone, you should "chain" a dedicated set of rules for that.') . '
' .
'
' . t('Have Fun!') . '
', ); @@ -88,7 +88,7 @@ function themekey_help_tutorials_form($c /** - * Uses drupal's form builder to format ThemeKey's help examples + * Uses Drupal's form builder to format ThemeKey's help examples * * @see themekey_help() */ @@ -109,7 +109,7 @@ function themekey_help_examples_form($co $form['themekey_help_examples']['Set a special theme for site administrator']['item'] = array( '#type' => 'item', - '#value' => t('Create a Theme Switching Rules:') . '
+ '#value' => t('Create Theme Switching Rules:') . '
Property: user:uid
Operator: =
Value: 1
@@ -135,7 +135,7 @@ Value: 1
/**
- * Uses drupal's form builder to format ThemeKey's help properties
+ * Uses Drupal's form builder to format ThemeKey's help properties
*
* @see themekey_help()
*/
@@ -179,7 +179,7 @@ function themekey_help_properties_form($
/**
- * Uses drupal's form builder to format ThemeKey's help operators
+ * Uses Drupal's form builder to format ThemeKey's help operators
*
* @see themekey_help()
*/
@@ -198,27 +198,27 @@ function themekey_help_operators_form($c
$form['themekey_help_operators']['!'] = array(
'#type' => 'item',
- '#value' => t('!
not equals'),
+ '#value' => t('!
not equal to'),
);
$form['themekey_help_operators']['<'] = array(
'#type' => 'item',
- '#value' => t('<
lower than (alpha numeric values are treated in alphabetical order: "A" is lower than "B" but "B" is lower than "a")'),
+ '#value' => t('<
less than (alphanumeric values are treated in alphabetical order: "A" is less than "B", but "B" is less than "a")'),
);
$form['themekey_help_operators']['<='] = array(
'#type' => 'item',
- '#value' => t('<=
lower than or equal (alpha numeric values are treated in alphabetical order: "a" is lower than "b" but "B" is lower than "a" and "A" is lower than "a")'),
+ '#value' => t('<=
less than or equal to (alphanumeric values are treated in alphabetical order: "a" is less than "b" but "B" is less than "a" and "A" is less than "a")'),
);
$form['themekey_help_operators']['>'] = array(
'#type' => 'item',
- '#value' => t('>
greater (alpha numeric values are treated in alphabetical order: "b" is grater than "a" but "a" is greater than "B")'),
+ '#value' => t('>
greater (alphanumeric values are treated in alphabetical order: "b" is greater than "a" but "a" is greater than "B")'),
);
$form['themekey_help_operators']['=>'] = array(
'#type' => 'item',
- '#value' => t('=>
greater than or equal (alpha numeric values are treated in alphabetical order: "b" is grater than "a" but "a" is greater than "B" and "a" is greater than "A")'),
+ '#value' => t('=>
greater than or equal to (alphanumeric values are treated in alphabetical order: "b" is greater than "a" but "a" is greater than "B" and "a" is greater than "A")'),
);
$form['themekey_help_operators']['~'] = array(
Index: themekey_ui.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_ui.module,v
retrieving revision 1.6.2.3
diff -u -p -r1.6.2.3 themekey_ui.module
--- themekey_ui.module 16 Aug 2010 14:18:29 -0000 1.6.2.3
+++ themekey_ui.module 31 Oct 2010 12:00:15 -0000
@@ -9,9 +9,9 @@
* to assign a theme to a node.
*
* ThemeKey UI adds a theme option to the 'URL aliases' administration
- * if module "Path" is enabled.
+ * if the "Path" module is enabled.
*
- * ThemeKey UI adds a form element to user profile for theming all
+ * ThemeKey UI adds a form element to the user profile for themeing all
* nodes created by this user.
*
* @see themekey.module
@@ -27,7 +27,7 @@
/**
* Implements hook_themekey_properties()
*
- * Provides additional properties for module ThemeKey:
+ * Provides additional properties for the ThemeKey module:
* themekey_ui:node_triggers_theme
*
* @return
@@ -39,14 +39,14 @@ function themekey_ui_themekey_properties
$attributes = array();
$attributes['themekey_ui:node_triggers_theme'] = array(
- 'description' => t("Property themekey_ui:node_triggers_theme could not be selected from the property drop down. You get this static property by activating !link. Afterwards you can move the property to any position in the rule chain. When done it triggers the switch to the theme assigned to the current node using ThemeKey UI.",
+ 'description' => t("Property themekey_ui:node_triggers_theme could not be selected from the property drop down. You get this static property by activating !link. Afterwards, you can move the property to any position in the rule chain. When done, it triggers the switch to the theme assigned to the current node using ThemeKey UI.",
array('!link' => l(t('Show theme option in create/edit node forms'), 'admin/settings/themekey/settings/ui'))),
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
'static' => TRUE,
);
$attributes['themekey_ui:node_author_triggers_theme'] = array(
- 'description' => t("Property themekey_ui:node_author_triggers_theme could not be selected from the property drop down. You get this static property by activating !link. Afterwards you can move the property to any position in the rule chain. When done it triggers the switch to the theme the author selected for his nodes in his user profile.",
+ 'description' => t("Property themekey_ui:node_author_triggers_theme could not be selected from the property drop down. You get this static property by activating !link. Afterwards, you can move the property to any position in the rule chain. When done, it triggers the switch to the theme the author selected for his nodes in his user profile.",
array('!link' => l(t('Show theme option in user profile'), 'admin/settings/themekey/settings/ui'))),
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
'static' => TRUE,
@@ -71,7 +71,7 @@ function themekey_ui_themekey_properties
* This function implements the interface of a ThemeKey
* mapping function but doesn't set a ThemeKey property's
* value. It sets the global variable $custom_theme to a
- * theme directly which will cause ThemeKey to use this
+ * theme directly, which will cause ThemeKey to use this
* theme.
*
* @param $nid
@@ -120,7 +120,7 @@ function themekey_ui_author2theme($nid)
global $custom_theme;
// node_load() must not be called from hook_init().
- // Therefor we have to execute SQL here.
+ // Therefore, we have to execute SQL here.
if ($theme = db_result(db_query("SELECT theme FROM {node} JOIN {themekey_ui_author_theme} USING (uid) WHERE nid = %d", $nid))) {
if ('default' != $theme) {
$custom_theme = $theme;
@@ -190,7 +190,7 @@ function themekey_ui_form_alter(&$form,
if (user_access('assign theme to own nodes') && variable_get('themekey_ui_author', 0)) {
module_load_include('inc', 'themekey_ui', 'themekey_ui_admin');
- // to avoid a sql query to load his nodes themes every time a user is loaded we do this query here
+ // to avoid a sql query to load his nodes themes every time a user is loaded, we do this query here
$theme = FALSE;
if (!empty($form['#uid'])) {
$theme = db_result(db_query("SELECT theme FROM {themekey_ui_author_theme} WHERE uid = %d", $form['#uid']));
Index: themekey_ui_admin.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_ui_admin.inc,v
retrieving revision 1.6.2.1
diff -u -p -r1.6.2.1 themekey_ui_admin.inc
--- themekey_ui_admin.inc 21 Jul 2010 15:16:09 -0000 1.6.2.1
+++ themekey_ui_admin.inc 31 Oct 2010 12:00:15 -0000
@@ -73,7 +73,7 @@ function themekey_ui_settings_form() {
'#type' => 'checkbox',
'#title' => t('Show theme option in user profile'),
'#default_value' => variable_get('themekey_ui_author', 0),
- '#description' => t('Assign themes from user profile. All nodes created by a user will be shown to all visitors using the theme he selected in his profile.')
+ '#description' => t('Assign themes from user profile. All nodes created by a user will be shown to all visitors using the theme she selected in her profile.')
);
$form['buttons']['submit'] = array(
@@ -191,7 +191,7 @@ function themekey_ui_pathalias(&$form) {
list($id, $theme) = themekey_ui_get_path_theme($form['#alias']['dst']);
- themekey_ui_theme_select_form($form, t('Theme configuration'), t('Select a theme that will be used whenever content will be requested using this path alias.'), $theme, $form['submit']['weight'] - 1);
+ themekey_ui_theme_select_form($form, t('Theme configuration'), t('Select a theme that will be used whenever content is requested using this path alias.'), $theme, $form['submit']['weight'] - 1);
$form['themekey_ui_themes']['themekey_rule_id'] = array(
'#type' => 'value',
Index: themekey_ui_help.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_ui_help.inc,v
retrieving revision 1.2.2.3
diff -u -p -r1.2.2.3 themekey_ui_help.inc
--- themekey_ui_help.inc 28 Aug 2010 08:31:38 -0000 1.2.2.3
+++ themekey_ui_help.inc 31 Oct 2010 12:00:15 -0000
@@ -43,9 +43,9 @@ function themekey_ui_help_tutorials(&$fo
'' . t('First, you must enable any themes you would like available from under !link (Administer -> Site Building -> Themes)
', array('!link' => l(t('!path', array('!path' => 'admin/build/themes')), 'admin/build/themes'))) .
'' . t('Once you have enabled your themes, navigate to !link (Administer -> Site Configuration -> Themekey -> Settings -> User Interface). You will see a checkbox for "Show theme option in user profile". Click on the checkbox and save your settings.
', array('!link' => l(t('!path', array('!path' => 'admin/settings/themekey/settings/ui')), 'admin/settings/themekey/settings/ui'))) .
'' . '
' .
-'' . t('Next, you must grant permission to the roles that you would like to be able to change themes for their own content. Navigate to !link (Administer -> User Management -> Permissions) and check the boxes for "Assign theme to own nodes" to all roles you want to enable this option.
', array('!link' => l(t('!path', array('!path' => 'admin/user/permissions')), 'admin/user/permissions'))) . '
' .
+'' . t('Next, you must grant permission to the roles that you would like to be able to change themes for their own content. Navigate to !link (Administer -> User Management -> Permissions) and check the boxes for "Assign theme to own nodes" for all roles you want to have this option.
', array('!link' => l(t('!path', array('!path' => 'admin/user/permissions')), 'admin/user/permissions'))) . '
' .
'' . '
' .
-'' . t('Once you have done this, your users can log in, navigate to My Account -> Edit and a new option will appear under their account settings. A full select list of your enabled themes will appear for them to select from. Once they have chosen a new theme, any node that is authored by this user will display the theme they have selected.
') .
+'' . t('Once you have done this, your users can log in, navigate to My Account -> Edit, and a new option will appear under their account settings. A full select list of your enabled themes will appear for them to select from. Once they have chosen a new theme, any node that is authored by this user will display the theme they have selected.
') .
'' . '
' .
'' . t('Have Fun!') . '
',
);
Index: themekey_ui_helper.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_ui_helper.inc,v
retrieving revision 1.4
diff -u -p -r1.4 themekey_ui_helper.inc
--- themekey_ui_helper.inc 21 Jul 2010 11:34:46 -0000 1.4
+++ themekey_ui_helper.inc 31 Oct 2010 12:00:15 -0000
@@ -4,7 +4,7 @@
/**
* @file
* helper functions for ThemeKey UI feature to add a theme option to the
- * 'URL aliases' administration if module "Path" is enabled.
+ * 'URL aliases' administration if the "Path" module is enabled.
*
* @see themekey_ui.module
* @see themekey_ui_admin.inc
@@ -19,14 +19,14 @@
require_once(drupal_get_path('module', 'themekey') .'/themekey_build.inc');
/**
- * Returns a theme assigned to a drupal path alias using
+ * Returns a theme assigned to a Drupal path alias using
* a ThemeKey Theme Switching Rule which is not part of a chain
*
* @param $path
* drupal path as string
*
* @return
- * array with to elements:
+ * array with two elements:
* - id of the database entry in table themekey_properties
* or '0' if no entry exists
* - the theme
@@ -52,10 +52,10 @@ function themekey_ui_get_path_theme($pat
* @see themekey_rule_set()
*
* @param $path
- * drupa path alias as string
+ * Drupal path alias as string
*
* @param $theme
- * assigned drupal theme as string
+ * assigned Drupal theme as string
*
* @param $id
* the id of an existing rule if this
Index: themekey_validators.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/themekey_validators.inc,v
retrieving revision 1.2
diff -u -p -r1.2 themekey_validators.inc
--- themekey_validators.inc 21 Jul 2010 11:34:46 -0000 1.2
+++ themekey_validators.inc 31 Oct 2010 12:00:15 -0000
@@ -3,7 +3,7 @@
/**
* @file
- * Provides set of validators which could be used to validate
+ * Provides set of validators which can be used to validate
* ThemeKey Theme Switching Rules.
* @see themekey_admin.inc
*
@@ -16,14 +16,14 @@
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: "=", "!"
* Allowed values: "true", "false" as string
*
*
* @param $rule
* A Theme Switching Rule as associative array:
- * - property: ThemeKey property as string (p.e. "drupal:path")
+ * - property: ThemeKey property as string (e.g. "drupal:path")
* - wildcard: optional string, only used if property is "drupal:path:wildcard"
* - operator: ThemeKey operator as string ("=", "!", "<". "<=", ">", ">=", "~")
* - value: ThemeKey property value as string
@@ -60,7 +60,7 @@ function themekey_validator_string_boole
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: "=", "!"
* Allowed values: "1", "0"
*
@@ -82,7 +82,7 @@ function themekey_validator_string_boole
* describing a problem with the operator
* - value: translated error message as string
* describing a problem with the value
- * If no errors detected the array is empty.
+ * If no errors detected, the array is empty.
*/
function themekey_validator_nummeric_boolean($rule) {
$errors = array();
@@ -103,14 +103,14 @@ function themekey_validator_nummeric_boo
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: "=", "!", "<", "<=", ">", ">="
* Allowed values: string of digits (numbers)
*
*
* @param $rule
* A Theme Switching Rule as associative array:
- * - property: ThemeKey property as string (p.e. "drupal:path")
+ * - property: ThemeKey property as string (e.g., "drupal:path")
* - wildcard: optional string, only used if property is "drupal:path:wildcard"
* - operator: ThemeKey operator as string ("=", "!", "<". "<=", ">", ">=", "~")
* - value: ThemeKey property value as string
@@ -144,17 +144,17 @@ function themekey_validator_ctype_digit(
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: any
* Allowed values:
- * - configured drupal language as string or 'neutral' if operator is "="
+ * - configured Drupal language as string or 'neutral' if operator is "="
* - valid regular expression if operator is "~"
* - any string for different operators
*
*
* @param $rule
* A Theme Switching Rule as associative array:
- * - property: ThemeKey property as string (p.e. "drupal:path")
+ * - property: ThemeKey property as string (e.g., "drupal:path")
* - wildcard: optional string, only used if property is "drupal:path:wildcard"
* - operator: ThemeKey operator as string ("=", "!", "<". "<=", ">", ">=", "~")
* - value: ThemeKey property value as string
@@ -193,7 +193,7 @@ function themekey_validator_language($ru
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: "<", "<=", ">", ">=" and "~"
* Allowed values:
* - valid regular expression if operator is "~"
@@ -202,7 +202,7 @@ function themekey_validator_language($ru
*
* @param $rule
* A Theme Switching Rule as associative array:
- * - property: ThemeKey property as string (p.e. "drupal:path")
+ * - property: ThemeKey property as string (e.g. "drupal:path")
* - wildcard: optional string, only used if property is "drupal:path:wildcard"
* - operator: ThemeKey operator as string ("=", "!", "<". "<=", ">", ">=", "~")
* - value: ThemeKey property value as string
@@ -243,11 +243,11 @@ function themekey_validator_date_time($r
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: any
* Allowed values:
* - valid regular expression if operator is "~"
- * - a vaild date like "2009-12-24" if operator is "=" or "!"
+ * - a valid date like "2009-12-24" if operator is "=" or "!"
* - fragment of a date which contains at least the year as four digits
* for different operators
*
@@ -296,11 +296,11 @@ function themekey_validator_date($rule)
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: any
* Allowed values:
* - valid regular expression if operator is "~"
- * - a vaild time like "23:16:56" if operator is "=" or "!"
+ * - a valid time like "23:16:56" if operator is "=" or "!"
* - fragment of a time which contains at least the hour as two digits
* for different operators
*
@@ -349,7 +349,7 @@ function themekey_validator_time($rule)
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: any
* Allowed values:
* - valid regular expression if operator is "~"
@@ -403,7 +403,7 @@ function themekey_validator_node_type($r
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: any
* Allowed values:
* - valid regular expression if operator is "~"
@@ -448,9 +448,9 @@ function themekey_validator_http_host($r
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: all
- * Allowed values: any string without whitespaces
+ * Allowed values: any string without whitespace
*
*
* @param $rule
@@ -476,7 +476,7 @@ function themekey_validator_no_whitespac
$errors = array();
if (preg_match("/\s/", $rule['value'])) {
- $errors['value'] = t('Value must not contain white spaces');
+ $errors['value'] = t('Value must not contain any "whitespace" characters');
}
return $errors;
@@ -484,9 +484,9 @@ function themekey_validator_no_whitespac
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: any
- * Allowed wildcards: any string without whitespaces and not starting with "#" or "%"
+ * Allowed wildcards: any string without whitespace and not starting with "#" or "%"
*
*
* @param $rule
@@ -515,7 +515,7 @@ function themekey_validator_wildcard($ru
$errors['wildcard'] = t('Wildcard must not start with type identifier "#" or "%" at this point');
}
elseif (preg_match("/\s/", $rule['wildcard'])) {
- $errors['wildcard'] = t('Wildcard must not contain white spaces');
+ $errors['wildcard'] = t('Wildcard must not contain any "whitespace" characters');
}
return $errors;
@@ -523,7 +523,7 @@ function themekey_validator_wildcard($ru
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: "~"
* Allowed values: valid regular expression
*
@@ -559,7 +559,7 @@ function themekey_validator_regex($rule)
break;
default:
- $errors['operator'] = t('Only possible operators is "~"');
+ $errors['operator'] = t('Only possible operator is "~"');
break;
}
@@ -567,7 +567,7 @@ function themekey_validator_regex($rule)
}
/**
* @file
- * Provides set of validators which could be used to validate
+ * Provides set of validators which can be used to validate
* ThemeKey Theme Switching Rules.
* @see themekey_admin.inc
*
@@ -580,9 +580,9 @@ function themekey_validator_regex($rule)
/**
- * Validates a Theme Switichng Rule.
+ * Validates a Theme Switching Rule.
* Allowed Operators: "=", "!"
- * Allowed values: paths without whitespaces
+ * Allowed values: paths without whitespace characters
*
*
* @param $rule
@@ -611,13 +611,13 @@ function themekey_validator_drupal_path(
case '=':
case '!':
if (strpos($rule['value'], '/') === 0) {
- $errors['value'] = t('A drupal path must not start with "/"');
+ $errors['value'] = t('A Drupal path must not start with "/"');
}
if (preg_match("@[^/][%#]@", $rule['value'])) {
- $errors['value'] = t('A wildcard could only be used to replace part(s) of the path but not for parts of a word');
+ $errors['value'] = t('A wildcard can only be used to replace part(s) of the path but not for parts of a word');
}
if (strpos($rule['value'], '?') !== FALSE) {
- $errors['value'] = t('Query strings will be striped before a drupal path is precessed. Maybe you want to chain drupal:path and system:query_string or system:query_param (both provided by additional module ThemeKey Properties).');
+ $errors['value'] = t('Query strings will be stripped before a Drupal path is processed. Maybe you want to chain drupal:path and system:query_string or system:query_param (both provided by the additional module, ThemeKey Properties).');
}
break;
Index: modules/themekey.book.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/themekey.book.inc,v
retrieving revision 1.6.2.5
diff -u -p -r1.6.2.5 themekey.book.inc
--- modules/themekey.book.inc 28 Aug 2010 08:31:38 -0000 1.6.2.5
+++ modules/themekey.book.inc 31 Oct 2010 12:00:15 -0000
@@ -32,7 +32,7 @@ function themekey_book_themekey_properti
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
$attributes['book:has_children'] = array(
- 'description' => t('Book: Has Children - Wheter the book has child pages or not. Possible values are "0" for false and "1" for true.'),
+ 'description' => t('Book: Has Children - Whether the book has child pages or not. Possible values are "0" for false and "1" for true.'),
'validator' => 'themekey_validator_nummeric_boolean',
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
Index: modules/themekey.locale.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/themekey.locale.inc,v
retrieving revision 1.4.2.4
diff -u -p -r1.4.2.4 themekey.locale.inc
--- modules/themekey.locale.inc 28 Aug 2010 08:31:38 -0000 1.4.2.4
+++ modules/themekey.locale.inc 31 Oct 2010 12:00:15 -0000
@@ -26,7 +26,7 @@ function themekey_locale_themekey_proper
// Attributes for properties
$attributes = array();
$attributes['locale:language'] = array(
- 'description' => t('Locale: Language - The code of the current site language, formatted like "en" or "de". See !link for your the codes of the enabled languages',
+ 'description' => t('Locale: Language - The code of the current site language, formatted like "en" or "de". See !link to find the codes for your enabled languages',
array('!link' => l(t('!path', array('!path' => 'admin/settings/language')), 'admin/settings/language'))),
'validator' => 'themekey_validator_language',
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
Index: modules/themekey.node.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/themekey.node.inc,v
retrieving revision 1.10.2.5
diff -u -p -r1.10.2.5 themekey.node.inc
--- modules/themekey.node.inc 28 Aug 2010 08:31:38 -0000 1.10.2.5
+++ modules/themekey.node.inc 31 Oct 2010 12:00:15 -0000
@@ -100,7 +100,7 @@ function themekey_node_themekey_properti
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
$attributes['node:uid'] = array(
- 'description' => t('Node: User ID - The user id (uid) of the author of the node. The user id can be found in the URL of the users profile page, "user/23" or "user/23/edit" (23 = uid). See !link for your users.',
+ 'description' => t('Node: User ID - The node author\'s user id (uid). The user id can be found in the URL of the user\'s profile page, "user/23" or "user/23/edit" (23 = uid). See !link for your users.',
array('!link' => l(t('!path', array('!path' => 'admin/user/user/list')), 'admin/user/user/list'))),
'validator' => 'themekey_validator_ctype_digit',
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
@@ -451,8 +451,8 @@ function themekey_node_get_q2type($q) {
/**
* This function isn't needed anymore and has been removed with ThemeKey 6.x-2.0-beta2.
* But if it's missing a fatal error occurs if you upgrade from any version before
- * 6.x-2.0-beta2 until you called update.php. That should be avoided.
- * So this function is available again and does nothing else than reminding the
+ * 6.x-2.0-beta2 until you call update.php. That should be avoided.
+ * So this function is available again and does nothing other than remind the
* administrator to call update.php
*
* see http://drupal.org/node/662786
@@ -465,6 +465,6 @@ function _themekey_node_callback(&$item,
global $user;
if (1 == $user->uid) {
- drupal_set_message(t('You uploaded a new version of ThemeKey. Please !link your site!', array('!link' => l(t('update'), '/update.php'))));
+ drupal_set_message(t('You\'ve uploaded a new version of ThemeKey. Please !link your site!', array('!link' => l(t('update'), '/update.php'))));
}
}
Index: modules/themekey.system.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/themekey.system.inc,v
retrieving revision 1.4.2.4
diff -u -p -r1.4.2.4 themekey.system.inc
--- modules/themekey.system.inc 28 Aug 2010 08:31:38 -0000 1.4.2.4
+++ modules/themekey.system.inc 31 Oct 2010 12:00:15 -0000
@@ -34,7 +34,7 @@ function themekey_system_themekey_proper
);
$attributes['drupal:path'] = array(
'description' => t('Drupal: Drupal path like "node/add/story" or path alias with support for wildcards.
-Query parameters are stripped off before the path gets examined. P.e. "node/add/story?destination=node" becomes "node/add/story" first. If you want to access query parameters have a look at property system:query_param provided by !link.
+Query parameters are stripped off before the path gets examined. P.e. "node/add/story?destination=node" becomes "node/add/story" first. If you want to access query parameters have a look at the system:query_param property provided by !link.
Wildcard characters are "#" for numeric parts and "%" for all characters. To match conditions against a certain part, use an identifier with the wildcard. For example "comment/reply/#xyz" matches all paths with "comment/reply" and a numeric third argument. You can then specify conditions for every wildcard argument using the property "drupal:path:wildcard" and the identifier you choose ("xyz" in this example).
These are the possible wildcard replacements for foo/bar/42/test.html:', array('!link' => l(t('!path', array('!path' => 'ThemeKey Properties')), 'http://drupal.org/project/themekey_properties'))) .
'
@@ -85,7 +85,7 @@ foo
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
$attributes['drupal:path:wildcard'] = array(
- 'description' => t('Wildcard of "drupal:path". See explaination of "drupal:path" for details.'),
+ 'description' => t('Wildcard of "drupal:path". See explanation of "drupal:path" for details.'),
'validator' => 'themekey_validator_wildcard',
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
Index: modules/themekey.taxonomy.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/themekey.taxonomy.inc,v
retrieving revision 1.13.2.6
diff -u -p -r1.13.2.6 themekey.taxonomy.inc
--- modules/themekey.taxonomy.inc 28 Aug 2010 08:31:38 -0000 1.13.2.6
+++ modules/themekey.taxonomy.inc 31 Oct 2010 12:00:16 -0000
@@ -39,7 +39,7 @@ function themekey_taxonomy_themekey_prop
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
$attributes['taxonomy:tid_and_childs'] = array(
- 'description' => t('Taxonomy: Term and its childs - The term id (tid) of a taxonomy term. If set all child terms of this term will be used too.'),
+ 'description' => t('Taxonomy: Term and its children - The term id (tid) of a taxonomy term. If set, all child terms of this term will be used too.'),
'validator' => 'themekey_validator_ctype_digit',
'page cache' => THEMEKEY_PAGECACHE_UNSUPPORTED,
);
Index: modules/themekey.user.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/themekey/modules/themekey.user.inc,v
retrieving revision 1.4.2.5
diff -u -p -r1.4.2.5 themekey.user.inc
--- modules/themekey.user.inc 28 Aug 2010 08:31:38 -0000 1.4.2.5
+++ modules/themekey.user.inc 31 Oct 2010 12:00:16 -0000
@@ -35,18 +35,18 @@ function themekey_user_themekey_properti
'page cache' => THEMEKEY_PAGECACHE_UNSUPPORTED,
);
$attributes['user:language'] = array(
- 'description' => t('User: Language - The language the user has set in the settings of his profile page.
- Format is the language code (for example "en" for english or "de" for german) that can be found on !link.',
+ 'description' => t('User: Language - The language the user has set in the settings on his profile page.
+ Format is the language code (for example "en" for English or "de" for German) that can be found on !link.',
array('!link' => l(t('!path', array('!path' => 'admin/settings/language')), 'admin/settings/language'))),
'validator' => 'themekey_validator_language',
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
$attributes['user:name'] = array(
- 'description' => t('User: Name - The username of the user. See !link for your users.', array('!link' => l(t('!path', array('!path' => 'admin/user/user/list')), 'admin/user/user/list'))),
+ 'description' => t('User: Name - The user\'s username. See !link for your users.', array('!link' => l(t('!path', array('!path' => 'admin/user/user/list')), 'admin/user/user/list'))),
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,
);
$attributes['user:uid'] = array(
- 'description' => t('User: ID - The id of the user (uid). The user id can be found in the URL of the users profile page, "user/23" or "user/23/edit" (23 = uid). See !link for your users.',
+ 'description' => t('User: ID - The id of the user (uid). The user id can be found in the URL of the user\'s profile page, "user/23" or "user/23/edit" (23 = uid). See !link for your users.',
array('!link' => l(t('!path', array('!path' => 'admin/user/user/list')), 'admin/user/user/list'))),
'validator' => 'themekey_validator_ctype_digit',
'page cache' => THEMEKEY_PAGECACHE_SUPPORTED,