Merge pull request #57 from crupest/dev

Add normal timeline feature.

6 files changed, 42 insertions, 30 deletions

diff --git a/Timeline/Resources/Messages.Designer.cs b/Timeline/Resources/Messages.Designer.cs
index 332c8817..eeb44f10 100644
--- a/Timeline/Resources/Messages.Designer.cs
+++ b/Timeline/Resources/Messages.Designer.cs
@@ -151,38 +151,29 @@ namespace Timeline.Resources {
         }

         

         /// <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 TimelineController_ChangeMember_UsernameBadFormat {

-            get {

-                return ResourceManager.GetString("TimelineController_ChangeMember_UsernameBadFormat", resourceCulture);

-            }

-        }

-        

-        /// <summary>

-        ///   Looks up a localized string similar to The {0}-st user to do operation {1} on does not exist..

+        ///   Looks up a localized string similar to The user to set as member does not exist..

         /// </summary>

-        internal static string TimelineController_ChangeMember_UserNotExist {

+        internal static string TimelineCommon_MemberPut_NotExist {

             get {

-                return ResourceManager.GetString("TimelineController_ChangeMember_UserNotExist", resourceCulture);

+                return ResourceManager.GetString("TimelineCommon_MemberPut_NotExist", resourceCulture);

             }

         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The user to set as member does not exist..

+        ///   Looks up a localized string similar to A timeline with given name already exists..

         /// </summary>

-        internal static string TimelineController_MemberPut_NotExist {

+        internal static string TimelineCommon_NameConflict {

             get {

-                return ResourceManager.GetString("TimelineController_MemberPut_NotExist", resourceCulture);

+                return ResourceManager.GetString("TimelineCommon_NameConflict", resourceCulture);

             }

         }

         

         /// <summary>

-        ///   Looks up a localized string similar to The post to delete does not exist..

+        ///   Looks up a localized string similar to The timeline with given name does not exist..

         /// </summary>

-        internal static string TimelineController_PostOperationDelete_NotExist {

+        internal static string TimelineCommon_NotExist {

             get {

-                return ResourceManager.GetString("TimelineController_PostOperationDelete_NotExist", resourceCulture);

+                return ResourceManager.GetString("TimelineCommon_NotExist", resourceCulture);

             }

         }

         

diff --git a/Timeline/Resources/Messages.resx b/Timeline/Resources/Messages.resx
index cb6c3891..66a84d5f 100644
--- a/Timeline/Resources/Messages.resx
+++ b/Timeline/Resources/Messages.resx
@@ -147,17 +147,14 @@
   <data name="Common_InvalidModel" xml:space="preserve">

     <value>Model is of bad format.</value>

   </data>

-  <data name="TimelineController_ChangeMember_UsernameBadFormat" xml:space="preserve">

-    <value>The {0}-st username to do operation {1} on is of bad format.</value>

-  </data>

-  <data name="TimelineController_ChangeMember_UserNotExist" xml:space="preserve">

-    <value>The {0}-st user to do operation {1} on does not exist.</value>

-  </data>

-  <data name="TimelineController_MemberPut_NotExist" xml:space="preserve">

+  <data name="TimelineCommon_MemberPut_NotExist" xml:space="preserve">

     <value>The user to set as member does not exist.</value>

   </data>

-  <data name="TimelineController_PostOperationDelete_NotExist" xml:space="preserve">

-    <value>The post to delete does not exist.</value>

+  <data name="TimelineCommon_NameConflict" xml:space="preserve">

+    <value>A timeline with given name already exists.</value>

+  </data>

+  <data name="TimelineCommon_NotExist" xml:space="preserve">

+    <value>The timeline with given name does not exist.</value>

   </data>

   <data name="TokenController_Create_BadCredential" xml:space="preserve">

     <value>Username or password is invalid.</value>

diff --git a/Timeline/Resources/Models/Validation/UsernameValidator.Designer.cs b/Timeline/Resources/Models/Validation/NameValidator.Designer.cs
index ac925504..5b869226 100644
--- a/Timeline/Resources/Models/Validation/UsernameValidator.Designer.cs
+++ b/Timeline/Resources/Models/Validation/NameValidator.Designer.cs
@@ -22,14 +22,14 @@ namespace Timeline.Resources.Models.Validation {
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]

     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]

     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]

-    internal class UsernameValidator {

+    internal class NameValidator {

         

         private static global::System.Resources.ResourceManager resourceMan;

         

         private static global::System.Globalization.CultureInfo resourceCulture;

         

         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]

-        internal UsernameValidator() {

+        internal NameValidator() {

         }

         

         /// <summary>

@@ -39,7 +39,7 @@ namespace Timeline.Resources.Models.Validation {
         internal static global::System.Resources.ResourceManager ResourceManager {

             get {

                 if (object.ReferenceEquals(resourceMan, null)) {

-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Models.Validation.UsernameValidator", typeof(UsernameValidator).Assembly);

+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Timeline.Resources.Models.Validation.NameValidator", typeof(NameValidator).Assembly);

                     resourceMan = temp;

                 }

                 return resourceMan;

diff --git a/Timeline/Resources/Models/Validation/UsernameValidator.resx b/Timeline/Resources/Models/Validation/NameValidator.resx
index 08a814d0..08a814d0 100644
--- a/Timeline/Resources/Models/Validation/UsernameValidator.resx
+++ b/Timeline/Resources/Models/Validation/NameValidator.resx
diff --git a/Timeline/Resources/Services/TimelineService.Designer.cs b/Timeline/Resources/Services/TimelineService.Designer.cs
index 8212c252..3ee5959f 100644
--- a/Timeline/Resources/Services/TimelineService.Designer.cs
+++ b/Timeline/Resources/Services/TimelineService.Designer.cs
@@ -77,5 +77,23 @@ namespace Timeline.Resources.Services {
                 return ResourceManager.GetString("ExceptionFindTimelineUsernameBadFormat", resourceCulture);

             }

         }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to The timeline name is of bad format because {0}..

+        /// </summary>

+        internal static string ExceptionTimelineNameBadFormat {

+            get {

+                return ResourceManager.GetString("ExceptionTimelineNameBadFormat", resourceCulture);

+            }

+        }

+        

+        /// <summary>

+        ///   Looks up a localized string similar to The timeline with given name already exists..

+        /// </summary>

+        internal static string ExceptionTimelineNameConflict {

+            get {

+                return ResourceManager.GetString("ExceptionTimelineNameConflict", resourceCulture);

+            }

+        }

     }

 }

diff --git a/Timeline/Resources/Services/TimelineService.resx b/Timeline/Resources/Services/TimelineService.resx
index 0429a2f8..e0d76c9a 100644
--- a/Timeline/Resources/Services/TimelineService.resx
+++ b/Timeline/Resources/Services/TimelineService.resx
@@ -123,4 +123,10 @@
   <data name="ExceptionFindTimelineUsernameBadFormat" xml:space="preserve">

     <value>The owner username of personal timeline is of bad format.</value>

   </data>

+  <data name="ExceptionTimelineNameBadFormat" xml:space="preserve">

+    <value>The timeline name is of bad format because {0}.</value>

+  </data>

+  <data name="ExceptionTimelineNameConflict" xml:space="preserve">

+    <value>The timeline with given name already exists.</value>

+  </data>

 </root>
\ No newline at end of file