Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
nengyuanzhang committed May 20, 2024
2 parents 79dc369 + ad0d6db commit 9cb97d5
Show file tree
Hide file tree
Showing 4 changed files with 360 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
- added menus for plan functions in database
- added energy plan reports (preview) in myems-web
- added new tables for energy, billing and carbon in database
- added language zh_TW to myems-web and myems-admin
- added language zh_TW to myems-web, myems-admin and myems-api
### Changed
- updated Distribution System in myems-web
- limit virtual meter normalization procedure to calculate at most one month records
Expand Down
5 changes: 4 additions & 1 deletion myems-api/core/utilities.py
Original file line number Diff line number Diff line change
Expand Up @@ -961,7 +961,10 @@ def statistics_hourly_data_by_period(rows_hourly, start_datetime_utc, end_dateti


def get_translation(language):
if language not in ['zh_CN', 'en', 'de', 'fr', 'es', 'ru', 'ar', 'vi', 'th', 'tr', 'ms', 'id', 'zh_TW']:
if language is None or not isinstance(language, str) or len(language) == 0:
return gettext.translation('myems', './i18n/', languages=['en'])

if language.lower() not in ['zh_CN', 'en', 'de', 'fr', 'es', 'ru', 'ar', 'vi', 'th', 'tr', 'ms', 'id', 'zh_TW']:
return gettext.translation('myems', './i18n/', languages=['en'])
else:
language_list = [language]
Expand Down
Binary file added myems-api/i18n/zh_TW/LC_MESSAGES/myems.mo
Binary file not shown.
355 changes: 355 additions & 0 deletions myems-api/i18n/zh_TW/LC_MESSAGES/myems.po
Original file line number Diff line number Diff line change
@@ -0,0 +1,355 @@
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-09-09 16:37+0800\n"
"PO-Revision-Date: 2023-02-22 16:38+0800\n"
"Last-Translator: \n"
"Language-Team: \n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Poedit 2.3\n"

msgid "Space"
msgstr "空间"

msgid "Start Datetime"
msgstr "开始时间"

msgid "End Datetime"
msgstr "结束时间"

msgid "ID"
msgstr "ID"

msgid "Name"
msgstr "名称"

msgid "Period Type"
msgstr "时间尺度"

msgid "Reporting Start Datetime"
msgstr "报告期开始时间"

msgid "Reporting End Datetime"
msgstr "报告期结束时间"

msgid "Reporting Period Consumption"
msgstr "报告期消耗"

msgid "Consumption"
msgstr "消耗"

msgid "Per Unit Area"
msgstr "单位面积值"

msgid "Increment Rate"
msgstr "增加率"

msgid "Ton of Standard Coal"
msgstr "吨标准煤"

msgid "Ton of Carbon Dioxide Emissions"
msgstr "吨二氧化碳排放"

msgid "Electricity Consumption by Time-Of-Use"
msgstr "分时消耗电量"

msgid "TopPeak"
msgstr "尖"

msgid "OnPeak"
msgstr "峰"

msgid "MidPeak"
msgstr "平"

msgid "OffPeak"
msgstr "谷"

msgid "Ton of Standard Coal(TCE) by Energy Category"
msgstr "吨标准煤(TCE)占比"

msgid "Ton of Carbon Dioxide Emissions(TCO2E) by Energy Category"
msgstr "吨二氧化碳排放(TCO2E)占比"

msgid "Child Spaces Data"
msgstr "子空间数据"

msgid "Child Space"
msgstr "子空间"

msgid "Detailed Data"
msgstr "详细数据"

msgid "Datetime"
msgstr "日期时间"

msgid "Subtotal"
msgstr "小计"

msgid "Parameters"
msgstr "参数"

msgid "Base Period Carbon Dioxide Emissions"
msgstr "基准期二氧化碳排放"

msgid "Reporting Period Carbon Dioxide Emissions"
msgstr "报告期二氧化碳排放"

msgid "Carbon Dioxide Emissions"
msgstr "二氧化碳排放"

msgid "Electricity Carbon Dioxide Emissions by Time-Of-Use"
msgstr "分时用电排放二氧化碳"

msgid "Carbon Dioxide Emissions Proportion"
msgstr "二氧化碳排放占比"

msgid "Total"
msgstr "总计"

msgid "Base Period Costs"
msgstr "基准期成本"

msgid "Reporting Period Costs"
msgstr "报告期成本"

msgid "Cost"
msgstr "成本分析"

msgid "Electricity Cost by Time-Of-Use"
msgstr "分时用电成本"

msgid "Costs Proportion"
msgstr "成本占比"

msgid "Base Period Cumulative Efficiency"
msgstr "基准期累积效率"

msgid "Reporting Period Cumulative Efficiency"
msgstr "报告期累积效率"

msgid "Cumulative Efficiency"
msgstr "累积效率"

msgid "Base Period Income"
msgstr "基准期收入"

msgid "Reporting Period Income"
msgstr "报告期收入"

msgid "Incomes by Energy Category"
msgstr "收入占比"

msgid "Incomes"
msgstr "收入"

msgid "Proportion"
msgstr "占比"

msgid "Load"
msgstr "负荷"

msgid "Base Period Average Load"
msgstr "基准期平均负荷"

msgid "Reporting Period Average Load"
msgstr "报告期平均负荷"

msgid "Average Load"
msgstr "平均负荷"

msgid "Base Period Maximum Load"
msgstr "基准期最大负荷"

msgid "Reporting Period Maximum Load"
msgstr "报告期最大负荷"

msgid "Maximum Load"
msgstr "最大负荷"

msgid "Reporting Period Load Factor"
msgstr "报告期负荷系数"

msgid "Load Factor"
msgstr "负荷系数"

msgid "Base Period Output"
msgstr "基准期产出"

msgid "Reporting Period Output"
msgstr "报告期产出"

msgid "Output"
msgstr "产出"

msgid "Base Period Saving"
msgstr "基准期节约"

msgid "Reporting Period Saving"
msgstr "报告期节约"

msgid "Baseline"
msgstr "基线"

msgid "Actual"
msgstr "实际"

msgid "Saving"
msgstr "节约"

msgid "Decreased"
msgstr "减少"

msgid "Statistics"
msgstr "统计分析"

msgid "Reporting Period"
msgstr "报告期"

msgid "Arithmetic Mean"
msgstr "算术平均数"

msgid "Median (Middle Value)"
msgstr "中位数"

msgid "Minimum Value"
msgstr "最小值"

msgid "Maximum Value"
msgstr "最大值"

msgid "Sample Standard Deviation"
msgstr "样本标准差"

msgid "Sample Variance"
msgstr "样本方差"

msgid "Cost Center"
msgstr "成本中心"

msgid "Description"
msgstr "描述"

msgid "Master Meter Consumption"
msgstr "总表消耗"

msgid "Submeters Consumption"
msgstr "分表消耗"

msgid "Difference"
msgstr "差值"

msgid "Percentage Difference"
msgstr "差值百分比"

msgid "Start Integrity Rate"
msgstr "起始数据完整率"

msgid "End Integrity Rate"
msgstr "结束数据完整率"

msgid "Full Integrity Rate"
msgstr "整体数据完整率"

msgid "Trend"
msgstr "趋势"

msgid "Payment Notice"
msgstr "付款通知书"

msgid "Lease Number"
msgstr "租赁数量"

msgid "Bill Number"
msgstr "账单号码"

msgid "Lease Contract Number"
msgstr "租赁合同号码"

msgid "Bill Date"
msgstr "账单日期"

msgid "Payment Due Date"
msgstr "付款到期日"

msgid "Amount Payable"
msgstr "应付款金额"

msgid "Energy Category"
msgstr "能源分类"

msgid "Billing Period Start"
msgstr "计费周期开始"

msgid "Billing Period End"
msgstr "结算期结束日期"

msgid "Quantity"
msgstr "数量"

msgid "Unit"
msgstr "单位"

msgid "Amount"
msgstr "金额"

msgid "Tax Rate"
msgstr "税率"

msgid "VAT Output Tax"
msgstr "增值税销项税金"

msgid "Total Amount Payable"
msgstr "应付金额合计"

msgid "Electricity Costs by Time-Of-Use"
msgstr "分时用电成本"

msgid "Electricity Carbon Dioxide Emissions Proportion by Time-Of-Use"
msgstr "分时用电排放二氧化碳占比"

msgid "Associated Equipment Data"
msgstr "相关设备数据"

msgid "Associated Equipment"
msgstr "相关设备"

msgid "Electricity Cost Proportion by Time-Of-Use"
msgstr "分时用电成本占比"

msgid "Start Value"
msgstr "起始值"

msgid "End Value"
msgstr "结束值"

msgid "Difference Value"
msgstr "差值"

msgid "Base Period"
msgstr "基准期"

msgid "Base Period Start Datetime"
msgstr "基准期开始时间"

msgid "Base Period End Datetime"
msgstr "基准期结束时间"

msgid "Base Period Consumption"
msgstr "基准期消耗"

msgid "All"
msgstr "全部"

msgid "Tariff"
msgstr "费率"

msgid "Non Working Days"
msgstr "非工作日"

msgid "Working Days"
msgstr "工作日"

0 comments on commit 9cb97d5

Please sign in to comment.