vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #11689 from surajshetty3416/replace-template-syntax-for-translations

Browse source
This commit is contained in:
Suraj Shetty 2020-10-12 17:18:36 +05:30 • committed by GitHub
commit f2ef686797
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
19 changed files with 150 additions and 168 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/helper/translation.py vendored
View file

@ -3,7 +3,7 @@ import sys
errors_encounter = 0
pattern = re.compile(r"_\(([\"']{,3})(?P<message>((?!\1).)*)\1(\s*,\s*context\s*=\s*([\"'])(?P<py_context>((?!\5).)*)\5)*(\s*,\s*(.)*?\s*(,\s*([\"'])(?P<js_context>((?!\11).)*)\11)*)*\)")
start_pattern = re.compile(r"_{1,2}\([\"']{1,3}")
start_pattern = re.compile(r"_{1,2}\([\"'`]{1,3}")
# skip first argument
files = sys.argv[1:]

2
frappe/data_migration/doctype/data_migration_connector/data_migration_connector.js
View file

@ -30,7 +30,7 @@ frappe.ui.form.on('Data Migration Connector', {
frm.set_value('connector_type', 'Custom');
frm.set_value('python_module', r.message);
frm.save();
frappe.show_alert(__(`New module created ${r.message}`));
frappe.show_alert(__("New module created {0}", [r.message]));
d.hide();
}
});

2
frappe/desk/doctype/dashboard_chart/dashboard_chart.js
View file

@ -169,7 +169,7 @@ frappe.ui.form.on('Dashboard Chart', {
frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
frm.set_df_property('x_field', 'options', frm.field_options.non_numeric_fields);
if (!frm.field_options.numeric_fields.length) {
frappe.msgprint(__(`Report has no numeric fields, please change the Report Name`));
frappe.msgprint(__("Report has no numeric fields, please change the Report Name"));
} else {
let y_field_df = frappe.meta.get_docfield('Dashboard Chart Field', 'y_field', frm.doc.name);
y_field_df.options = frm.field_options.numeric_fields;

2
frappe/desk/doctype/number_card/number_card.js
View file

@ -207,7 +207,7 @@ frappe.ui.form.on('Number Card', {
frm.field_options = frappe.report_utils.get_field_options_from_report(data.columns, data);
frm.set_df_property('report_field', 'options', frm.field_options.numeric_fields);
if (!frm.field_options.numeric_fields.length) {
frappe.msgprint(__(`Report has no numeric fields, please change the Report Name`));
frappe.msgprint(__("Report has no numeric fields, please change the Report Name"));
}
} else {
frappe.msgprint(__('Report has no data, please modify the filters or change the Report Name'));

11
frappe/desk/page/user_profile/user_profile.js
View file

@ -360,11 +360,12 @@ class UserProfile {
this.get_user_rank().then(() => {
this.get_user_points().then(() => {
let html = $(__(`<p class="user-energy-points text-muted">${__('Energy Points: ')}<span class="rank">{0}</span></p>
<p class="user-energy-points text-muted">${__('Review Points: ')}<span class="rank">{1}</span></p>
<p class="user-energy-points text-muted">${__('Rank: ')}<span class="rank">{2}</span></p>
<p class="user-energy-points text-muted">${__('Monthly Rank: ')}<span class="rank">{3}</span></p>
`, [this.energy_points, this.review_points, this.rank, this.month_rank]));
let html = $(`
<p class="user-energy-points text-muted">${__('Energy Points:')} <span class="rank">${this.energy_points}</span></p>
<p class="user-energy-points text-muted">${__('Review Points:')} <span class="rank">${this.review_points}</span></p>
<p class="user-energy-points text-muted">${__('Rank:')} <span class="rank">${this.rank}</span></p>
<p class="user-energy-points text-muted">${__('Monthly Rank:')} <span class="rank">${this.month_rank}</span></p>
`);
$profile_details.append(html);
});

13
frappe/public/js/frappe/form/controls/dynamic_link.js
View file

@ -1,14 +1,12 @@
frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
get_options: function() {
let options = '';
if(this.df.get_options) {
if (this.df.get_options) {
options = this.df.get_options();
}
else if (this.docname==null && cur_dialog) {
} else if (this.docname==null && cur_dialog) {
//for dialog box
options = cur_dialog.get_value(this.df.options);
}
else if (!cur_frm) {
} else if (!cur_frm) {
const selector = `input[data-fieldname="${this.df.options}"]`;
let input = null;
if (cur_list) {
@ -21,13 +19,12 @@ frappe.ui.form.ControlDynamicLink = frappe.ui.form.ControlLink.extend({
if (input) {
options = input.val();
}
}
else {
} else {
options = frappe.model.get_value(this.df.parent, this.docname, this.df.options);
}
if (frappe.model.is_single(options)) {
frappe.throw(__(`${options.bold()} is not a valid DocType for Dynamic Link`));
frappe.throw(__("{0} is not a valid DocType for Dynamic Link", [options.bold()]));
}
return options;

5
frappe/public/js/frappe/form/sidebar/review.js
View file

@ -78,7 +78,6 @@ frappe.ui.form.Review = class Review {
}
show_review_dialog() {
const user_options = this.get_involved_users();
const doc_owner = this.frm.doc.owner;
const review_dialog = new frappe.ui.Dialog({
'title': __('Add Review'),
'fields': [{
@ -106,7 +105,7 @@ frappe.ui.form.Review = class Review {
fieldtype: 'Int',
label: __('Points'),
reqd: 1,
description: __(`Currently you have ${this.points.review_points} review points`)
description: __("Currently you have {0} review points", [this.points.review_points])
}, {
fieldtype: 'Small Text',
fieldname: 'reason',
@ -181,7 +180,7 @@ frappe.ui.form.Review = class Review {
trigger: 'hover',
delay: 500,
placement: 'top',
template:`
template: `
<div class="review-popover popover">
<div class="arrow"></div>
<div class="popover-content"></div>

2
frappe/public/js/frappe/list/list_view.js
View file

@ -33,7 +33,7 @@ frappe.views.ListView = class ListView extends frappe.views.BaseList {
if (!this.has_permissions()) {
frappe.set_route('');
frappe.msgprint(__(`Not permitted to view ${this.doctype}`));
frappe.msgprint(__("Not permitted to view {0}", [this.doctype]));
return;
}

213
frappe/public/js/frappe/ui/capture.js
View file

@ -3,155 +3,139 @@
/**
* @description Converts a canvas, image or a video to a data URL string.
*
*
* @param {HTMLElement} element - canvas, img or video.
* @returns {string} - The data URL string.
*
*
* @example
* frappe._.get_data_uri(video)
* // returns "data:image/pngbase64,..."
*/
frappe._.get_data_uri = element =>
{
const $element = $(element)
const width = $element.width()
const height = $element.height()
frappe._.get_data_uri = element => {
const $element = $(element);
const width = $element.width();
const height = $element.height();
const $canvas = $('<canvas/>')
$canvas[0].width = width
$canvas[0].height = height
const $canvas = $('<canvas/>');
$canvas[0].width = width;
$canvas[0].height = height;
const context = $canvas[0].getContext('2d')
context.drawImage($element[0], 0, 0, width, height)
const data_uri = $canvas[0].toDataURL('image/png')
const context = $canvas[0].getContext('2d');
context.drawImage($element[0], 0, 0, width, height);
return data_uri
}
const data_uri = $canvas[0].toDataURL('image/png');
return data_uri;
};
/**
* @description Frappe's Capture object.
*
*
* @example
* const capture = frappe.ui.Capture()
* capture.show()
*
*
* capture.click((data_uri) => {
* // do stuff
* })
*
*
* @see https://developer.mozilla.org/en-US/docs/Web/API/WebRTC_API/Taking_still_photos
*/
frappe.ui.Capture = class
{
constructor (options = { })
{
this.options = frappe.ui.Capture.OPTIONS
this.set_options(options)
frappe.ui.Capture = class {
constructor(options = {}) {
this.options = frappe.ui.Capture.OPTIONS;
this.set_options(options);
}
set_options (options)
{
this.options = { ...frappe.ui.Capture.OPTIONS, ...options }
return this
set_options(options) {
this.options = { ...frappe.ui.Capture.OPTIONS, ...options };
return this;
}
render ( )
{
return navigator.mediaDevices.getUserMedia({ video: true }).then(stream =>
{
this.dialog = new frappe.ui.Dialog({
title: this.options.title,
render() {
return navigator.mediaDevices.getUserMedia({ video: true }).then(stream => {
this.dialog = new frappe.ui.Dialog({
title: this.options.title,
animate: this.options.animate,
action:
{
secondary:
{
label: "<b>&times</b>"
action: {
secondary: {
label: '<b>&times</b>'
}
}
})
const $e = $(frappe.ui.Capture.TEMPLATE)
const video = $e.find('video')[0]
video.srcObject = stream
video.play()
const $container = $(this.dialog.body)
$container.html($e)
$e.find('.fc-btf').hide()
});
$e.find('.fc-bcp').click(() =>
{
const data_url = frappe._.get_data_uri(video)
$e.find('.fc-p').attr('src', data_url)
const $e = $(frappe.ui.Capture.TEMPLATE);
$e.find('.fc-s').hide()
$e.find('.fc-p').show()
const video = $e.find('video')[0];
video.srcObject = stream;
video.play();
$e.find('.fc-btu').hide()
$e.find('.fc-btf').show()
})
const $container = $(this.dialog.body);
$container.html($e);
$e.find('.fc-br').click(() =>
{
$e.find('.fc-p').hide()
$e.find('.fc-s').show()
$e.find('.fc-btf').hide();
$e.find('.fc-btf').hide()
$e.find('.fc-btu').show()
})
$e.find('.fc-bcp').click(() => {
const data_url = frappe._.get_data_uri(video);
$e.find('.fc-p').attr('src', data_url);
$e.find('.fc-bs').click(() =>
{
const data_url = frappe._.get_data_uri(video)
this.hide()
if (this.callback)
this.callback(data_url)
})
})
$e.find('.fc-s').hide();
$e.find('.fc-p').show();
$e.find('.fc-btu').hide();
$e.find('.fc-btf').show();
});
$e.find('.fc-br').click(() => {
$e.find('.fc-p').hide();
$e.find('.fc-s').show();
$e.find('.fc-btf').hide();
$e.find('.fc-btu').show();
});
$e.find('.fc-bs').click(() => {
const data_url = frappe._.get_data_uri(video);
this.hide();
if (this.callback) this.callback(data_url);
});
});
}
show ( )
{
this.render().then(() =>
{
this.dialog.show()
}).catch(err => {
if ( this.options.error )
{
const alert = `<span class="indicator red"/> ${frappe.ui.Capture.ERR_MESSAGE}`
frappe.show_alert(alert, 3)
}
show() {
this.render()
.then(() => {
this.dialog.show();
})
.catch(err => {
if (this.options.error) {
const alert = `<span class="indicator red"/> ${
frappe.ui.Capture.ERR_MESSAGE
}`;
frappe.show_alert(alert, 3);
}
throw err
})
throw err;
});
}
hide ( )
{
if ( this.dialog )
this.dialog.hide()
hide() {
if (this.dialog) this.dialog.hide();
}
submit (fn)
{
this.callback = fn
submit(fn) {
this.callback = fn;
}
}
frappe.ui.Capture.OPTIONS =
{
title: __(`Camera`),
};
frappe.ui.Capture.OPTIONS = {
title: __("Camera"),
animate: false,
error: false,
}
frappe.ui.Capture.ERR_MESSAGE = __("Unable to load camera.")
frappe.ui.Capture.TEMPLATE =
`
error: false
};
frappe.ui.Capture.ERR_MESSAGE = __('Unable to load camera.');
frappe.ui.Capture.TEMPLATE = `
<div class="frappe-capture">
<div class="panel panel-default">
<img class="fc-p img-responsive"/>
@ -181,14 +165,7 @@ frappe.ui.Capture.TEMPLATE =
<div class="fc-btu">
<div class="row">
<div class="col-md-6">
${
''
// <div class="pull-left">
// <button class="btn btn-default">
// <small>${__('Take Video')}</small>
// </button>
// </div>
}
${''}
</div>
<div class="col-md-6">
<div class="pull-right">
@ -201,4 +178,4 @@ frappe.ui.Capture.TEMPLATE =
</div>
</div>
</div>
`
`;

6
frappe/public/js/frappe/ui/filters/filter.js
View file

@ -54,7 +54,7 @@ frappe.ui.Filter = class {
this.filters_config = frappe.boot.additional_filters_config;
for (let key of Object.keys(this.filters_config)) {
const filter = this.filters_config[key];
this.conditions.push([key, __(`{0}`, [filter.label])]);
this.conditions.push([key, __(filter.label)]);
for (let fieldtype of Object.keys(this.invalid_condition_map)) {
if (!filter.valid_for_fieldtypes.includes(fieldtype)) {
this.invalid_condition_map[fieldtype].push(key);
@ -542,13 +542,13 @@ frappe.ui.filter_utils = {
if (period_map[period]) {
period_map[period].forEach((p) => {
options.push({
label: __(`{0} {1}`, [period, p]),
label: `${period} ${p}`,
value: `${period.toLowerCase()} ${p.toLowerCase()}`,
});
});
} else {
options.push({
label: __(`{0}`, [period]),
label: __(period),
value: `${period.toLowerCase()}`,
});
}

5
frappe/public/js/frappe/ui/filters/filter_list.js
View file

@ -63,12 +63,11 @@ frappe.ui.FilterGroup = class {
}
validate_args(doctype, fieldname) {
if(doctype && fieldname
if (doctype && fieldname
&& !frappe.meta.has_field(doctype, fieldname)
&& !frappe.model.std_fields_list.includes(fieldname)) {
frappe.throw(__(`Invalid filter: "${[fieldname.bold()]}"`));
frappe.throw(__("Invalid filter: {0}", [fieldname.bold()]));
return false;
}
return true;

6
frappe/public/js/frappe/utils/dashboard_utils.js
View file

@ -182,7 +182,7 @@ frappe.dashboard_utils = {
try {
f[3] = eval(f[3]);
} catch (e) {
frappe.throw(__(`Invalid expression set in filter ${f[1]} (${f[0]})`));
frappe.throw(__("Invalid expression set in filter {0} ({1})", [f[1], f[0]]));
}
});
filters = [...filters, ...dynamic_filters];
@ -192,7 +192,7 @@ frappe.dashboard_utils = {
const val = eval(dynamic_filters[key]);
dynamic_filters[key] = val;
} catch (e) {
frappe.throw(__(`Invalid expression set in filter ${key}`));
frappe.throw(__("Invalid expression set in filter {0}", [key]));
}
}
Object.assign(filters, dynamic_filters);
@ -238,7 +238,7 @@ frappe.dashboard_utils = {
let dashboard_route_html =
`<a href = "#dashboard/${values.dashboard}">${values.dashboard}</a>`;
let message =
__(`${doctype} ${values.name} added to Dashboard ` + dashboard_route_html);
__("{0} {1} added to Dashboard {2}", [doctype, values.name, dashboard_route_html]);
frappe.msgprint(message);
});

2
frappe/public/js/frappe/views/dashboard/dashboard_view.js
View file

@ -249,7 +249,7 @@ frappe.views.DashboardView = class DashboardView extends frappe.views.ListView {
show_add_chart_dialog() {
let fields = this.get_field_options();
const dialog = new frappe.ui.Dialog({
title: __(`Add a ${this.doctype} Chart`),
title: __("Add a {0} Chart", [this.doctype]),
fields: [
{
fieldname: 'new_or_existing',

4
frappe/public/js/frappe/views/desktop/desktop.js
View file

@ -306,7 +306,7 @@ class DesktopPage {
make_onboarding() {
this.onboarding_widget = frappe.widget.make_widget({
label: this.data.onboarding.label || __(`Let's Get Started`),
label: this.data.onboarding.label || __("Let's Get Started"),
subtitle: this.data.onboarding.subtitle,
steps: this.data.onboarding.items,
success: this.data.onboarding.success,
@ -371,7 +371,7 @@ class DesktopPage {
make_cards() {
let cards = new frappe.widget.WidgetGroup({
title: this.data.cards.label || __(`Reports & Masters`),
title: this.data.cards.label || __("Reports & Masters"),
container: this.page,
type: "links",
columns: 3,

22
frappe/public/js/frappe/views/reports/query_report.js
View file

@ -322,12 +322,12 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
let message;
if (dashboard_name) {
let dashboard_route_html = `<a href = "#dashboard/${dashboard_name}">${dashboard_name}</a>`;
message = __(`New {0} {1} added to Dashboard ` + dashboard_route_html, [doctype, name]);
message = __("New {0} {1} added to Dashboard {2}", [doctype, name, dashboard_route_html]);
} else {
message = __(`New {0} {1} created`, [doctype, name]);
message = __("New {0} {1} created", [doctype, name]);
}
frappe.msgprint(message, __(`New {0} Created`, [doctype]));
frappe.msgprint(message, __("New {0} Created", [doctype]));
});
}
@ -433,7 +433,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
try {
out = eval(expression.substr(5));
} catch (e) {
frappe.throw(__(`Invalid "depends_on" expression set in filter ${filter_label}`));
frappe.throw(__('Invalid "depends_on" expression set in filter {0}', [filter_label]));
}
} else {
var value = doc[expression];
@ -738,14 +738,18 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
get_queued_prepared_reports_warning_message(reports) {
const route = `#List/Prepared Report/List?status=Queued&report_name=${this.report_name}`;
const report_link_html = reports.length == 1
? `<a class="underline" href="${route}">${__('1 Report')}</a>`
: `<a class="underline" href="${route}">${__("{0} Reports", [reports.length])}</a>`;
const no_of_reports_html = reports.length == 1
? `${__('There is ')}<a class="underline" href="${route}">${__('1 Report')}</a>`
: `${__('There are ')}<a class="underline" href="${route}">${__(`{} Reports`, [reports.length])}</a>`;
? `${__('There is {0} with the same filters already in the queue:', [report_link_html])}`
: `${__('There are {0} with the same filters already in the queue:', [report_link_html])}`;
let warning_message = `
<p>
${__(`Are you sure you want to generate a new report?
{} with the same filters already in the queue:`, [no_of_reports_html])}
${__("Are you sure you want to generate a new report?")}
${no_of_reports_html}
</p>`;
let get_item_html = item => `<a class="underline" href="#Form/Prepared Report/${item.name}">${item.name}</a>`;
@ -1013,7 +1017,7 @@ frappe.views.QueryReport = class QueryReport extends frappe.views.BaseList {
field.value == values.x_field
)[0].label;
options.title = __(`${this.report_name}: ${x_field_label} vs ${y_field_label}`);
options.title = __("{0}: {1} vs {2}", [this.report_name, x_field_label, y_field_label]);
this.render_chart(options);
this.add_chart_buttons_to_toolbar(true);

2
frappe/public/js/frappe/widgets/chart_widget.js
View file

@ -387,7 +387,7 @@ export default class ChartWidget extends Widget {
setup_filter_dialog(fields) {
let me = this;
let dialog = new frappe.ui.Dialog({
title: __(`Set Filters for ${this.chart_doc.chart_name}`),
title: __("Set Filters for {0}", [this.chart_doc.chart_name]),
fields: fields,
primary_action: function() {
let values = this.get_values();

3
frappe/public/js/frappe/widgets/new_widget.js
View file

@ -19,7 +19,8 @@ export default class NewWidget {
get_title() {
// DO NOT REMOVE: Comment to load translation
// __("New Chart") __("New Shortcut") __("New Number Card")
return __(`New ${frappe.model.unscrub(this.type)}`);
let title = `New ${frappe.model.unscrub(this.type)}`;
return __(title);
}
make_widget() {

3
frappe/public/js/frappe/widgets/widget_dialog.js
View file

@ -35,7 +35,8 @@ class WidgetDialog {
// __("New Chart") __("New Shortcut") __("Edit Chart") __("Edit Shortcut")
let action = this.editing ? "Edit" : "Add";
return __(`${action} ${frappe.model.unscrub(this.type)}`);
let label = action = action + " " + frappe.model.unscrub(this.type);
return __(label);
}
get_fields() {

13
frappe/workflow/doctype/workflow/workflow.js
View file

@ -53,9 +53,8 @@ frappe.ui.form.on("Workflow", {
`<p class="bold">
${__('Are you sure you want to save this document?')}
</p>
<p>${__(`There are documents which have workflow states that do not exist in this Workflow.
It is recommended that you add these states to the Workflow and change their states
before removing these states.`)}
<p>
${__("There are documents which have workflow states that do not exist in this Workflow. It is recommended that you add these states to the Workflow and change their states before removing these states.")}
</p>`;
const message_html = warning_html + frm.state_table_html;
let proceed_action = () => {
@ -63,7 +62,12 @@ frappe.ui.form.on("Workflow", {
frm.save();
};
frappe.warn(__(`Worflow States Don't Exist`), message_html, proceed_action, __(`Save Anyway`));
frappe.warn(
__("Worflow States Don't Exist"),
message_html,
proceed_action,
__("Save Anyway")
);
},
set_table_html: function(frm) {
@ -145,4 +149,3 @@ frappe.ui.form.on("Workflow Document State", {
});
}
});