git-gui: Mark-up strings in show_{other,unmerged}_diff() for localization
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at> Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Johannes Sixt committed
Oct 3, 2008 at 13:13 UTC
7f15b0027392155f5b3260bb584ba37126232bf1
1 file changed
+11
-11
lib/diff.tcl
+11
-11
@@ -117,22 +117,22 @@ proc show_unmerged_diff {cont_info} {
117
if {$merge_stages(2) eq {}} {
118
set is_conflict_diff 1
119
lappend current_diff_queue \
120
- [list "LOCAL: deleted\nREMOTE:\n" d======= \
120
+ [list [mc "LOCAL: deleted\nREMOTE:\n"] d======= \
121
[list ":1:$current_diff_path" ":3:$current_diff_path"]]
122
} elseif {$merge_stages(3) eq {}} {
123
set is_conflict_diff 1
124
lappend current_diff_queue \
125
- [list "REMOTE: deleted\nLOCAL:\n" d======= \
125
+ [list [mc "REMOTE: deleted\nLOCAL:\n"] d======= \
126
[list ":1:$current_diff_path" ":2:$current_diff_path"]]
127
} elseif {[lindex $merge_stages(1) 0] eq {120000}
128
|| [lindex $merge_stages(2) 0] eq {120000}
129
|| [lindex $merge_stages(3) 0] eq {120000}} {
130
set is_conflict_diff 1
131
lappend current_diff_queue \
132
- [list "LOCAL:\n" d======= \
132
+ [list [mc "LOCAL:\n"] d======= \
133
[list ":1:$current_diff_path" ":2:$current_diff_path"]]
134
lappend current_diff_queue \
135
- [list "REMOTE:\n" d======= \
135
+ [list [mc "REMOTE:\n"] d======= \
136
[list ":1:$current_diff_path" ":3:$current_diff_path"]]
137
} else {
138
start_show_diff $cont_info
@@ -218,17 +218,17 @@ proc show_other_diff {path w m cont_info} {
218
d_@
219
} else {
220
if {$sz > $max_sz} {
221
- $ui_diff insert end \
222
-"* Untracked file is $sz bytes.
223
-* Showing only first $max_sz bytes.
224
-" d_@
221
+ $ui_diff insert end [mc \
222
+"* Untracked file is %d bytes.
223
+* Showing only first %d bytes.
224
+" $sz $max_sz] d_@
225
}
226
$ui_diff insert end $content
227
if {$sz > $max_sz} {
228
- $ui_diff insert end "
229
-* Untracked file clipped here by [appname].
228
+ $ui_diff insert end [mc "
229
+* Untracked file clipped here by %s.
230
* To see the entire file, use an external editor.
231
-" d_@
231
+" [appname]] d_@
232
}
233
}
234
$ui_diff conf -state disabled