aboutsummaryrefslogtreecommitdiff
path: root/Timeline/Resources/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'Timeline/Resources/Controllers')
-rw-r--r--Timeline/Resources/Controllers/TimelineController.Designer.cs54
-rw-r--r--Timeline/Resources/Controllers/TimelineController.resx18
-rw-r--r--Timeline/Resources/Controllers/TimelineController.zh.resx138
-rw-r--r--Timeline/Resources/Controllers/TokenController.Designer.cs45
-rw-r--r--Timeline/Resources/Controllers/TokenController.resx15
-rw-r--r--Timeline/Resources/Controllers/TokenController.zh.resx135
-rw-r--r--Timeline/Resources/Controllers/UserAvatarController.Designer.cs72
-rw-r--r--Timeline/Resources/Controllers/UserAvatarController.resx24
-rw-r--r--Timeline/Resources/Controllers/UserAvatarController.zh.resx144
-rw-r--r--Timeline/Resources/Controllers/UserController.Designer.cs118
-rw-r--r--Timeline/Resources/Controllers/UserController.resx42
-rw-r--r--Timeline/Resources/Controllers/UserController.zh.resx138
12 files changed, 8 insertions, 935 deletions
diff --git a/Timeline/Resources/Controllers/TimelineController.Designer.cs b/Timeline/Resources/Controllers/TimelineController.Designer.cs
index 47c43fa2..ae6414e6 100644
--- a/Timeline/Resources/Controllers/TimelineController.Designer.cs
+++ b/Timeline/Resources/Controllers/TimelineController.Designer.cs
@@ -77,59 +77,5 @@ namespace Timeline.Resources.Controllers {
return ResourceManager.GetString("LogUnknownTimelineMemberOperationUserException", resourceCulture);
}
}
-
- /// <summary>
- /// Looks up a localized string similar to The {0}-st username to do operation {1} on is of bad format..
- /// </summary>
- internal static string MessageMemberUsernameBadFormat {
- get {
- return ResourceManager.GetString("MessageMemberUsernameBadFormat", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The {0}-st user to do operation {1} on does not exist..
- /// </summary>
- internal static string MessageMemberUserNotExist {
- get {
- return ResourceManager.GetString("MessageMemberUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to You have no permission to read posts of the timeline..
- /// </summary>
- internal static string MessagePostListGetForbid {
- get {
- return ResourceManager.GetString("MessagePostListGetForbid", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to You have no permission to create posts in the timeline..
- /// </summary>
- internal static string MessagePostOperationCreateForbid {
- get {
- return ResourceManager.GetString("MessagePostOperationCreateForbid", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to You have no permission to delete posts in the timeline..
- /// </summary>
- internal static string MessagePostOperationDeleteForbid {
- get {
- return ResourceManager.GetString("MessagePostOperationDeleteForbid", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The post to delete does not exist..
- /// </summary>
- internal static string MessagePostOperationDeleteNotExist {
- get {
- return ResourceManager.GetString("MessagePostOperationDeleteNotExist", resourceCulture);
- }
- }
}
}
diff --git a/Timeline/Resources/Controllers/TimelineController.resx b/Timeline/Resources/Controllers/TimelineController.resx
index 0cf7e881..4cf3d6fb 100644
--- a/Timeline/Resources/Controllers/TimelineController.resx
+++ b/Timeline/Resources/Controllers/TimelineController.resx
@@ -123,22 +123,4 @@
<data name="LogUnknownTimelineMemberOperationUserException" xml:space="preserve">
<value>An unknown TimelineMemberOperationUserException is thrown. Can't recognize its inner exception. It is rethrown.</value>
</data>
- <data name="MessageMemberUsernameBadFormat" xml:space="preserve">
- <value>The {0}-st username to do operation {1} on is of bad format.</value>
- </data>
- <data name="MessageMemberUserNotExist" xml:space="preserve">
- <value>The {0}-st user to do operation {1} on does not exist.</value>
- </data>
- <data name="MessagePostListGetForbid" xml:space="preserve">
- <value>You have no permission to read posts of the timeline.</value>
- </data>
- <data name="MessagePostOperationCreateForbid" xml:space="preserve">
- <value>You have no permission to create posts in the timeline.</value>
- </data>
- <data name="MessagePostOperationDeleteForbid" xml:space="preserve">
- <value>You have no permission to delete posts in the timeline.</value>
- </data>
- <data name="MessagePostOperationDeleteNotExist" xml:space="preserve">
- <value>The post to delete does not exist.</value>
- </data>
</root> \ No newline at end of file
diff --git a/Timeline/Resources/Controllers/TimelineController.zh.resx b/Timeline/Resources/Controllers/TimelineController.zh.resx
deleted file mode 100644
index 170ab4cd..00000000
--- a/Timeline/Resources/Controllers/TimelineController.zh.resx
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="MessageMemberUsernameBadFormat" xml:space="preserve">
- <value>第{0}个做{1}操作的用户名格式错误。</value>
- </data>
- <data name="MessageMemberUserNotExist" xml:space="preserve">
- <value>第{0}个做{1}操作的用户不存在。</value>
- </data>
- <data name="MessagePostListGetForbid" xml:space="preserve">
- <value>你没有权限读取这个时间线消息。</value>
- </data>
- <data name="MessagePostOperationCreateForbid" xml:space="preserve">
- <value>你没有权限在这个时间线中创建消息。</value>
- </data>
- <data name="MessagePostOperationDeleteForbid" xml:space="preserve">
- <value>你没有权限在这个时间线中删除消息。</value>
- </data>
- <data name="MessagePostOperationDeleteNotExist" xml:space="preserve">
- <value>要删除的消息不存在。</value>
- </data>
-</root> \ No newline at end of file
diff --git a/Timeline/Resources/Controllers/TokenController.Designer.cs b/Timeline/Resources/Controllers/TokenController.Designer.cs
index 22e6a8be..a7c2864b 100644
--- a/Timeline/Resources/Controllers/TokenController.Designer.cs
+++ b/Timeline/Resources/Controllers/TokenController.Designer.cs
@@ -61,51 +61,6 @@ namespace Timeline.Resources.Controllers {
}
/// <summary>
- /// Looks up a localized string similar to Username or password is invalid..
- /// </summary>
- internal static string ErrorBadCredential {
- get {
- return ResourceManager.GetString("ErrorBadCredential", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The token is of bad format. It might not be created by the server..
- /// </summary>
- internal static string ErrorVerifyBadFormat {
- get {
- return ResourceManager.GetString("ErrorVerifyBadFormat", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The token is expired..
- /// </summary>
- internal static string ErrorVerifyExpire {
- get {
- return ResourceManager.GetString("ErrorVerifyExpire", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Token has an old version. User might have update some info..
- /// </summary>
- internal static string ErrorVerifyOldVersion {
- get {
- return ResourceManager.GetString("ErrorVerifyOldVersion", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to User does not exist. Administrator might have deleted this user..
- /// </summary>
- internal static string ErrorVerifyUserNotExist {
- get {
- return ResourceManager.GetString("ErrorVerifyUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to The password is wrong..
/// </summary>
internal static string LogBadPassword {
diff --git a/Timeline/Resources/Controllers/TokenController.resx b/Timeline/Resources/Controllers/TokenController.resx
index 42e1ff92..683d6cc9 100644
--- a/Timeline/Resources/Controllers/TokenController.resx
+++ b/Timeline/Resources/Controllers/TokenController.resx
@@ -117,21 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="ErrorBadCredential" xml:space="preserve">
- <value>Username or password is invalid.</value>
- </data>
- <data name="ErrorVerifyBadFormat" xml:space="preserve">
- <value>The token is of bad format. It might not be created by the server.</value>
- </data>
- <data name="ErrorVerifyExpire" xml:space="preserve">
- <value>The token is expired.</value>
- </data>
- <data name="ErrorVerifyOldVersion" xml:space="preserve">
- <value>Token has an old version. User might have update some info.</value>
- </data>
- <data name="ErrorVerifyUserNotExist" xml:space="preserve">
- <value>User does not exist. Administrator might have deleted this user.</value>
- </data>
<data name="LogBadPassword" xml:space="preserve">
<value>The password is wrong.</value>
</data>
diff --git a/Timeline/Resources/Controllers/TokenController.zh.resx b/Timeline/Resources/Controllers/TokenController.zh.resx
deleted file mode 100644
index 51e0f25b..00000000
--- a/Timeline/Resources/Controllers/TokenController.zh.resx
+++ /dev/null
@@ -1,135 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="ErrorBadCredential" xml:space="preserve">
- <value>用户名或密码错误。</value>
- </data>
- <data name="ErrorVerifyBadFormat" xml:space="preserve">
- <value>符号格式错误。这个符号可能不是这个服务器创建的。</value>
- </data>
- <data name="ErrorVerifyExpire" xml:space="preserve">
- <value>符号过期了。</value>
- </data>
- <data name="ErrorVerifyOldVersion" xml:space="preserve">
- <value>符号是一个旧版本。用户可能已经更新了信息。</value>
- </data>
- <data name="ErrorVerifyUserNotExist" xml:space="preserve">
- <value>用户不存在。管理员可能已经删除了这个用户。</value>
- </data>
-</root> \ No newline at end of file
diff --git a/Timeline/Resources/Controllers/UserAvatarController.Designer.cs b/Timeline/Resources/Controllers/UserAvatarController.Designer.cs
index 1dacb19f..e6eeb1e8 100644
--- a/Timeline/Resources/Controllers/UserAvatarController.Designer.cs
+++ b/Timeline/Resources/Controllers/UserAvatarController.Designer.cs
@@ -61,78 +61,6 @@ namespace Timeline.Resources.Controllers {
}
/// <summary>
- /// Looks up a localized string similar to Normal user can&apos;t delete other&apos;s avatar..
- /// </summary>
- internal static string ErrorDeleteForbid {
- get {
- return ResourceManager.GetString("ErrorDeleteForbid", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to User does not exist..
- /// </summary>
- internal static string ErrorDeleteUserNotExist {
- get {
- return ResourceManager.GetString("ErrorDeleteUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to User does not exist..
- /// </summary>
- internal static string ErrorGetUserNotExist {
- get {
- return ResourceManager.GetString("ErrorGetUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Image is not a square..
- /// </summary>
- internal static string ErrorPutBadFormatBadSize {
- get {
- return ResourceManager.GetString("ErrorPutBadFormatBadSize", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Decoding image failed..
- /// </summary>
- internal static string ErrorPutBadFormatCantDecode {
- get {
- return ResourceManager.GetString("ErrorPutBadFormatCantDecode", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Image format is not the one in header..
- /// </summary>
- internal static string ErrorPutBadFormatUnmatchedFormat {
- get {
- return ResourceManager.GetString("ErrorPutBadFormatUnmatchedFormat", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Normal user can&apos;t change other&apos;s avatar..
- /// </summary>
- internal static string ErrorPutForbid {
- get {
- return ResourceManager.GetString("ErrorPutForbid", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to User does not exist..
- /// </summary>
- internal static string ErrorPutUserNotExist {
- get {
- return ResourceManager.GetString("ErrorPutUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to Unknown AvatarDataException.ErrorReason value..
/// </summary>
internal static string ExceptionUnknownAvatarFormatError {
diff --git a/Timeline/Resources/Controllers/UserAvatarController.resx b/Timeline/Resources/Controllers/UserAvatarController.resx
index 3f444b04..58860c83 100644
--- a/Timeline/Resources/Controllers/UserAvatarController.resx
+++ b/Timeline/Resources/Controllers/UserAvatarController.resx
@@ -117,30 +117,6 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="ErrorDeleteForbid" xml:space="preserve">
- <value>Normal user can't delete other's avatar.</value>
- </data>
- <data name="ErrorDeleteUserNotExist" xml:space="preserve">
- <value>User does not exist.</value>
- </data>
- <data name="ErrorGetUserNotExist" xml:space="preserve">
- <value>User does not exist.</value>
- </data>
- <data name="ErrorPutBadFormatBadSize" xml:space="preserve">
- <value>Image is not a square.</value>
- </data>
- <data name="ErrorPutBadFormatCantDecode" xml:space="preserve">
- <value>Decoding image failed.</value>
- </data>
- <data name="ErrorPutBadFormatUnmatchedFormat" xml:space="preserve">
- <value>Image format is not the one in header.</value>
- </data>
- <data name="ErrorPutForbid" xml:space="preserve">
- <value>Normal user can't change other's avatar.</value>
- </data>
- <data name="ErrorPutUserNotExist" xml:space="preserve">
- <value>User does not exist.</value>
- </data>
<data name="ExceptionUnknownAvatarFormatError" xml:space="preserve">
<value>Unknown AvatarDataException.ErrorReason value.</value>
</data>
diff --git a/Timeline/Resources/Controllers/UserAvatarController.zh.resx b/Timeline/Resources/Controllers/UserAvatarController.zh.resx
deleted file mode 100644
index 94de1606..00000000
--- a/Timeline/Resources/Controllers/UserAvatarController.zh.resx
+++ /dev/null
@@ -1,144 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="ErrorDeleteForbid" xml:space="preserve">
- <value>普通用户不能删除其他用户的头像。</value>
- </data>
- <data name="ErrorDeleteUserNotExist" xml:space="preserve">
- <value>用户不存在。</value>
- </data>
- <data name="ErrorGetUserNotExist" xml:space="preserve">
- <value>用户不存在。</value>
- </data>
- <data name="ErrorPutBadFormatBadSize" xml:space="preserve">
- <value>图片不是正方形。</value>
- </data>
- <data name="ErrorPutBadFormatCantDecode" xml:space="preserve">
- <value>解码图片失败。</value>
- </data>
- <data name="ErrorPutBadFormatUnmatchedFormat" xml:space="preserve">
- <value>图片格式与请求头中指示的不一样。</value>
- </data>
- <data name="ErrorPutForbid" xml:space="preserve">
- <value>普通用户不能修改其他用户的头像。</value>
- </data>
- <data name="ErrorPutUserNotExist" xml:space="preserve">
- <value>用户不存在。</value>
- </data>
-</root> \ No newline at end of file
diff --git a/Timeline/Resources/Controllers/UserController.Designer.cs b/Timeline/Resources/Controllers/UserController.Designer.cs
index 0c9ac0d7..c8067614 100644
--- a/Timeline/Resources/Controllers/UserController.Designer.cs
+++ b/Timeline/Resources/Controllers/UserController.Designer.cs
@@ -61,56 +61,11 @@ namespace Timeline.Resources.Controllers {
}
/// <summary>
- /// Looks up a localized string similar to Old password is wrong..
+ /// Looks up a localized string similar to Unknown PutResult..
/// </summary>
- internal static string ErrorChangePasswordBadPassword {
+ internal static string ExceptionUnknownPutResult {
get {
- return ResourceManager.GetString("ErrorChangePasswordBadPassword", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The new username {0} already exists..
- /// </summary>
- internal static string ErrorChangeUsernameAlreadyExist {
- get {
- return ResourceManager.GetString("ErrorChangeUsernameAlreadyExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The old username {0} does not exist..
- /// </summary>
- internal static string ErrorChangeUsernameNotExist {
- get {
- return ResourceManager.GetString("ErrorChangeUsernameNotExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to The user does not exist..
- /// </summary>
- internal static string ErrorGetUserNotExist {
- get {
- return ResourceManager.GetString("ErrorGetUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Can&apos;t patch a user that does not exist..
- /// </summary>
- internal static string ErrorPatchUserNotExist {
- get {
- return ResourceManager.GetString("ErrorPatchUserNotExist", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Username is of bad format..
- /// </summary>
- internal static string ErrorPutBadUsername {
- get {
- return ResourceManager.GetString("ErrorPutBadUsername", resourceCulture);
+ return ResourceManager.GetString("ExceptionUnknownPutResult", resourceCulture);
}
}
@@ -124,20 +79,11 @@ namespace Timeline.Resources.Controllers {
}
/// <summary>
- /// Looks up a localized string similar to A user has changed password..
- /// </summary>
- internal static string LogChangePasswordSuccess {
- get {
- return ResourceManager.GetString("LogChangePasswordSuccess", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to Attempt to change a user&apos;s username to a existent one failed..
/// </summary>
- internal static string LogChangeUsernameAlreadyExist {
+ internal static string LogChangeUsernameConflict {
get {
- return ResourceManager.GetString("LogChangeUsernameAlreadyExist", resourceCulture);
+ return ResourceManager.GetString("LogChangeUsernameConflict", resourceCulture);
}
}
@@ -151,33 +97,6 @@ namespace Timeline.Resources.Controllers {
}
/// <summary>
- /// Looks up a localized string similar to A user has changed username..
- /// </summary>
- internal static string LogChangeUsernameSuccess {
- get {
- return ResourceManager.GetString("LogChangeUsernameSuccess", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to A user has been deleted..
- /// </summary>
- internal static string LogDeleteDelete {
- get {
- return ResourceManager.GetString("LogDeleteDelete", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to Attempt to delete a user that does not exist..
- /// </summary>
- internal static string LogDeleteNotExist {
- get {
- return ResourceManager.GetString("LogDeleteNotExist", resourceCulture);
- }
- }
-
- /// <summary>
/// Looks up a localized string similar to Attempt to retrieve info of a user that does not exist failed..
/// </summary>
internal static string LogGetUserNotExist {
@@ -194,32 +113,5 @@ namespace Timeline.Resources.Controllers {
return ResourceManager.GetString("LogPatchUserNotExist", resourceCulture);
}
}
-
- /// <summary>
- /// Looks up a localized string similar to Attempt to create a user with bad username failed..
- /// </summary>
- internal static string LogPutBadUsername {
- get {
- return ResourceManager.GetString("LogPutBadUsername", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to A user has been created..
- /// </summary>
- internal static string LogPutCreate {
- get {
- return ResourceManager.GetString("LogPutCreate", resourceCulture);
- }
- }
-
- /// <summary>
- /// Looks up a localized string similar to A user has been modified..
- /// </summary>
- internal static string LogPutModify {
- get {
- return ResourceManager.GetString("LogPutModify", resourceCulture);
- }
- }
}
}
diff --git a/Timeline/Resources/Controllers/UserController.resx b/Timeline/Resources/Controllers/UserController.resx
index 50aa13d6..0bdf4845 100644
--- a/Timeline/Resources/Controllers/UserController.resx
+++ b/Timeline/Resources/Controllers/UserController.resx
@@ -117,58 +117,22 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
- <data name="ErrorChangePasswordBadPassword" xml:space="preserve">
- <value>Old password is wrong.</value>
- </data>
- <data name="ErrorChangeUsernameAlreadyExist" xml:space="preserve">
- <value>The new username {0} already exists.</value>
- </data>
- <data name="ErrorChangeUsernameNotExist" xml:space="preserve">
- <value>The old username {0} does not exist.</value>
- </data>
- <data name="ErrorGetUserNotExist" xml:space="preserve">
- <value>The user does not exist.</value>
- </data>
- <data name="ErrorPatchUserNotExist" xml:space="preserve">
- <value>Can't patch a user that does not exist.</value>
- </data>
- <data name="ErrorPutBadUsername" xml:space="preserve">
- <value>Username is of bad format.</value>
+ <data name="ExceptionUnknownPutResult" xml:space="preserve">
+ <value>Unknown PutResult.</value>
</data>
<data name="LogChangePasswordBadPassword" xml:space="preserve">
<value>Attempt to change password with wrong old password failed.</value>
</data>
- <data name="LogChangePasswordSuccess" xml:space="preserve">
- <value>A user has changed password.</value>
- </data>
- <data name="LogChangeUsernameAlreadyExist" xml:space="preserve">
+ <data name="LogChangeUsernameConflict" xml:space="preserve">
<value>Attempt to change a user's username to a existent one failed.</value>
</data>
<data name="LogChangeUsernameNotExist" xml:space="preserve">
<value>Attempt to change a username of a user that does not exist failed.</value>
</data>
- <data name="LogChangeUsernameSuccess" xml:space="preserve">
- <value>A user has changed username.</value>
- </data>
- <data name="LogDeleteDelete" xml:space="preserve">
- <value>A user has been deleted.</value>
- </data>
- <data name="LogDeleteNotExist" xml:space="preserve">
- <value>Attempt to delete a user that does not exist.</value>
- </data>
<data name="LogGetUserNotExist" xml:space="preserve">
<value>Attempt to retrieve info of a user that does not exist failed.</value>
</data>
<data name="LogPatchUserNotExist" xml:space="preserve">
<value>Attempt to patch a user that does not exist failed.</value>
</data>
- <data name="LogPutBadUsername" xml:space="preserve">
- <value>Attempt to create a user with bad username failed.</value>
- </data>
- <data name="LogPutCreate" xml:space="preserve">
- <value>A user has been created.</value>
- </data>
- <data name="LogPutModify" xml:space="preserve">
- <value>A user has been modified.</value>
- </data>
</root> \ No newline at end of file
diff --git a/Timeline/Resources/Controllers/UserController.zh.resx b/Timeline/Resources/Controllers/UserController.zh.resx
deleted file mode 100644
index 3556083e..00000000
--- a/Timeline/Resources/Controllers/UserController.zh.resx
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
- <!--
- Microsoft ResX Schema
-
- Version 2.0
-
- The primary goals of this format is to allow a simple XML format
- that is mostly human readable. The generation and parsing of the
- various data types are done through the TypeConverter classes
- associated with the data types.
-
- Example:
-
- ... ado.net/XML headers & schema ...
- <resheader name="resmimetype">text/microsoft-resx</resheader>
- <resheader name="version">2.0</resheader>
- <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
- <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
- <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
- <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
- <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
- <value>[base64 mime encoded serialized .NET Framework object]</value>
- </data>
- <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
- <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
- <comment>This is a comment</comment>
- </data>
-
- There are any number of "resheader" rows that contain simple
- name/value pairs.
-
- Each data row contains a name, and value. The row also contains a
- type or mimetype. Type corresponds to a .NET class that support
- text/value conversion through the TypeConverter architecture.
- Classes that don't support this are serialized and stored with the
- mimetype set.
-
- The mimetype is used for serialized objects, and tells the
- ResXResourceReader how to depersist the object. This is currently not
- extensible. For a given mimetype the value must be set accordingly:
-
- Note - application/x-microsoft.net.object.binary.base64 is the format
- that the ResXResourceWriter will generate, however the reader can
- read any of the formats listed below.
-
- mimetype: application/x-microsoft.net.object.binary.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.soap.base64
- value : The object must be serialized with
- : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
- : and then encoded with base64 encoding.
-
- mimetype: application/x-microsoft.net.object.bytearray.base64
- value : The object must be serialized into a byte array
- : using a System.ComponentModel.TypeConverter
- : and then encoded with base64 encoding.
- -->
- <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
- <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
- <xsd:element name="root" msdata:IsDataSet="true">
- <xsd:complexType>
- <xsd:choice maxOccurs="unbounded">
- <xsd:element name="metadata">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" />
- </xsd:sequence>
- <xsd:attribute name="name" use="required" type="xsd:string" />
- <xsd:attribute name="type" type="xsd:string" />
- <xsd:attribute name="mimetype" type="xsd:string" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="assembly">
- <xsd:complexType>
- <xsd:attribute name="alias" type="xsd:string" />
- <xsd:attribute name="name" type="xsd:string" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="data">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
- <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
- <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
- <xsd:attribute ref="xml:space" />
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="resheader">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
- </xsd:sequence>
- <xsd:attribute name="name" type="xsd:string" use="required" />
- </xsd:complexType>
- </xsd:element>
- </xsd:choice>
- </xsd:complexType>
- </xsd:element>
- </xsd:schema>
- <resheader name="resmimetype">
- <value>text/microsoft-resx</value>
- </resheader>
- <resheader name="version">
- <value>2.0</value>
- </resheader>
- <resheader name="reader">
- <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <resheader name="writer">
- <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
- </resheader>
- <data name="ErrorChangePasswordBadPassword" xml:space="preserve">
- <value>旧密码错误。</value>
- </data>
- <data name="ErrorChangeUsernameAlreadyExist" xml:space="preserve">
- <value>新用户名{0}已经存在。</value>
- </data>
- <data name="ErrorChangeUsernameNotExist" xml:space="preserve">
- <value>旧用户名{0}不存在。</value>
- </data>
- <data name="ErrorGetUserNotExist" xml:space="preserve">
- <value>用户不存在。</value>
- </data>
- <data name="ErrorPatchUserNotExist" xml:space="preserve">
- <value>不能修改一个不存在的用户。</value>
- </data>
- <data name="ErrorPutBadUsername" xml:space="preserve">
- <value>用户名格式错误。</value>
- </data>
-</root> \ No newline at end of file