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.

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

Chinese support #632

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ buildscript {
repositories {
mavenCentral()
maven { url "https://plugins.gradle.org/m2/" }
maven { url "https://maven.aliyun.com/repository/gradle-plugin" }
}
dependencies { classpath 'org.ajoberstar.grgit:grgit-gradle:5.0.0' }
}
Expand Down
4 changes: 2 additions & 2 deletions docker/moqui-mysql-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ services:
- webapp_https_enabled=true
# nginx-proxy populates X-Real-IP with remote_addr by default, better option for outer proxy than X-Forwarded-For which defaults to proxy_add_x_forwarded_for
- webapp_client_ip_header=X-Real-IP
- default_locale=en_US
- default_time_zone=US/Pacific
- default_locale=zh_CN
- default_time_zone=Asia/Shanghai

moqui-database:
image: mysql:8.0
Expand Down
1 change: 1 addition & 0 deletions framework/data/CommonL10nData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,5 @@ along with this software (see the LICENSE.md file). If not, see
localized="${userFullName ?: (lastName ? (firstName ? firstName + ' ' : '') + lastName : '')} [${username?:userId?:''}]"/>

<moqui.basic.LocalizedMessage locale="default" original="UserAuthcOtpMessage" localized="Your single use code is ${code}"/>
<moqui.basic.LocalizedMessage locale="default" original="Account created with username ${username}" localized="用户名:${username}帐户已创建"/>
</entity-facade-xml>
2 changes: 1 addition & 1 deletion framework/data/CurrencyData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ along with this software (see the LICENSE.md file). If not, see
<moqui.basic.Uom abbreviation="BTC" description="Bitcoin" uomId="BTC" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="CRC" description="Costa Rica Colon" uomId="CRC" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="COP" description="Colombian Peso" uomId="COP" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="CNY" description="Chinese Yuan Renminbi" uomId="CNY" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="CNY" description="人民币" uomId="CNY" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="CLP" description="Chilean Peso" uomId="CLP" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="CHF" description="Swiss Franc" uomId="CHF" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
<moqui.basic.Uom abbreviation="CDP" description="Santo Domiongo" uomId="CDP" uomTypeEnumId="UT_CURRENCY_MEASURE"/>
Expand Down
2 changes: 1 addition & 1 deletion framework/data/GeoCountryData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ along with this software (see the LICENSE.md file). If not, see
<Geo geoCodeAlpha3="CAF" geoCodeAlpha2="CF" geoId="CAF" geoName="Central African Republic" geoCodeNumeric="140" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="TCD" geoCodeAlpha2="TD" geoId="TCD" geoName="Chad" geoCodeNumeric="148" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="CHL" geoCodeAlpha2="CL" geoId="CHL" geoName="Chile" geoCodeNumeric="152" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="CHN" geoCodeAlpha2="CN" geoId="CHN" geoName="China" geoCodeNumeric="156" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="CHN" geoCodeAlpha2="CN" geoId="CHN" geoName="中国" geoCodeNumeric="156" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="CXR" geoCodeAlpha2="CX" geoId="CXR" geoName="Christmas Island" geoCodeNumeric="162" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="CCK" geoCodeAlpha2="CC" geoId="CCK" geoName="Cocos (keeling) Islands" geoCodeNumeric="166" geoTypeEnumId="GEOT_COUNTRY"/>
<Geo geoCodeAlpha3="COL" geoCodeAlpha2="CO" geoId="COL" geoName="Colombia" geoCodeNumeric="170" geoTypeEnumId="GEOT_COUNTRY"/>
Expand Down
12 changes: 6 additions & 6 deletions framework/data/MoquiSetupData.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,28 +14,28 @@ along with this software (see the LICENSE.md file). If not, see
-->
<entity-facade-xml type="seed-initial">
<!-- EmailTemplate for password reset email -->
<moqui.basic.email.EmailTemplate emailTemplateId="PASSWORD_RESET" description="Default Password Reset" emailServerId="SYSTEM"
<moqui.basic.email.EmailTemplate emailTemplateId="PASSWORD_RESET" description="默认密码重置" emailServerId="SYSTEM"
emailTypeEnumId="EMT_PWD_RESET" bodyScreenLocation="classpath://screen/PasswordReset.xml" webappName="webroot"
fromAddress="" ccAddresses="" bccAddresses="" subject="Password Reset" sendPartial="Y"/>
<!-- EmailTemplate for single use codes -->
<moqui.basic.email.EmailTemplate emailTemplateId="SINGLE_USE_CODE" description="Send single use code" emailServerId="SYSTEM"
<moqui.basic.email.EmailTemplate emailTemplateId="SINGLE_USE_CODE" description="发送一次性代码" emailServerId="SYSTEM"
emailTypeEnumId="EMT_SINGLE_USE_CODE" bodyScreenLocation="classpath://screen/SingleUseCode.xml" webappName="webroot"
fromAddress="" ccAddresses="" bccAddresses="" subject="Single Use Code" sendPartial="Y"/>
<!-- EmailTemplate for Added Email Authentication Type -->
<moqui.basic.email.EmailTemplate emailTemplateId="ADDED_EMAIL_AUTHC_FACTOR" description="Added Email Authentication Type" emailServerId="SYSTEM"
<moqui.basic.email.EmailTemplate emailTemplateId="ADDED_EMAIL_AUTHC_FACTOR" description="添加了电子邮件身份验证类型" emailServerId="SYSTEM"
emailTypeEnumId="EMT_ADDED_EMAIL_AUTHC_FACTOR" bodyScreenLocation="classpath://screen/AddedEmailAuthcFactor.xml" webappName="webroot"
fromAddress="" ccAddresses="" bccAddresses="" subject="Added Email Authentication Type" sendPartial="Y"/>
<!-- EmailTemplate for Email Authentication Code Sent -->
<moqui.basic.email.EmailTemplate emailTemplateId="EMAIL_AUTHC_FACTOR_SENT" description="Email Authentication Code Sent" emailServerId="SYSTEM"
<moqui.basic.email.EmailTemplate emailTemplateId="EMAIL_AUTHC_FACTOR_SENT" description="已发送电子邮件验证码" emailServerId="SYSTEM"
emailTypeEnumId="EMT_EMAIL_AUTHC_FACTOR_SENT" bodyScreenLocation="classpath://screen/EmailAuthcFActorSent.xml" webappName="webroot"
fromAddress="" ccAddresses="" bccAddresses="" subject="Email Authentication Code Sent" sendPartial="Y"/>

<!-- EmailTemplate for general notifications -->
<moqui.basic.email.EmailTemplate emailTemplateId="NOTIFICATION" description="Default Notification" emailServerId="SYSTEM"
<moqui.basic.email.EmailTemplate emailTemplateId="NOTIFICATION" description="默认通知" emailServerId="SYSTEM"
emailTypeEnumId="EMT_NOTIFICATION" bodyScreenLocation="classpath://screen/NotificationEmail.xml" webappName="webroot"
fromAddress="" fromName="" ccAddresses="" bccAddresses="" subject="${title}" sendPartial="Y"/>
<!-- EmailTemplate for rendered screens (reports, etc) -->
<moqui.basic.email.EmailTemplate emailTemplateId="SCREEN_RENDER" description="Default Screen Render" emailServerId="SYSTEM"
<moqui.basic.email.EmailTemplate emailTemplateId="SCREEN_RENDER" description="默认屏幕渲染" emailServerId="SYSTEM"
emailTypeEnumId="EMT_SCREEN_RENDER" bodyScreenLocation="classpath://screen/ScreenRenderEmail.xml" webappName="webroot"
fromAddress="" fromName="" ccAddresses="" bccAddresses="" subject="${title}" sendPartial="Y"/>

Expand Down