';
return $output;
}
@@ -973,31 +973,52 @@ function l10n_community_pack_string($str
* Language code.
* @param $sid
* Source string id.
- */
-function l10n_community_string_details($langcode = NULL, $sid = 0) {
- // Prevent devel module information.
- $GLOBALS['devel_shutdown'] = FALSE;
-
+ * @param $ahah
+ * Whether the request came through AHAH, in which case no page
+ * theming should be applied.
+ */
+function l10n_community_string_details($langcode = NULL, $sid = 0, $ahah = 0) {
+
+ $output = '';
+ if ($ahah) {
+ // Prevent devel module information if doing AHAH.
+ $GLOBALS['devel_shutdown'] = FALSE;
+ }
+ else {
+ // Get data about this source string.
+ $string = db_fetch_object(db_query('SELECT value, context FROM {l10n_community_string} WHERE sid = %d', $sid));
+ $unpacked = l10n_community_unpack_string($string->value);
+ $output .= '
'. t('Source string') .'
'. theme('item_list', $unpacked);
+ $output .= '
'. (empty($string->context) ? t('Used at the following places') : t('Used at the following places in context %context', array('%context' => $string->context))) .'
';
+ }
+
// List of project releases, where this string is used.
- $result = db_query('SELECT l.pid, p.title project_title, l.rid, r.title release_title, COUNT(l.lineno) as occurance_count FROM {l10n_community_line} l INNER JOIN {l10n_community_project} p ON l.pid = p.pid INNER JOIN {l10n_community_release} r ON l.rid = r.rid WHERE l.sid = %d AND p.status = 1 GROUP BY l.rid ORDER BY l.pid, l.rid', $sid);
+ $result = db_query('SELECT l.pid, p.title project_title, l.rid, r.title release_title, COUNT(l.lineno) as occurrence_count FROM {l10n_community_line} l INNER JOIN {l10n_community_project} p ON l.pid = p.pid INNER JOIN {l10n_community_release} r ON l.rid = r.rid WHERE l.sid = %d AND p.status = 1 GROUP BY l.rid ORDER BY l.pid, l.rid', $sid);
- $list = array();
- $output = array();
+ $version_list = array();
+ $project_list = array();
$previous_project = '';
while ($instance = db_fetch_object($result)) {
+ $release_info = $instance->release_title .' ('. $instance->occurrence_count .')';
if ($instance->project_title != $previous_project) {
- if (!empty($list)) {
- $output[] = join(', ', $list);
+ if (!empty($version_list)) {
+ $project_list[] = join(', ', $version_list);
}
- $list = array(''. $instance->project_title .': '. $instance->release_title .' ('. $instance->occurance_count .')');
+ $version_list = array(''. $instance->project_title .': '. $release_info);
}
else {
- $list[] = $instance->release_title .' ('. $instance->occurance_count .')';
+ $version_list[] = $release_info;
}
$previous_project = $instance->project_title;
}
- $output[] = join(', ', $list);
- print ''. t('Used in:') .''. theme('item_list', $output);
-
- exit;
+ $project_list[] = join(', ', $version_list);
+ $usage_list = theme('item_list', $project_list);
+ if ($ahah) {
+ print $usage_list;
+ exit;
+ }
+ else {
+ $output .= $usage_list;
+ return $output;
+ }
}
Index: l10n_community/tests/l10n_community.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/l10n_server/l10n_community/tests/Attic/l10n_community.test,v
retrieving revision 1.1.2.15.2.1
diff -u -p -r1.1.2.15.2.1 l10n_community.test
--- l10n_community/tests/l10n_community.test 16 Feb 2010 07:46:50 -0000 1.1.2.15.2.1
+++ l10n_community/tests/l10n_community.test 16 Feb 2010 16:18:56 -0000
@@ -222,9 +222,9 @@ class L10nServerTestCase extends DrupalW
$sid = db_result(db_query("SELECT sid FROM {l10n_community_string} WHERE value = '%s'", 'This is a test string.'));
$this->drupalGet('translate/details/hu/'. $sid);
- $this->assertRaw(''. $this->project_names[5] .': 5.x-'. $this->version_js .' (1)');
- $this->assertRaw(''. $this->project_names[6] .': 6.x-'. $this->version_js .' (1), 6.x-'. $this->version_base .' (1)');
- $this->assertRaw(''. $this->project_names[7] .': 7.x-'. $this->version_js .' (1)');
+ $this->assertPattern('!'. preg_quote($this->project_names[5]) .': '. preg_quote('5.x-'. $this->version_js) .' \(1\)!');
+ $this->assertPattern('!'. preg_quote($this->project_names[6]) .': '. preg_quote('6.x-'. $this->version_js) .' \(1\), '. preg_quote('6.x-'. $this->version_base) .' \(1\)!');
+ $this->assertPattern('!'. preg_quote($this->project_names[7]) .': '. preg_quote('7.x-'. $this->version_js) .' \(1\)!');
// WARNINGS ====