From 4ec507df6251bc1dae5204fdc6aaf14ddbb268f6 Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 18 Jan 2020 00:50:31 +0800 Subject: ... --- .../Controllers/TimelineController.Designer.cs | 54 -------- .../Resources/Controllers/TimelineController.resx | 18 --- .../Controllers/TimelineController.zh.resx | 138 -------------------- .../Controllers/TokenController.Designer.cs | 45 ------- .../Resources/Controllers/TokenController.resx | 15 --- .../Resources/Controllers/TokenController.zh.resx | 135 ------------------- .../Controllers/UserAvatarController.Designer.cs | 72 ----------- .../Controllers/UserAvatarController.resx | 24 ---- .../Controllers/UserAvatarController.zh.resx | 144 --------------------- .../Controllers/UserController.Designer.cs | 118 +---------------- Timeline/Resources/Controllers/UserController.resx | 42 +----- .../Resources/Controllers/UserController.zh.resx | 138 -------------------- 12 files changed, 8 insertions(+), 935 deletions(-) delete mode 100644 Timeline/Resources/Controllers/TimelineController.zh.resx delete mode 100644 Timeline/Resources/Controllers/TokenController.zh.resx delete mode 100644 Timeline/Resources/Controllers/UserAvatarController.zh.resx delete mode 100644 Timeline/Resources/Controllers/UserController.zh.resx (limited to 'Timeline/Resources/Controllers') 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); } } - - /// - /// Looks up a localized string similar to The {0}-st username to do operation {1} on is of bad format.. - /// - internal static string MessageMemberUsernameBadFormat { - get { - return ResourceManager.GetString("MessageMemberUsernameBadFormat", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The {0}-st user to do operation {1} on does not exist.. - /// - internal static string MessageMemberUserNotExist { - get { - return ResourceManager.GetString("MessageMemberUserNotExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You have no permission to read posts of the timeline.. - /// - internal static string MessagePostListGetForbid { - get { - return ResourceManager.GetString("MessagePostListGetForbid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You have no permission to create posts in the timeline.. - /// - internal static string MessagePostOperationCreateForbid { - get { - return ResourceManager.GetString("MessagePostOperationCreateForbid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to You have no permission to delete posts in the timeline.. - /// - internal static string MessagePostOperationDeleteForbid { - get { - return ResourceManager.GetString("MessagePostOperationDeleteForbid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The post to delete does not exist.. - /// - 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 @@ An unknown TimelineMemberOperationUserException is thrown. Can't recognize its inner exception. It is rethrown. - - The {0}-st username to do operation {1} on is of bad format. - - - The {0}-st user to do operation {1} on does not exist. - - - You have no permission to read posts of the timeline. - - - You have no permission to create posts in the timeline. - - - You have no permission to delete posts in the timeline. - - - The post to delete does not exist. - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 第{0}个做{1}操作的用户名格式错误。 - - - 第{0}个做{1}操作的用户不存在。 - - - 你没有权限读取这个时间线消息。 - - - 你没有权限在这个时间线中创建消息。 - - - 你没有权限在这个时间线中删除消息。 - - - 要删除的消息不存在。 - - \ 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 @@ -60,51 +60,6 @@ namespace Timeline.Resources.Controllers { } } - /// - /// Looks up a localized string similar to Username or password is invalid.. - /// - internal static string ErrorBadCredential { - get { - return ResourceManager.GetString("ErrorBadCredential", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The token is of bad format. It might not be created by the server.. - /// - internal static string ErrorVerifyBadFormat { - get { - return ResourceManager.GetString("ErrorVerifyBadFormat", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The token is expired.. - /// - internal static string ErrorVerifyExpire { - get { - return ResourceManager.GetString("ErrorVerifyExpire", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Token has an old version. User might have update some info.. - /// - internal static string ErrorVerifyOldVersion { - get { - return ResourceManager.GetString("ErrorVerifyOldVersion", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to User does not exist. Administrator might have deleted this user.. - /// - internal static string ErrorVerifyUserNotExist { - get { - return ResourceManager.GetString("ErrorVerifyUserNotExist", resourceCulture); - } - } - /// /// Looks up a localized string similar to The password is wrong.. /// 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 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Username or password is invalid. - - - The token is of bad format. It might not be created by the server. - - - The token is expired. - - - Token has an old version. User might have update some info. - - - User does not exist. Administrator might have deleted this user. - The password is wrong. 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 用户名或密码错误。 - - - 符号格式错误。这个符号可能不是这个服务器创建的。 - - - 符号过期了。 - - - 符号是一个旧版本。用户可能已经更新了信息。 - - - 用户不存在。管理员可能已经删除了这个用户。 - - \ 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 @@ -60,78 +60,6 @@ namespace Timeline.Resources.Controllers { } } - /// - /// Looks up a localized string similar to Normal user can't delete other's avatar.. - /// - internal static string ErrorDeleteForbid { - get { - return ResourceManager.GetString("ErrorDeleteForbid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to User does not exist.. - /// - internal static string ErrorDeleteUserNotExist { - get { - return ResourceManager.GetString("ErrorDeleteUserNotExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to User does not exist.. - /// - internal static string ErrorGetUserNotExist { - get { - return ResourceManager.GetString("ErrorGetUserNotExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Image is not a square.. - /// - internal static string ErrorPutBadFormatBadSize { - get { - return ResourceManager.GetString("ErrorPutBadFormatBadSize", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Decoding image failed.. - /// - internal static string ErrorPutBadFormatCantDecode { - get { - return ResourceManager.GetString("ErrorPutBadFormatCantDecode", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Image format is not the one in header.. - /// - internal static string ErrorPutBadFormatUnmatchedFormat { - get { - return ResourceManager.GetString("ErrorPutBadFormatUnmatchedFormat", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Normal user can't change other's avatar.. - /// - internal static string ErrorPutForbid { - get { - return ResourceManager.GetString("ErrorPutForbid", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to User does not exist.. - /// - internal static string ErrorPutUserNotExist { - get { - return ResourceManager.GetString("ErrorPutUserNotExist", resourceCulture); - } - } - /// /// Looks up a localized string similar to Unknown AvatarDataException.ErrorReason value.. /// 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 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Normal user can't delete other's avatar. - - - User does not exist. - - - User does not exist. - - - Image is not a square. - - - Decoding image failed. - - - Image format is not the one in header. - - - Normal user can't change other's avatar. - - - User does not exist. - Unknown AvatarDataException.ErrorReason value. 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 普通用户不能删除其他用户的头像。 - - - 用户不存在。 - - - 用户不存在。 - - - 图片不是正方形。 - - - 解码图片失败。 - - - 图片格式与请求头中指示的不一样。 - - - 普通用户不能修改其他用户的头像。 - - - 用户不存在。 - - \ 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 { } /// - /// Looks up a localized string similar to Old password is wrong.. + /// Looks up a localized string similar to Unknown PutResult.. /// - internal static string ErrorChangePasswordBadPassword { + internal static string ExceptionUnknownPutResult { get { - return ResourceManager.GetString("ErrorChangePasswordBadPassword", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The new username {0} already exists.. - /// - internal static string ErrorChangeUsernameAlreadyExist { - get { - return ResourceManager.GetString("ErrorChangeUsernameAlreadyExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The old username {0} does not exist.. - /// - internal static string ErrorChangeUsernameNotExist { - get { - return ResourceManager.GetString("ErrorChangeUsernameNotExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to The user does not exist.. - /// - internal static string ErrorGetUserNotExist { - get { - return ResourceManager.GetString("ErrorGetUserNotExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Can't patch a user that does not exist.. - /// - internal static string ErrorPatchUserNotExist { - get { - return ResourceManager.GetString("ErrorPatchUserNotExist", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Username is of bad format.. - /// - internal static string ErrorPutBadUsername { - get { - return ResourceManager.GetString("ErrorPutBadUsername", resourceCulture); + return ResourceManager.GetString("ExceptionUnknownPutResult", resourceCulture); } } @@ -123,21 +78,12 @@ namespace Timeline.Resources.Controllers { } } - /// - /// Looks up a localized string similar to A user has changed password.. - /// - internal static string LogChangePasswordSuccess { - get { - return ResourceManager.GetString("LogChangePasswordSuccess", resourceCulture); - } - } - /// /// Looks up a localized string similar to Attempt to change a user's username to a existent one failed.. /// - internal static string LogChangeUsernameAlreadyExist { + internal static string LogChangeUsernameConflict { get { - return ResourceManager.GetString("LogChangeUsernameAlreadyExist", resourceCulture); + return ResourceManager.GetString("LogChangeUsernameConflict", resourceCulture); } } @@ -150,33 +96,6 @@ namespace Timeline.Resources.Controllers { } } - /// - /// Looks up a localized string similar to A user has changed username.. - /// - internal static string LogChangeUsernameSuccess { - get { - return ResourceManager.GetString("LogChangeUsernameSuccess", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to A user has been deleted.. - /// - internal static string LogDeleteDelete { - get { - return ResourceManager.GetString("LogDeleteDelete", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Attempt to delete a user that does not exist.. - /// - internal static string LogDeleteNotExist { - get { - return ResourceManager.GetString("LogDeleteNotExist", resourceCulture); - } - } - /// /// Looks up a localized string similar to Attempt to retrieve info of a user that does not exist failed.. /// @@ -194,32 +113,5 @@ namespace Timeline.Resources.Controllers { return ResourceManager.GetString("LogPatchUserNotExist", resourceCulture); } } - - /// - /// Looks up a localized string similar to Attempt to create a user with bad username failed.. - /// - internal static string LogPutBadUsername { - get { - return ResourceManager.GetString("LogPutBadUsername", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to A user has been created.. - /// - internal static string LogPutCreate { - get { - return ResourceManager.GetString("LogPutCreate", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to A user has been modified.. - /// - 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 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Old password is wrong. - - - The new username {0} already exists. - - - The old username {0} does not exist. - - - The user does not exist. - - - Can't patch a user that does not exist. - - - Username is of bad format. + + Unknown PutResult. Attempt to change password with wrong old password failed. - - A user has changed password. - - + Attempt to change a user's username to a existent one failed. Attempt to change a username of a user that does not exist failed. - - A user has changed username. - - - A user has been deleted. - - - Attempt to delete a user that does not exist. - Attempt to retrieve info of a user that does not exist failed. Attempt to patch a user that does not exist failed. - - Attempt to create a user with bad username failed. - - - A user has been created. - - - A user has been modified. - \ 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 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - text/microsoft-resx - - - 2.0 - - - System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 旧密码错误。 - - - 新用户名{0}已经存在。 - - - 旧用户名{0}不存在。 - - - 用户不存在。 - - - 不能修改一个不存在的用户。 - - - 用户名格式错误。 - - \ No newline at end of file -- cgit v1.2.3