ソースを参照

Merge pull request #822 from 81552433qqcom/d1

missed __() for translations.
version-14
Anand Doshi 11年前
コミット
c0e957da57
5個のファイルの変更9行の追加9行の削除
  1. +2
    -2
      frappe/public/js/frappe/form/comments.js
  2. +2
    -2
      frappe/public/js/frappe/form/control.js
  3. +2
    -2
      frappe/public/js/frappe/form/grid.js
  4. +1
    -1
      frappe/public/js/frappe/ui/filters.js
  5. +2
    -2
      frappe/public/js/frappe/views/listview.js

+ 2
- 2
frappe/public/js/frappe/form/comments.js ファイルの表示

@@ -93,10 +93,10 @@ frappe.ui.form.Comments = Class.extend({
if(c.comment_type==="Workflow" || c.comment_type==="Label") {
c.comment_html = repl('<span class="label label-%(style)s">%(text)s</span>', {
style: frappe.utils.guess_style(c.comment),
text: c.comment
text: __(c.comment)
});
} else {
c.comment_html = frappe.markdown(c.comment);
c.comment_html = frappe.markdown(__(c.comment));
}

// icon centering -- pixed perfect


+ 2
- 2
frappe/public/js/frappe/form/control.js ファイルの表示

@@ -551,7 +551,7 @@ frappe.ui.form.ControlButton = frappe.ui.form.ControlData.extend({
set_label: function() {
$(this.label_span).html("&nbsp;");
this.$input && this.$input.html((this.df.icon ?
('<i class="'+this.df.icon+' icon-fixed-width"></i> ') : "") + this.df.label);
('<i class="'+this.df.icon+' icon-fixed-width"></i> ') : "") + __(this.df.label));
}
});

@@ -1054,7 +1054,7 @@ frappe.ui.form.ControlTable = frappe.ui.form.Control.extend({
}

if(frappe.model.layout_fields.indexOf(prev_fieldtype)===-1) {
$("<label>" + this.df.label + "<label>").appendTo(this.wrapper);
$("<label>" + __(this.df.label) + "<label>").appendTo(this.wrapper);
}

this.grid = new frappe.ui.form.Grid({


+ 2
- 2
frappe/public/js/frappe/form/grid.js ファイルの表示

@@ -491,7 +491,7 @@ frappe.ui.form.GridRow = Class.extend({
if(!this.form_area) {
$('<div class="panel-heading">\
<div class="toolbar">\
<span class="panel-title">Editing Row #<span class="row-index"></span></span>\
<span class="panel-title">' + __("Editing Row") + ' #<span class="row-index"></span></span>\
<span class="text-success pull-right grid-toggle-row" \
title="'+__("Close")+'"\
style="margin-left: 7px;">\
@@ -508,7 +508,7 @@ frappe.ui.form.GridRow = Class.extend({
<div class="panel-body">\
<div class="form-area"></div>\
<div class="toolbar footer-toolbar" style="margin-top: 15px">\
<span class="text-muted"><a href="#" class="shortcuts"><i class="icon-keyboard"></i> Shortcuts</a></span>\
<span class="text-muted"><a href="#" class="shortcuts"><i class="icon-keyboard"></i>' + __("Shortcuts") + '</a></span>\
<span class="text-success pull-right grid-toggle-row" \
title="'+__("Close")+'"\
style="margin-left: 7px; cursor: pointer;">\


+ 1
- 1
frappe/public/js/frappe/ui/filters.js ファイルの表示

@@ -377,7 +377,7 @@ frappe.ui.Filter = Class.extend({
.html(repl('<i class="icon-filter"></i> %(label)s %(condition)s "%(value)s"', {
label: __(this.field.df.label),
condition: this.get_condition(),
value: value,
value: __(value),
}));
}



+ 2
- 2
frappe/public/js/frappe/views/listview.js ファイルの表示

@@ -440,7 +440,7 @@ frappe.views.ListView = Class.extend({
if(!in_list(["avatar", "_user_tags", "check"], opts.content)) {
if($(parent).attr("title")==undefined) {
$(parent).attr("title", (opts.title || opts.content) + ": "
+ (data[opts.content] || "Not Set"))
+ (data[opts.content] || __("Not Set")))
}
$(parent).tooltip();
}
@@ -499,7 +499,7 @@ frappe.views.ListView = Class.extend({
render_bar_graph: function(parent, data, field, label) {
var args = {
percent: data[field],
label: label
label: __(label)
}
$(parent).append(repl('<span class="progress" style="width: 100%; float: left; margin: 5px 0px;"> \
<span class="progress-bar" title="%(percent)s% %(label)s" \


読み込み中…
キャンセル
保存