Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix missing translations #8871

Merged
merged 2 commits into from
May 17, 2017
Merged

Fix missing translations #8871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec2a465
Fix missing translations
May 16, 2017
f0b55be
Fix
May 16, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions erpnext/hr/report/salary_register/salary_register.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
{%= frappe.boot.letter_heads[filters.letter_head || frappe.defaults.get_default("letter_head")] %}
</div>
<h2 class="text-center">{%= __(report.report_name) %}</h2>
<h5 class="text-center">From {%= filters.date_range[0] %} to {%= filters.date_range[1] %}</h5>
<h5 class="text-center">{{ __("From") }} {%= filters.date_range[0] %} {{ __("to") }} {%= filters.date_range[1] %}</h5>
<hr>
<table class="table table-bordered">
<thead>
Expand Down Expand Up @@ -34,4 +34,4 @@ <h5 class="text-center">From {%= filters.date_range[0] %} to {%= filters.date_ra
{% } %}
</tbody>
</table>
<p class="text-right text-muted">Printed On {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p>
<p class="text-right text-muted">{{ __("Printed On") }} {%= dateutil.str_to_user(dateutil.get_datetime_as_string()) %}</p>
12 changes: 6 additions & 6 deletions erpnext/public/js/payment/pos_payment.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
<div class="pos_payment row">
<div class="row" style="padding: 0px 30px;">
<h3>Total Amount: <span class="label label-default" style="font-size:20px;padding:5px">{%= format_currency(grand_total, currency) %}</span></h3>
<h3>{{ __("Total Amount") }}: <span class="label label-default" style="font-size:20px;padding:5px">{%= format_currency(grand_total, currency) %}</span></h3>
</div>
<div class="row amount-row">
<div class="col-xs-6 col-sm-3 text-center">
<p class="amount-label"> Paid <h3 class="paid_amount">{%= format_currency(paid_amount, currency) %}</h3></p>
<p class="amount-label"> {{ __("Paid") }} <h3 class="paid_amount">{%= format_currency(paid_amount, currency) %}</h3></p>
</div>
<div class="col-xs-6 col-sm-3 text-center">
<p class="amount-label"> Outstanding <h3 class="outstanding_amount">{%= format_currency(outstanding_amount, currency) %} </h3></p>
<p class="amount-label"> {{ __("Outstanding") }} <h3 class="outstanding_amount">{%= format_currency(outstanding_amount, currency) %} </h3></p>
</div>
<div class="col-xs-6 col-sm-3 text-center">
<p class="amount-label"> Change <input class="form-control text-right change_amount bold" type="text" idx="change_amount" value="{{format_number(change_amount, null, 2)}}">
<p class="amount-label"> {{ __("Change") }} <input class="form-control text-right change_amount bold" type="text" idx="change_amount" value="{{format_number(change_amount, null, 2)}}">
</p>
</div>
<div class="col-xs-6 col-sm-3 text-center">
<p class="amount-label"> Write off <input class="form-control text-right write_off_amount bold" type="text" idx="write_off_amount" value="{{format_number(write_off_amount, null, 2)}}">
<p class="amount-label"> {{ __("Write off") }} <input class="form-control text-right write_off_amount bold" type="text" idx="write_off_amount" value="{{format_number(write_off_amount, null, 2)}}">
</p>
</div>
</div>
Expand All @@ -33,7 +33,7 @@ <h3>Total Amount: <span class="label label-default" style="font-size:20px;paddin
</div>
{% } %}
<div class="row">
<button type="button" class="btn btn-default delete-btn">Del</button>
<button type="button" class="btn btn-default delete-btn">{{ __("Del") }}</button>
<button type="button" class="btn btn-default pos-keyboard-key">0</button>
<button type="button" class="btn btn-default pos-keyboard-key">.</button>
</div>
Expand Down
12 changes: 6 additions & 6 deletions erpnext/public/js/pos/pos.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<div class="no-items-message text-extra-muted">
<span class="text-center">
<i class="fa fa-2x fa-shopping-cart"></i>
<p>Tap items to add them here</p>
<p>{{ __("Tap items to add them here") }}</p>
</span>
</div>
<div class="items">
Expand Down Expand Up @@ -68,7 +68,7 @@

</div>
<div class="col-xs-6 numeric_keypad hidden-xs" style="display:none">
{% var chartData = ["Qty", "Disc", "Price"] %} {% for(var i=0; i
{% var chartData = [__("Qty"), __("Disc"), __("Price")] %} {% for(var i=0; i
<3; i++) { %} <div class="row text-right">
{% for(var j=i*3; j
<(i+1)*3; j++) { %} <button type="button" class="btn btn-default numeric-keypad" val="{{j+1}}">{{j+1}}</button>
Expand All @@ -77,10 +77,10 @@
</div>
{% } %}
<div class="row text-right">
<button type="button" class="btn btn-default numeric-keypad numeric-del">Del</button>
<button type="button" class="btn btn-default numeric-keypad numeric-del">{{ __("Del") }}</button>
<button type="button" class="btn btn-default numeric-keypad" val="0">0</button>
<button type="button" class="btn btn-default numeric-keypad" val=".">.</button>
<button type="button" class="btn btn-primary numeric-keypad pos-pay">Pay</button>
<button type="button" class="btn btn-primary numeric-keypad pos-pay">{{ __("Pay") }}</button>
</div>
</div>
</div>
Expand All @@ -97,7 +97,7 @@
<div class="no-items-message text-extra-muted">
<span class="text-center">
<i class="fa fa-2x fa-user"></i>
<p>No Customers yet!</p>
<p>{{ __("No Customers yet!") }}</p>
</span>
</div>
</div>
Expand All @@ -112,7 +112,7 @@
<div class="pos-list-row pos-bill-header text-muted h6">
<div class="cell subject search-item-group">
<div class="dropdown">
<a class="text-muted dropdown-toggle" data-toggle="dropdown"><span class="dropdown-text">All Item Groups</span><i class="caret"></i></a>
<a class="text-muted dropdown-toggle" data-toggle="dropdown"><span class="dropdown-text">{{ __("All Item Groups") }}</span><i class="caret"></i></a>
<ul class="dropdown-menu">
</ul>
</div>
Expand Down
2 changes: 1 addition & 1 deletion erpnext/public/js/pos/pos_item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div class="pos-item-wrapper image-view-item" data-item-code="{{item_code}}">
<div class="image-view-header doclist-row">
<div class="list-value">
<a class="grey list-id" data-name="{{item_code}}" title="{{ item_name || item_code}}">{{item_name || item_code}}<br>({{item_stock}})</a>
<a class="grey list-id" data-name="{{item_code}}" title="{{ item_name || item_code}}">{{item_name || item_code}}<br>({{ _(item_stock) }})</a>
</div>
</div>
<div class="image-view-body">
Expand Down
10 changes: 5 additions & 5 deletions erpnext/public/js/pos/pos_selected_item.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<div class="pos-selected-item-action" data-item-code="{%= item_code %}">
<div class="pos-list-row">
<div class="cell">Quantity:</div>
<div class="cell">{{ __("Quantity") }}:</div>
<input type="tel" class="form-control cell pos-item-qty" value="{%= qty %}"/>
</div>
<div class="pos-list-row">
<div class="cell">Price List Rate:</div>
<div class="cell">{{ __("Price List Rate") }}:</div>
<input type="tel" class="form-control cell" disabled value="{%= price_list_rate %}"/>
</div>
<div class="pos-list-row">
<div class="cell">Discount:</div>
<div class="cell">{{ __("Discount") }}:</div>
<input type="tel" class="form-control cell pos-item-disc" value="{%= discount_percentage %}">
</div>
<div class="pos-list-row">
<div class="cell">Price:</div>
<div class="cell">{{ __("Price") }}:</div>
<input type="tel" class="form-control cell pos-item-price" value="{%= rate %}"/>
</div>
<div class="pos-list-row">
<div class="cell">Amount:</div>
<div class="cell">{{ __("Amount") }}:</div>
<input type="tel" class="form-control cell pos-amount" value="{%= amount %}"/>
</div>
</div>
6 changes: 3 additions & 3 deletions erpnext/templates/generators/item_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
</div>
<div class="text-center item-group-nav-buttons">
{% if frappe.form_dict.start|int > 0 %}
<a class="btn btn-default" href="/{{ pathname }}?start={{ frappe.form_dict.start|int - page_length }}">Prev</a>
<a class="btn btn-default" href="/{{ pathname }}?start={{ frappe.form_dict.start|int - page_length }}">{{ __("Prev") }}</a>
{% endif %}
{% if items|length > page_length %}
<a class="btn btn-default" href="/{{ pathname }}?start={{ frappe.form_dict.start|int + page_length }}">Next</a>
<a class="btn btn-default" href="/{{ pathname }}?start={{ frappe.form_dict.start|int + page_length }}">{{ __("Next") }}</a>
{% endif %}
</div>
{% else %}
<div class="text-muted">No items listed.</div>
<div class="text-muted">{{ __("No items listed") }}.</div>
{% endif %}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion erpnext/templates/includes/navbar/navbar_items.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<li class="shopping-cart hidden">
<div class="cart-icon">
<a class="dropdown-toggle" href="#" data-toggle="dropdown" id="navLogin">
Cart <span class="badge-wrapper" id="cart-count"></span>
{{ _("Cart") }} <span class="badge-wrapper" id="cart-count"></span>
</a>
<div id="cart-overlay" class="dropdown-menu shopping-cart-menu"></div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion erpnext/templates/includes/projects/project_tasks.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<span class="indicator {{ "red" if task.status=="Open" else "green" if task.status=="Closed" else "darkgrey" }}" title="{{ task.status }}" > {{ task.subject }}</span>
<div class="small text-muted item-timestamp"
title="{{ frappe.utils.pretty_date(task.modified) }}">
modified {{ frappe.utils.pretty_date(task.modified) }}
{{ __("modified") }} {{ frappe.utils.pretty_date(task.modified) }}
</div>
</div>
<div class='col-xs-1'>{% if task.todo %}
Expand Down
2 changes: 1 addition & 1 deletion erpnext/templates/includes/projects/project_timesheets.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<div class='col-xs-9'>
<span class="indicator {{ "blue" if timesheet.info.status=="Submitted" else "red" if timesheet.info.status=="Draft" else "darkgrey" }}" title="{{ timesheet.info.status }}" > {{ timesheet.info.name }} </span>
<div class="small text-muted item-timestamp">
From {{ frappe.format_date(timesheet.from_time) }} to {{ frappe.format_date(timesheet.to_time) }}
{{ __("From") }} {{ frappe.format_date(timesheet.from_time) }} {{ __("to") }} {{ frappe.format_date(timesheet.to_time) }}
</div>
</div>
<div class='col-xs-1 gravatar-top'>
Expand Down
2 changes: 1 addition & 1 deletion erpnext/templates/pages/cart.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
{{doc.terms}}
</div>
<div class="cart-link">
<a href="#" onclick="show_terms();return false;">*Terms and Conditions</a>
<a href="#" onclick="show_terms();return false;">*{{ __("Terms and Conditions") }}</a>
</div>
{% endif %}

Expand Down
40 changes: 20 additions & 20 deletions erpnext/templates/pages/task_info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ <h1> {{ doc.subject }} </h1>
<div class="col-sm-4">
<div class="page-header-actions-block" data-html-block="header-actions">
<button type="submit" class="btn btn-primary btn-sm btn-form-submit">
Update</button>
{{ __("Update") }}</button>
<a href="tasks" class="btn btn-default btn-sm">
Cancel</a>
{{ __("Cancel") }}</a>
</div>
</div>
</div>
Expand All @@ -36,45 +36,45 @@ <h1> {{ doc.subject }} </h1>
<div class="row">
<div class="col-sm-12" style="max-width: 500px;">
<div class="form-group">
<label for="project" class="control-label text-muted small">Project</label>
<label for="project" class="control-label text-muted small">{{ __("Project") }}</label>
<input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">
</div>

<div class="form-group">
<label for="subject" class="control-label text-muted small">Subject</label>
<label for="subject" class="control-label text-muted small">{{ __("Subject") }}</label>
<input type="text" class="form-control" name="subject" readonly value="{{ doc.subject }}">
</div>

<div class="form-group">
<label for="description" class="control-label text-muted small">Details</label>
<label for="description" class="control-label text-muted small">{{ __("Details") }}</label>
<textarea class="form-control" style="height: 200px;" name="description">{{ doc.description }}</textarea>
</div>

<div class="form-group">
<label for="priority" class="control-label text-muted small">Priority</label>
<label for="priority" class="control-label text-muted small">{{ __("Priority") }}</label>
<input type="text" class="form-control" name="priority" readonly value="{{ doc.priority }}">
</div>

<div class="form-group">
<label for="exp_start_date" class="control-label text-muted small">Expected Start Date</label>
<label for="exp_start_date" class="control-label text-muted small">{{ __("Expected Start Date") }}</label>
<input type="text" class="form-control hasDatepicker" name="exp_start_date" readonly value="{{ doc.exp_start_date }}">
</div>

<div class="form-group">
<label for="exp_end_date" class="control-label text-muted small">Expected End Date</label>
<label for="exp_end_date" class="control-label text-muted small">{{ __("Expected End Date") }}</label>
<input type="text" class="form-control hasDatepicker" name="exp_end_date" readonly value="{{ doc.exp_end_date }}">
</div>

<div class="form-group">
<label for="status" class="control-label text-muted small">Status</label>
<label for="status" class="control-label text-muted small">{{ __("Status") }}</label>
<select class="form-control" name="status" id="status" data-label="Status" data-fieldtype="Select">
<option value="Open" selected="selected">
Open</option><option value="Working">
Working</option><option value="Pending Review">
Pending Review</option><option value="Overdue">
Overdue</option><option value="Closed">
Closed</option><option value="Cancelled">
Cancelled</option>
{{ __("Open") }}</option><option value="Working">
{{ __("Working") }}</option><option value="Pending Review">
{{ __("Pending Review") }}</option><option value="Overdue">
{{ __("Overdue") }}</option><option value="Closed">
{{ __("Closed") }}</option><option value="Cancelled">
{{ __("Cancelled") }}</option>
</select>
</div>
</div>
Expand All @@ -83,22 +83,22 @@ <h1> {{ doc.subject }} </h1>
</div>

<div class="comments">
<h3>Comments</h3>
<h3>{{ __("Comments") }}</h3>
<div class="no-comment">
{% for comment in comments %}
<p class="text-muted">{{comment.sender_full_name}}:
{{comment.subject}} on {{comment.creation.strftime('%Y-%m-%d')}}</p>
{{comment.subject}} {{ __("on") }} {{comment.creation.strftime('%Y-%m-%d')}}</p>
{% endfor %}
</div>
<div class="comment-form-wrapper">
<a class="add-comment btn btn-default btn-sm">Add Comment</a>
<a class="add-comment btn btn-default btn-sm">{{ __("Add Comment") }}</a>
<div style="display: none;" id="comment-form">
<p>Add Comment</p>
<p>{{ __("Add Comment") }}</p>
<form>
<fieldset>
<textarea class="form-control" name="comment" rows="5" placeholder="Comment"></textarea>
<p>
<button class="btn btn-primary btn-sm" id="submit-comment">Submit</button>
<button class="btn btn-primary btn-sm" id="submit-comment">{{ __("Submit") }}</button>
</p>
</fieldset>
</form>
Expand Down
16 changes: 8 additions & 8 deletions erpnext/templates/pages/timelog_info.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,28 +19,28 @@ <h1> {{ doc.name }} </h1>
<div class="page-content-block">
<div class="row">
<div class="col-sm-12" style="max-width: 500px;">
<label for="project" class="control-label text-muted small">Project</label>
<label for="project" class="control-label text-muted small">{{ __("Project") }}</label>
<input type="text" class="form-control" name="project" readonly value= "{{ doc.project }}">

<label for="activity_type" class="control-label text-muted small">Activity Type</label>
<label for="activity_type" class="control-label text-muted small">{{ __("Activity Type") }}</label>
<input type="text" class="form-control" name="activity_type" readonly value= "{{ doc.activity_type }}">

<label for="task" class="control-label text-muted small">Task</label>
<label for="task" class="control-label text-muted small">{{ __("Task") }}</label>
<input type="text" class="form-control" name="task" readonly value= "{{ doc.task }}">

<label for="from_time" class="control-label text-muted small">From Time</label>
<label for="from_time" class="control-label text-muted small">{{ __("From Time") }}</label>
<input type="text" class="form-control" name="from_time" readonly value= "{{ doc.from_time }}">

<label for="to_time" class="control-label text-muted small">To Time</label>
<label for="to_time" class="control-label text-muted small">{{ __("To Time") }}</label>
<input type="text" class="form-control" name="to_time" readonly value= "{{ doc.to_time }}">

<label for="to_time" class="control-label text-muted small">Hours</label>
<label for="to_time" class="control-label text-muted small">{{ __("Hours") }}</label>
<input type="text" class="form-control" name="Hours" readonly value= "{{ doc.hours }}">

<label for="status" class="control-label text-muted small">Status</label>
<label for="status" class="control-label text-muted small">{{ __("Status") }}</label>
<input type="text" class="form-control" name="status" readonly value= "{{ doc.status }}">

<label for="Note" class="control-label text-muted small">Note</label>
<label for="Note" class="control-label text-muted small">{{ __("Note") }}</label>
<textarea class="form-control" name="Hours" readonly> {{ doc.note }} </textarea>
</div>
</div>
Expand Down