Skip to content

M
Moecube Accounts Web
Commit 96f13a64 authored by 2breakegg's avatar 2breakegg
Browse files
Options

i18n

parent b8ea6b90
Hide whitespace changes
Inline Side-by-side
Showing with 159 additions and 291 deletions
.idea/workspace.xml
View file @ 96f13a64
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="">
<change type="DELETED" beforePath="$PROJECT_DIR$/yarn-error.log" afterPath="" />
<change type="DELETED" beforePath="$PROJECT_DIR$/yarn.lock" afterPath="" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.gitignore" afterPath="$PROJECT_DIR$/.gitignore" />
<list default="true" id="eb37985e-18dc-4e2f-82ba-9874832785ff" name="Default" comment="gitignore">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/routes/Index.js" afterPath="$PROJECT_DIR$/src/routes/Index.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/i18n.json" afterPath="$PROJECT_DIR$/i18n.json" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/models/auth.js" afterPath="$PROJECT_DIR$/src/models/auth.js" />
</list>
<ignored path="$PROJECT_DIR$/.tmp/" />
<ignored path="$PROJECT_DIR$/temp/" />
......@@ -18,58 +16,36 @@
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="DockManager">
<window id="1">
<content type="file-editors">
<state>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="i18n.json" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1399">
<caret line="78" column="21" lean-forward="true" selection-start-line="78" selection-start-column="21" selection-end-line="78" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</state>
</content>
</window>
</component>
<component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="UserNameForm.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/UserNameForm.js">
<file leaf-file-name="EmailForm.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1178">
<caret line="62" column="16" lean-forward="false" selection-start-line="62" selection-start-column="16" selection-end-line="62" selection-end-column="16" />
<state relative-caret-position="361">
<caret line="45" column="35" lean-forward="true" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding>
<element signature="e#0#35#0" expanded="true" />
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="EmailForm.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.js">
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
<state relative-caret-position="247">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name=".gitignore" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/.gitignore">
<file leaf-file-name="EmailForm.css" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="6" lean-forward="false" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
......@@ -78,85 +54,76 @@
<file leaf-file-name="auth.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="12" column="29" lean-forward="true" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
<state relative-caret-position="4161">
<caret line="222" column="9" lean-forward="true" selection-start-line="222" selection-start-column="9" selection-end-line="222" selection-end-column="9" />
<folding>
<element signature="e#0#31#0" expanded="true" />
<element signature="e#559#2707#0" expanded="false" />
<element signature="e#2720#6254#0" expanded="false" />
<element signature="e#3675#4178#0" expanded="false" />
<element signature="e#4227#4663#0" expanded="false" />
<element signature="e#4713#5139#0" expanded="false" />
<element signature="e#5191#5810#0" expanded="false" />
<element signature="e#5859#6249#0" expanded="false" />
<marker date="1491372985841" expanded="true" signature="6236:6243" ph="{...}" />
<marker date="1491448972714" expanded="true" signature="7:9" ph="..." />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubmitButton.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/SubmitButton.js">
<file leaf-file-name="common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<file leaf-file-name="upload.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/models/upload.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1609">
<caret line="11" column="13" lean-forward="true" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
<state relative-caret-position="-285">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="user.js" pinned="false" current-in-tab="false">
<file leaf-file-name="user.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/models/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="119" column="32" lean-forward="false" selection-start-line="119" selection-start-column="27" selection-end-line="119" selection-end-column="32" />
<state relative-caret-position="-453">
<caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
<folding>
<element signature="e#0#40#0" expanded="true" />
<element signature="e#307#1559#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Verify.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Verify.js">
<file leaf-file-name="SubmitButton.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/components/SubmitButton.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="2" column="0" lean-forward="false" selection-start-line="2" selection-start-column="0" selection-end-line="2" selection-end-column="56" />
<folding />
<state relative-caret-position="209">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<file leaf-file-name="Index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-396">
<caret line="35" column="47" lean-forward="false" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />
<folding />
<state relative-caret-position="2356">
<caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
<folding>
<marker date="1491382491077" expanded="true" signature="3621:3625" ph="{&quot;messages&quot;: messages...}" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="config.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/config.js">
<file leaf-file-name="Login.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="57">
<caret line="3" column="0" lean-forward="false" selection-start-line="3" selection-start-column="0" selection-end-line="3" selection-end-column="0" />
<state relative-caret-position="551">
<caret line="35" column="47" lean-forward="false" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />
<folding />
</state>
</provider>
......@@ -166,19 +133,6 @@
</component>
<component name="FindInProjectRecents">
<findStrings>
<find>d</find>
<find>dengl</find>
<find>登陆</find>
<find>Incorrect</find>
<find>i_key_invalid</find>
<find>s</find>
<find>shix</find>
<find>失效</find>
<find>失</find>
<find>验证邮件已发送</find>
<find>邮件已发送</find>
<find>Your account has been created.</find>
<find>Verify Email</find>
<find>&lt;f</find>
<find>重</find>
<find>sign-in</find>
......@@ -196,6 +150,19 @@
<find>M</find>
<find>Mo</find>
<find>Moe</find>
<find>email_exists</find>
<find>Password length must be between 8 and 24</find>
<find>Your account has been successfully activated!</find>
<find>A password reset email has been sent to you.</find>
<find>Your-account-has-been-created.</find>
<find>Your-account-has-beencreated.</find>
<find>Your-account-has-been created.</find>
<find>Your-account-hasbeen created.</find>
<find>Your-account-has been created.</find>
<find>Your-accounthas been created.</find>
<find>Your-account has been created.</find>
<find>Youraccount has been created.</find>
<find>Your account has been created.</find>
</findStrings>
<replaceStrings>
<replace>&quot;,</replace>
......@@ -221,15 +188,15 @@
<option value="$PROJECT_DIR$/src/index.js" />
<option value="$PROJECT_DIR$/src/routes/Reset.js" />
<option value="$PROJECT_DIR$/src/components/UserNameForm.js" />
<option value="$PROJECT_DIR$/src/models/auth.js" />
<option value="$PROJECT_DIR$/src/components/PasswordForm.js" />
<option value="$PROJECT_DIR$/src/models/user.js" />
<option value="$PROJECT_DIR$/src/routes/Verify.js" />
<option value="$PROJECT_DIR$/src/components/SubmitButton.js" />
<option value="$PROJECT_DIR$/i18n.json" />
<option value="$PROJECT_DIR$/src/routes/Index.js" />
<option value="$PROJECT_DIR$/src/components/EmailForm.js" />
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/src/components/EmailForm.js" />
<option value="$PROJECT_DIR$/src/models/auth.js" />
</list>
</option>
</component>
......@@ -271,6 +238,7 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane">
<subPane>
......@@ -372,7 +340,6 @@
</PATH>
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
......@@ -499,7 +466,8 @@
<workItem from="1490926971269" duration="431000" />
<workItem from="1491013749160" duration="21185000" />
<workItem from="1491038261063" duration="38000" />
<workItem from="1491362317876" duration="17083000" />
<workItem from="1491362317876" duration="18018000" />
<workItem from="1491448144293" duration="937000" />
</task>
<task id="LOCAL-00001" summary="i18n">
<created>1490948057319</created>
......@@ -557,11 +525,18 @@
<option name="project" value="LOCAL" />
<updated>1491379036839</updated>
</task>
<option name="localTasksCounter" value="9" />
<task id="LOCAL-00009" summary="gitignore">
<created>1491382308833</created>
<option name="number" value="00009" />
<option name="presentableId" value="LOCAL-00009" />
<option name="project" value="LOCAL" />
<updated>1491382308833</updated>
</task>
<option name="localTasksCounter" value="10" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="75121000" />
<option name="totallyTimeSpent" value="76993000" />
</component>
<component name="TodoView" selected-index="3">
<todo-panel id="selected-file">
......@@ -575,17 +550,17 @@
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1176" extended-state="6" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.68192774" order="0" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.6771084" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.49578503" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5021075" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32917467" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2034549" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.26679462" sideWeight="0.49789253" order="7" side_tool="false" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.3180723" order="2" side_tool="true" content_ui="tabs" />
<window_info id="npm" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25237092" sideWeight="0.32289156" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.2034549" sideWeight="0.49789253" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.6631478" sideWeight="0.49367756" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
......@@ -606,7 +581,8 @@
<MESSAGE value="i18n + 修改账户信息 无密码长度约束" />
<MESSAGE value="i18n" />
<MESSAGE value="title i18n" />
<option name="LAST_COMMIT_MESSAGE" value="title i18n" />
<MESSAGE value="gitignore" />
<option name="LAST_COMMIT_MESSAGE" value="gitignore" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
......@@ -621,13 +597,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/src/components/Example.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="475">
......@@ -644,13 +613,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/haha.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/haha.js" />
<entry file="file://$PROJECT_DIR$/src/router.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
......@@ -662,31 +625,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="2" column="33" lean-forward="false" selection-start-line="2" selection-start-column="33" selection-end-line="2" selection-end-column="33" />
<folding>
<element signature="e#0#70#0" expanded="false" />
<marker date="1491378116338" expanded="true" signature="396:5303" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="494:747" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="635:747" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="653:747" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="5140:5261" ph="&lt;Form/&gt;" />
<marker date="1491378116338" expanded="true" signature="5140:5277" ph="&lt;Spin/&gt;" />
<marker date="1491378116338" expanded="true" signature="5140:5290" ph="&lt;div/&gt;" />
<marker date="1491378116338" expanded="true" signature="5140:5301" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="3783:4300" ph="&lt;FormItem/&gt;" />
<marker date="1491378116338" expanded="true" signature="3851:4010" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4012:4075" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4094:4258" ph="&lt;Input/&gt;" />
<marker date="1491378116338" expanded="true" signature="4314:4929" ph="&lt;FormItem/&gt;" />
<marker date="1491378116338" expanded="true" signature="4381:4645" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4406:4628" ph="[...]" />
<marker date="1491378116338" expanded="true" signature="4407:4557" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4559:4627" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4664:4887" ph="&lt;Input/&gt;" />
<marker date="1491378116338" expanded="true" signature="4943:5076" ph="&lt;Button/&gt;" />
<marker date="1491378116338" expanded="true" signature="5153:5243" ph="&lt;div/&gt;" />
<marker date="1491378116338" expanded="true" signature="5337:5656" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="5523:5653" ph="{&quot;loading&quot;: loading...}" />
</folding>
<folding />
</state>
</provider>
</entry>
......@@ -711,13 +650,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/example.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/services/example.js" />
<entry file="file://$PROJECT_DIR$/src/services/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -753,13 +686,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.css" />
<entry file="file://$PROJECT_DIR$/src/routes/Profiles.less">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
......@@ -802,13 +729,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="16" lean-forward="false" selection-start-line="0" selection-start-column="9" selection-end-line="0" selection-end-column="16" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/IndexPage.js" />
<entry file="file://$PROJECT_DIR$/public/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="209">
......@@ -830,20 +751,8 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Haha.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Haha.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/Haha.css" />
<entry file="file://$PROJECT_DIR$/src/components/Haha.js" />
<entry file="file://$PROJECT_DIR$/src/routes/Activate.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="133">
......@@ -881,42 +790,11 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="627">
<caret line="38" column="17" lean-forward="false" selection-start-line="38" selection-start-column="17" selection-end-line="38" selection-end-column="17" />
<folding>
<element signature="e#0#70#0" expanded="false" />
<marker date="1491378116338" expanded="true" signature="396:5303" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="494:747" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="635:747" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="653:747" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="5140:5261" ph="&lt;Form/&gt;" />
<marker date="1491378116338" expanded="true" signature="5140:5277" ph="&lt;Spin/&gt;" />
<marker date="1491378116338" expanded="true" signature="5140:5290" ph="&lt;div/&gt;" />
<marker date="1491378116338" expanded="true" signature="5140:5301" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="3783:4300" ph="&lt;FormItem/&gt;" />
<marker date="1491378116338" expanded="true" signature="3851:4010" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4012:4075" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4094:4258" ph="&lt;Input/&gt;" />
<marker date="1491378116338" expanded="true" signature="4314:4929" ph="&lt;FormItem/&gt;" />
<marker date="1491378116338" expanded="true" signature="4381:4645" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4406:4628" ph="[...]" />
<marker date="1491378116338" expanded="true" signature="4407:4557" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4559:4627" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="4664:4887" ph="&lt;Input/&gt;" />
<marker date="1491378116338" expanded="true" signature="4943:5076" ph="&lt;Button/&gt;" />
<marker date="1491378116338" expanded="true" signature="5153:5243" ph="&lt;div/&gt;" />
<marker date="1491378116338" expanded="true" signature="5337:5656" ph="{...}" />
<marker date="1491378116338" expanded="true" signature="5523:5653" ph="{&quot;loading&quot;: loading...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/example.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/example.js" />
<entry file="file://$PROJECT_DIR$/src/routes/Reset.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1121">
......@@ -925,32 +803,7 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/upload.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-285">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding>
<element signature="e#0#48#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/haha.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="6" lean-forward="false" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/haha.js" />
<entry file="file://$PROJECT_DIR$/src/components/PasswordForm.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="142">
......@@ -966,7 +819,7 @@
<state relative-caret-position="315">
<caret line="65" column="22" lean-forward="false" selection-start-line="65" selection-start-column="22" selection-end-line="65" selection-end-column="22" />
<folding>
<element signature="e#0#70#0" expanded="true" />
<element signature="e#0#70#0" expanded="false" />
<marker date="1491378116228" expanded="true" signature="513:2340" ph="{...}" />
<marker date="1491378116228" expanded="true" signature="971:2338" ph="{...}" />
<marker date="1491378116228" expanded="true" signature="1138:2327" ph="&lt;div/&gt;" />
......@@ -990,35 +843,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="228">
<caret line="12" column="29" lean-forward="true" selection-start-line="12" selection-start-column="29" selection-end-line="12" selection-end-column="29" />
<folding>
<element signature="e#0#31#0" expanded="true" />
<element signature="e#559#2707#0" expanded="false" />
<element signature="e#2720#6254#0" expanded="false" />
<element signature="e#3675#4178#0" expanded="false" />
<element signature="e#4227#4663#0" expanded="false" />
<element signature="e#4713#5139#0" expanded="false" />
<element signature="e#5191#5810#0" expanded="false" />
<element signature="e#5859#6249#0" expanded="false" />
<marker date="1491372985841" expanded="true" signature="6236:6243" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1064">
<caret line="119" column="32" lean-forward="false" selection-start-line="119" selection-start-column="27" selection-end-line="119" selection-end-column="32" />
<folding>
<element signature="e#0#40#0" expanded="true" />
<element signature="e#307#1559#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Verify.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
......@@ -1037,7 +861,7 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Login.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-396">
<state relative-caret-position="551">
<caret line="35" column="47" lean-forward="false" selection-start-line="35" selection-start-column="47" selection-end-line="35" selection-end-column="47" />
<folding />
</state>
......@@ -1045,8 +869,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/components/SubmitButton.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="266">
<caret line="14" column="0" lean-forward="true" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<state relative-caret-position="209">
<caret line="14" column="0" lean-forward="false" selection-start-line="14" selection-start-column="0" selection-end-line="14" selection-end-column="0" />
<folding>
<element signature="e#0#30#0" expanded="true" />
</folding>
......@@ -1055,39 +879,83 @@
</entry>
<entry file="file://$PROJECT_DIR$/src/routes/Index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1609">
<caret line="11" column="13" lean-forward="true" selection-start-line="11" selection-start-column="13" selection-end-line="11" selection-end-column="13" />
<state relative-caret-position="2356">
<caret line="131" column="13" lean-forward="false" selection-start-line="131" selection-start-column="13" selection-end-line="131" selection-end-column="13" />
<folding>
<element signature="e#0#30#0" expanded="true" />
<marker date="1491382491077" expanded="true" signature="3621:3625" ph="{&quot;messages&quot;: messages...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="247">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1399">
<caret line="78" column="21" lean-forward="false" selection-start-line="78" selection-start-column="21" selection-end-line="78" selection-end-column="21" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/components/EmailForm.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="114">
<caret line="6" column="0" lean-forward="true" selection-start-line="6" selection-start-column="0" selection-end-line="6" selection-end-column="0" />
<state relative-caret-position="361">
<caret line="45" column="35" lean-forward="true" selection-start-line="45" selection-start-column="35" selection-end-line="45" selection-end-column="35" />
<folding>
<element signature="e#0#41#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/i18n.json">
<entry file="file://$PROJECT_DIR$/src/models/auth.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1399">
<caret line="78" column="21" lean-forward="true" selection-start-line="78" selection-start-column="21" selection-end-line="78" selection-end-column="21" />
<state relative-caret-position="4161">
<caret line="222" column="9" lean-forward="true" selection-start-line="222" selection-start-column="9" selection-end-line="222" selection-end-column="9" />
<folding>
<marker date="1491448972714" expanded="true" signature="7:9" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/common.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitignore">
<entry file="file://$PROJECT_DIR$/src/models/upload.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="190">
<caret line="10" column="6" lean-forward="false" selection-start-line="10" selection-start-column="6" selection-end-line="10" selection-end-column="6" />
<state relative-caret-position="-285">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/models/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-453">
<caret line="154" column="0" lean-forward="false" selection-start-line="154" selection-start-column="0" selection-end-line="154" selection-end-column="0" />
<folding>
<element signature="e#0#40#0" expanded="true" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
i18n.json
View file @ 96f13a64
......@@ -40,10 +40,10 @@
"Incorrect-password.": "Incorrect password.",
"Please-check-your-registration-info-again.": "Please check your registration info again.",
"Your-account-has-not-been-verified.": "Your account has not been verified. Please check the verification email we have sent to you. You will be able to log in after verification.",
"A password reset email has been sent to you.": "A password reset email has been sent to you. Please check the email to continue.",
"A-password-reset-email-has-been-sent-to-you.": "A password reset email has been sent to you. Please check the email to continue.",
"Your-account-has-been-created.": "Your account has been created. You will receive an verification email. Please check the mail to finish registration. ",
"Error": "Error",
"Your account has been successfully activated!": "Your account has been successfully activated!",
"Your-account-has-been-successfully-activated!": "Your account has been successfully activated!",
"close": "close",
"reset-email": "reset email",
"send-email2": "send email",
......@@ -121,10 +121,10 @@
"Incorrect-password.": "密码不正确",
"Please-check-your-registration-info-again.": "请填写正确的注册信息。",
"Your-account-has-not-been-verified.": "您的账户还未完成验证，请查看激活邮件，激活后即可登陆。",
"A password reset email has been sent to you.": "密码重置邮件已发送，请查看邮件继续下一步。",
"A-password-reset-email-has-been-sent-to-you.": "密码重置邮件已发送，请查看邮件继续下一步。",
"Your-account-has-been-created.": "您的账号已经创建。您将会收到一封验证邮件，请查看邮件完成注册。",
"Error": "出问题了",
"Your account has been successfully activated!": "账号激活成功！",
"Your-account-has-been-successfully-activated!": "账号激活成功！",
"close": "关闭",
"reset-email": "更改邮箱",
"send-email2": "重发邮件",
......
src/models/auth.js
View file @ 96f13a64
......@@ -145,7 +145,7 @@ export default {
try {
const { data } = yield call(activate, payload);
if (data) {
message.success(messages['Your account has been successfully activated!'], 5);
message.success(messages['Your-account-has-been-successfully-activated!'], 5);
}
} catch (error) {
message.error(error.message);
......@@ -202,7 +202,7 @@ export default {
const { data } = yield call(forgot, payload);
if (data) {
yield put({ type: 'forgotSuccess' });
message.info(messages['A password reset email has been sent to you.'], 5);
message.info(messages['A-password-reset-email-has-been-sent-to-you.'], 5);
}
} catch (error) {
yield put({ type: 'forgotFail' });
......@@ -218,7 +218,7 @@ export default {
yield put({ type: 'user/loginSuccess', payload: { data } });
yield put({ type: 'loginSuccess', payload: { input: payload } });
message.info(messages['Your account has been created.'], 5);
message.info(messages['Your-account-has-been-created.'], 5);
yield put(routerRedux.replace('/verify'));
}
} catch (error) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment