update fix bugs

appbuilder-ios/AppBuilder/AppBuilder/SecondTabViewController.swift

@@ -1080,7 +1080,7 @@ extension SecondTabViewController: UITableViewDelegate, UITableViewDataSource {
                     if day < 7 {
                         let formatter = DateFormatter()
                         formatter.dateFormat = "EEEE"
-                        timeView.text = formatter.string(from: date)
+                        timeView.text = formatter.string(from: date).localized()
                     } else {
                         let formatter = DateFormatter()
                         formatter.dateFormat = "MM/dd/yy"

appbuilder-ios/DigiXLite/DigiXLite/Resource/id.lproj/Localizable.strings

@@ -321,3 +321,10 @@
 "images" = "gambar";
 "Forward All" = "Teruskan Semua";
 "Delete All" = "Hapus Semua";
+"Monday" = "Senin";
+"Tuesday" = "Selasa";
+"Wednesday" = "Rabu";
+"Thursday" = "Kamis";
+"Friday" = "Jum'at";
+"Saturday" = "Sabtu";
+"Sunday" = "Minggu";

appbuilder-ios/DigiXLite/DigiXLite/Source/DigiX.swift

@@ -1026,7 +1026,7 @@ public class DigiX: NSObject {
             }
             if is_call_center == "0" {
                 do {
-                    let queryGetLastMessageId = "SELECT message_id FROM MESSAGE where opposite_pin = '\(opposite_pin)' OR l_pin = '\(pin)' order by server_date desc LIMIT 1"
+                    let queryGetLastMessageId = "SELECT message_id FROM MESSAGE where l_pin = '\(pin)' OR opposite_pin = '\(opposite_pin)' order by server_date desc LIMIT 1"
                     var messageId = ""
                     if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: queryGetLastMessageId), cursorData.next() {
                         messageId = cursorData.string(forColumnIndex: 0) ?? ""

appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorGroup.swift

@@ -574,10 +574,12 @@ public class EditorGroup: UIViewController {
                 }
                 return "Yesterday".localized()
             } else if day < 7 {
-                if !dataDates.contains("\(day) " + "days".localized() + " " + "ago".localized()){
-                    dataDates.append("\(day) " + "days".localized() + " " + "ago".localized())
+                let formatter = DateFormatter()
+                formatter.dateFormat = "EEEE"
+                if !dataDates.contains(formatter.string(from: date).localized()){
+                    dataDates.append(formatter.string(from: date).localized())
                 }
-                return "\(day) " + "days".localized() + " " + "ago".localized()
+                return formatter.string(from: date).localized()
             } else {
                 let formatter = DateFormatter()
                 formatter.dateFormat = "dd MMMM yyyy"

appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorPersonal.swift

@@ -1198,10 +1198,12 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 }
                 return "Yesterday".localized()
             } else if day < 7 {
-                if !dataDates.contains("\(day) " + "days".localized() + " " + "ago".localized()){
-                    dataDates.append("\(day) " + "days".localized() + " " + "ago".localized())
+                let formatter = DateFormatter()
+                formatter.dateFormat = "EEEE"
+                if !dataDates.contains(formatter.string(from: date).localized()){
+                    dataDates.append(formatter.string(from: date).localized())
                 }
-                return "\(day) " + "days".localized() + " " + "ago".localized()
+                return formatter.string(from: date).localized()
             } else {
                 let formatter = DateFormatter()
                 formatter.dateFormat = "dd MMMM yyyy"

appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorStarMessages.swift

@@ -1018,10 +1018,12 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
                 }
                 return "Yesterday".localized()
             } else if day < 7 {
-                if !dataDates.contains("\(day) " + "days".localized() + " " + "ago".localized()){
-                    dataDates.append("\(day) " + "days".localized() + " " + "ago".localized())
+                let formatter = DateFormatter()
+                formatter.dateFormat = "EEEE"
+                if !dataDates.contains(formatter.string(from: date).localized()){
+                    dataDates.append(formatter.string(from: date).localized())
                 }
-                return "\(day) " + "days".localized() + " " + "ago".localized()
+                return formatter.string(from: date).localized()
             } else {
                 let formatter = DateFormatter()
                 formatter.dateFormat = "dd MMMM yyyy"

appbuilder-ios/DigiXLite/DigiXLite/Source/View/Control/ContactChatViewController.swift

@@ -1053,7 +1053,7 @@ extension ContactChatViewController {
                         if day < 7 {
                             let formatter = DateFormatter()
                             formatter.dateFormat = "EEEE"
-                            timeView.text = formatter.string(from: date)
+                            timeView.text = formatter.string(from: date).localized()
                         } else {
                             let formatter = DateFormatter()
                             formatter.dateFormat = "MM/dd/yy"

appbuilder-ios/NexilisLite/NexilisLite/Resource/id.lproj/Localizable.strings

@@ -320,3 +320,10 @@
 "images" = "gambar";
 "Forward All" = "Teruskan Semua";
 "Delete All" = "Hapus Semua";
+"Monday" = "Senin";
+"Tuesday" = "Selasa";
+"Wednesday" = "Rabu";
+"Thursday" = "Kamis";
+"Friday" = "Jum'at";
+"Saturday" = "Sabtu";
+"Sunday" = "Minggu";

appbuilder-ios/NexilisLite/NexilisLite/Source/Nexilis.swift

@@ -1026,7 +1026,7 @@ public class Nexilis: NSObject {
             }
             if is_call_center == "0" {
                 do {
-                    let queryGetLastMessageId = "SELECT message_id FROM MESSAGE where opposite_pin = '\(opposite_pin)' OR l_pin = '\(pin)' order by server_date desc LIMIT 1"
+                    let queryGetLastMessageId = "SELECT message_id FROM MESSAGE where l_pin = '\(pin)' OR opposite_pin = '\(opposite_pin)' order by server_date desc LIMIT 1"
                     var messageId = ""
                     if let cursorData = Database.shared.getRecords(fmdb: fmdb, query: queryGetLastMessageId), cursorData.next() {
                         messageId = cursorData.string(forColumnIndex: 0) ?? ""

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -574,10 +574,12 @@ public class EditorGroup: UIViewController {
                 }
                 return "Yesterday".localized()
             } else if day < 7 {
-                if !dataDates.contains("\(day) " + "days".localized() + " " + "ago".localized()){
-                    dataDates.append("\(day) " + "days".localized() + " " + "ago".localized())
+                let formatter = DateFormatter()
+                formatter.dateFormat = "EEEE"
+                if !dataDates.contains(formatter.string(from: date).localized()){
+                    dataDates.append(formatter.string(from: date).localized())
                 }
-                return "\(day) " + "days".localized() + " " + "ago".localized()
+                return formatter.string(from: date).localized()
             } else {
                 let formatter = DateFormatter()
                 formatter.dateFormat = "dd MMMM yyyy"

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -1198,10 +1198,12 @@ public class EditorPersonal: UIViewController, ImageVideoPickerDelegate, UIGestu
                 }
                 return "Yesterday".localized()
             } else if day < 7 {
-                if !dataDates.contains("\(day) " + "days".localized() + " " + "ago".localized()){
-                    dataDates.append("\(day) " + "days".localized() + " " + "ago".localized())
+                let formatter = DateFormatter()
+                formatter.dateFormat = "EEEE"
+                if !dataDates.contains(formatter.string(from: date).localized()){
+                    dataDates.append(formatter.string(from: date).localized())
                 }
-                return "\(day) " + "days".localized() + " " + "ago".localized()
+                return formatter.string(from: date).localized()
             } else {
                 let formatter = DateFormatter()
                 formatter.dateFormat = "dd MMMM yyyy"

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorStarMessages.swift

@@ -1018,10 +1018,12 @@ public class EditorStarMessages: UIViewController, UITableViewDataSource, UITabl
                 }
                 return "Yesterday".localized()
             } else if day < 7 {
-                if !dataDates.contains("\(day) " + "days".localized() + " " + "ago".localized()){
-                    dataDates.append("\(day) " + "days".localized() + " " + "ago".localized())
+                let formatter = DateFormatter()
+                formatter.dateFormat = "EEEE"
+                if !dataDates.contains(formatter.string(from: date).localized()){
+                    dataDates.append(formatter.string(from: date).localized())
                 }
-                return "\(day) " + "days".localized() + " " + "ago".localized()
+                return formatter.string(from: date).localized()
             } else {
                 let formatter = DateFormatter()
                 formatter.dateFormat = "dd MMMM yyyy"

appbuilder-ios/NexilisLite/NexilisLite/Source/View/Control/ContactChatViewController.swift

@@ -1053,7 +1053,7 @@ extension ContactChatViewController {
                         if day < 7 {
                             let formatter = DateFormatter()
                             formatter.dateFormat = "EEEE"
-                            timeView.text = formatter.string(from: date)
+                            timeView.text = formatter.string(from: date).localized()
                         } else {
                             let formatter = DateFormatter()
                             formatter.dateFormat = "MM/dd/yy"