diff options
| author | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-04 21:23:50 +0000 |
|---|---|---|
| committer | brettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544> | 2011-02-04 21:23:50 +0000 |
| commit | 95515b7de6665a6f3a11b9d6b7b3c644ddcc61bb (patch) | |
| tree | 385a67c24acc97350d58d276ba1e0bb881b8c540 | |
| parent | 1026deb7ef24677a2a0b48b4297911a4c2eceb6d (diff) | |
| download | elgg-95515b7de6665a6f3a11b9d6b7b3c644ddcc61bb.tar.gz elgg-95515b7de6665a6f3a11b9d6b7b3c644ddcc61bb.tar.bz2 | |
Fixed problems showing detected values for plugin conflicts. Clarified language for what the first value column means.
git-svn-id: http://code.elgg.org/elgg/trunk@8017 36083f99-b078-4883-b0ff-0f9b5a30f544
| -rw-r--r-- | engine/lib/plugins.php | 2 | ||||
| -rw-r--r-- | languages/en.php | 2 | ||||
| -rw-r--r-- | views/default/admin/components/plugin.php | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/engine/lib/plugins.php b/engine/lib/plugins.php index e61874ebc..01cbf631a 100644 --- a/engine/lib/plugins.php +++ b/engine/lib/plugins.php @@ -707,7 +707,7 @@ function elgg_get_plugin_dependency_strings($dep) { case 'plugin': $strings['name'] = elgg_echo('ElggPlugin:Dependencies:Plugin', array($info['name'])); $strings['expected_value'] = "$comparison {$info['version']}"; - $strings['local_value'] = $dep['version']; + $strings['local_value'] = $dep['value']; $strings['comment'] = ''; break; diff --git a/languages/en.php b/languages/en.php index 3d4484e2e..406679d58 100644 --- a/languages/en.php +++ b/languages/en.php @@ -602,7 +602,7 @@ $english = array( 'admin:plugins:dependencies:type' => 'Type', 'admin:plugins:dependencies:name' => 'Name', - 'admin:plugins:dependencies:expected_value' => 'Expected Value', + 'admin:plugins:dependencies:expected_value' => 'Tested Value', 'admin:plugins:dependencies:local_value' => 'Actual value', 'admin:plugins:dependencies:comment' => 'Comment', diff --git a/views/default/admin/components/plugin.php b/views/default/admin/components/plugin.php index ff1abee1e..4c6a8b756 100644 --- a/views/default/admin/components/plugin.php +++ b/views/default/admin/components/plugin.php @@ -185,7 +185,7 @@ if (elgg_view_exists($settings_view)) { if (!$can_activate) { $message = elgg_echo('admin:plugins:warning:unmet_dependencies'); - echo "<p class=\"plugin-cannot-activate\">$message</p>"; + echo "<p class=\"elgg-unsatisfied-dependency\">$message</p>"; } ?> |