Skip to content

Commit 132b3d8

Browse files
TheoChevalierflodolo
authored andcommitted
Fixes on 3locales view, fixes 771 (#772)
1 parent 64dda7a commit 132b3d8

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

app/classes/Transvision/ShowResults.php

+1-2
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ public static function resultsTable($search_object, $search_results, $page)
343343

344344
$target_string = Strings::multipleStringReplace($replacements, $target_string);
345345
$clipboard_target_string = 'clip_' . md5($target_string);
346+
$clipboard_target_string2 = 'clip_' . md5($target_string2);
346347

347348
$temp = explode('-', $locale1);
348349
$locale1_short_code = $temp[0];
@@ -410,8 +411,6 @@ public static function resultsTable($search_object, $search_results, $page)
410411
$locale3_path = VersionControl::hgPath($locale3, $current_repo, $key);
411412
}
412413

413-
$clipboard_target_string2 = 'clip_' . md5($target_string2);
414-
415414
$extra_column_rows = "
416415
<td dir='{$direction3}' lang='{$locale3}'>
417416
<span class='celltitle'>{$locale3}</span>

app/views/results_entities.php

+11-6
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,11 @@
3636

3737
$source_string = Utils::secureText($tmx_source[$entity]);
3838

39+
$clipboard_target_string = 'clip_' . md5($target_string);
40+
41+
// Don't show meta links by default
42+
$meta_source = $meta_target = $meta_target2 = '';
43+
3944
// 3locales view
4045
if ($url['path'] == '3locales') {
4146
$bz_target_string2 = $target_string2 = isset($tmx_target2[$entity])
@@ -44,6 +49,8 @@
4449
// Highlight non-breaking spaces only after strings have been escaped
4550
$target_string2 = str_replace(' ', '<span class="highlight-gray"> </span>', $target_string2);
4651

52+
$clipboard_target_string2 = 'clip_' . md5($target_string2);
53+
4754
if (in_array($current_repo, ['firefox_ios', 'mozilla_org'])) {
4855
$path_locale3 = VersionControl::gitPath($locale2, $current_repo, $entity);
4956
} else {
@@ -67,15 +74,18 @@
6774
$target_string2 = '<em class="error">Warning: Missing string</em>';
6875
} elseif (! $target_string2) {
6976
$target_string2 = '<em class="error">Warning: Empty string</em>';
77+
} else {
78+
$meta_target2 = "<span class='clipboard' data-clipboard-target='#{$clipboard_target_string2}' alt='Copy to clipboard'><img src='/img/copy_icon_black_18x18.png'></span>";
7079
}
7180

7281
$extra_column_rows = "
7382
<td dir='{$direction3}'>
7483
<span class='celltitle'>{$locale2}</span>
75-
<div class='string'>{$target_string2}</div>
84+
<div class='string' id='{$clipboard_target_string2}'>{$target_string2}</div>
7685
<div dir='ltr' class='result_meta_link'>
7786
<a class='source_link' href='{$path_locale3}'>&lt;source&gt;</a>
7887
{$file_bug}
88+
{$meta_target2}
7989
</div>
8090
</td>";
8191
} else {
@@ -102,14 +112,9 @@
102112
. '">&lt;report a bug&gt;</a>';
103113
$anchor_name = str_replace(['/', ':'], '_', $entity);
104114

105-
$clipboard_target_string = 'clip_' . md5($target_string);
106-
107115
// Get the potential errors for $target_string (final dot, long/small string)
108116
$error_message = ShowResults::buildErrorString($source_string, $target_string);
109117

110-
// Don't show meta links by default
111-
$meta_source = $meta_target = '';
112-
113118
// If there is no source_string, display an error, otherwise display the string + meta links
114119
if (! $source_string) {
115120
$source_string = '<em class="error">Warning: Source string is empty</em>';

0 commit comments

Comments
 (0)