mirror of
https://github.com/getrebuild/rebuild.git
synced 2024-09-21 07:55:56 +08:00
lang
This commit is contained in:
parent
b2c79efe22
commit
3b302dab9a
2
@rbv
2
@rbv
|
@ -1 +1 @@
|
||||||
Subproject commit 7a948bf9a18ddc1d4c56d2ef1a881685cd9618a4
|
Subproject commit 2c132e4977fea61da0bd3e36143bcc3bfaafc14f
|
|
@ -85,7 +85,7 @@ public class Entity2Schema extends Field2Schema {
|
||||||
|
|
||||||
final boolean isDetail = StringUtils.isNotBlank(mainEntity);
|
final boolean isDetail = StringUtils.isNotBlank(mainEntity);
|
||||||
if (isDetail && !MetadataHelper.containsEntity(mainEntity)) {
|
if (isDetail && !MetadataHelper.containsEntity(mainEntity)) {
|
||||||
throw new MetadataModificationException($L("无效主实体 : %s", mainEntity));
|
throw new MetadataModificationException($L("无效主实体 (%s)", mainEntity));
|
||||||
}
|
}
|
||||||
|
|
||||||
String physicalName = "T__" + entityName.toUpperCase();
|
String physicalName = "T__" + entityName.toUpperCase();
|
||||||
|
|
|
@ -269,7 +269,7 @@ public class Field2Schema {
|
||||||
// 在导入实体时需要,需自行保证引用实体有效性,否则系统会出错
|
// 在导入实体时需要,需自行保证引用实体有效性,否则系统会出错
|
||||||
if (!DynamicMetadataContextHolder.isSkipRefentityCheck(false)) {
|
if (!DynamicMetadataContextHolder.isSkipRefentityCheck(false)) {
|
||||||
if (!MetadataHelper.containsEntity(refEntity)) {
|
if (!MetadataHelper.containsEntity(refEntity)) {
|
||||||
throw new MetadataModificationException($L("无效引用实体 : %s", refEntity));
|
throw new MetadataModificationException($L("无效引用实体 (%s)", refEntity));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
<div class="input-group input-search">
|
<div class="input-group input-search">
|
||||||
<input class="form-control" type="text" th:placeholder="${bundle.$L('查询记录ID')}" maxlength="40" />
|
<input class="form-control" type="text" th:placeholder="${bundle.$L('查询记录 ID')}" maxlength="40" />
|
||||||
<span class="input-group-btn"
|
<span class="input-group-btn"
|
||||||
><button class="btn btn-secondary" type="button"><i class="icon zmdi zmdi-search"></i></button
|
><button class="btn btn-secondary" type="button"><i class="icon zmdi zmdi-search"></i></button
|
||||||
></span>
|
></span>
|
||||||
|
|
|
@ -71,7 +71,7 @@
|
||||||
<div class="tab-pane" id="IMPORTS">
|
<div class="tab-pane" id="IMPORTS">
|
||||||
<div id="metaschemas"></div>
|
<div id="metaschemas"></div>
|
||||||
<div class="mt-2 text-right hide">
|
<div class="mt-2 text-right hide">
|
||||||
<a href="https://github.com/getrebuild/rebuild-datas/" class="link" target="_blank">[[${bundle.$L('RbSubmit')}]]</a>
|
<a href="https://github.com/getrebuild/rebuild-datas/" class="link" target="_blank">[[${bundle.$L('提交数据到 RB 仓库')}]]</a>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -56,7 +56,7 @@ const post = function (data) {
|
||||||
const field = $('td[data-id=' + k + ']')
|
const field = $('td[data-id=' + k + ']')
|
||||||
.prev()
|
.prev()
|
||||||
.text()
|
.text()
|
||||||
RbHighbar.create($L('%s不能为空', field))
|
RbHighbar.create($L('%s 不能为空', field))
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -22,7 +22,7 @@ class DlgAssign extends RbModalHandler {
|
||||||
<div className="form-group row pb-0">
|
<div className="form-group row pb-0">
|
||||||
<label className="col-sm-3 col-form-label text-sm-right">{$L('%s哪些记录', this._Props[1])}</label>
|
<label className="col-sm-3 col-form-label text-sm-right">{$L('%s哪些记录', this._Props[1])}</label>
|
||||||
<div className="col-sm-7">
|
<div className="col-sm-7">
|
||||||
<div className="form-control-plaintext">{`${$L('选中的数据')} (${$L('%d条', this.state.ids.length)})`}</div>
|
<div className="form-control-plaintext">{`${$L('选中的数据')} (${$L('%d 条', this.state.ids.length)})`}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
)}
|
)}
|
||||||
|
@ -184,7 +184,7 @@ class DlgUnshare extends RbModalHandler {
|
||||||
<div className="form-group row">
|
<div className="form-group row">
|
||||||
<label className="col-sm-3 col-form-label text-sm-right">{$L('取消共享哪些记录')}</label>
|
<label className="col-sm-3 col-form-label text-sm-right">{$L('取消共享哪些记录')}</label>
|
||||||
<div className="col-sm-7">
|
<div className="col-sm-7">
|
||||||
<div className="form-control-plaintext">{`${$L('选中的数据')} (${$L('%d条', this.state.ids.length)})`}</div>
|
<div className="form-control-plaintext">{`${$L('选中的数据')} (${$L('%d 条', this.state.ids.length)})`}</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="form-group row pt-0 pb-0">
|
<div className="form-group row pt-0 pb-0">
|
||||||
|
|
|
@ -132,7 +132,7 @@ class ClassificationSelector extends React.Component {
|
||||||
const last = this._select2[this.state.openLevel]
|
const last = this._select2[this.state.openLevel]
|
||||||
const v = last.val()
|
const v = last.val()
|
||||||
if (!v) {
|
if (!v) {
|
||||||
RbHighbar.create($L('请选择%s', this.props.label))
|
RbHighbar.create($L('请选择 %s', this.props.label))
|
||||||
} else {
|
} else {
|
||||||
const text = []
|
const text = []
|
||||||
$(this._select2).each(function () {
|
$(this._select2).each(function () {
|
||||||
|
|
|
@ -35,7 +35,7 @@ public class I18nGettextParser {
|
||||||
log.info("Found {} items", into.size());
|
log.info("Found {} items", into.size());
|
||||||
// Bad text
|
// Bad text
|
||||||
for (String text : into) {
|
for (String text : into) {
|
||||||
if (text.contains("'")) System.err.println(text);
|
if (text.contains("'") || text.contains("\"")) System.err.println(text);
|
||||||
}
|
}
|
||||||
|
|
||||||
File target = new File(root, "lang.zh_CN.json");
|
File target = new File(root, "lang.zh_CN.json");
|
||||||
|
@ -54,11 +54,11 @@ public class I18nGettextParser {
|
||||||
static void parse(File fileOrDir, Set<String> into) throws IOException {
|
static void parse(File fileOrDir, Set<String> into) throws IOException {
|
||||||
String fileName = fileOrDir.getName();
|
String fileName = fileOrDir.getName();
|
||||||
if (fileOrDir.isFile()) {
|
if (fileOrDir.isFile()) {
|
||||||
if (fileName.endsWith(".jsx")) {
|
if (fileName.endsWith(".js")) {
|
||||||
into.addAll(parseJs(fileOrDir));
|
into.addAll(parseJs(fileOrDir));
|
||||||
} else if (fileName.endsWith(".html")) {
|
} else if (fileName.endsWith(".html")) {
|
||||||
into.addAll(parseHtml(fileOrDir));
|
into.addAll(parseHtml(fileOrDir));
|
||||||
} else if (fileName.endsWith(".javax")) {
|
} else if (fileName.endsWith(".java")) {
|
||||||
into.addAll(parseJava(fileOrDir));
|
into.addAll(parseJava(fileOrDir));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue