Merge pull request #1694 from crazyserver/MOBILE-2795

Mobile 2795

scripts/langindex.json

@@ -1156,6 +1156,7 @@
   "core.accounts": "admin",
   "core.add": "moodle",
   "core.agelocationverification": "moodle",
+  "core.ago": "message",
   "core.all": "moodle",
   "core.allparticipants": "moodle",
   "core.android": "local_moodlemobileapp",

src/addon/messages/pages/discussion/discussion.ts

@@ -229,7 +229,7 @@ export class AddonMessagesDiscussionPage implements OnDestroy {
                                 this.conversationImage = member.profileimageurl;
                                 this.title = member.fullname;
                             }
-                            this.blockIcon = this.otherMember && this.otherMember.isblocked ? 'close-circle' : 'checkmark-circle';
+                            this.blockIcon = this.otherMember && this.otherMember.isblocked ? 'checkmark-circle' : 'close-circle';
                             this.addRemoveIcon = this.otherMember && this.otherMember.iscontact ? 'remove' : 'add';
                         }));
                     } else {

src/addon/messages/pages/group-conversations/group-conversations.ts

@@ -266,7 +266,7 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
                     const conversation = this.findConversation(this.conversationId);
                     if (conversation) {
                         const option = this.getConversationOption(conversation);
-                        option.expanded = true;
+                        this.expandOption(option);
 
                         return;
                     }
@@ -336,11 +336,13 @@ export class AddonMessagesGroupConversationsPage implements OnInit, OnDestroy {
             return conversations.find((conv) => {
                 return conv.id == conversationId;
             });
-        } else if (this.individual.conversations) {
-            return this.individual.conversations.find((conv) => {
-                return conv.userid == userId;
-            });
         }
+
+        const conversations = (this.favourites.conversations || []).concat(this.individual.conversations || []);
+
+        return conversations.find((conv) => {
+            return conv.userid == userId;
+        });
     }
 
     /**

src/app/app.scss

@@ -900,10 +900,13 @@ body.keyboard-is-open {
   }
 }
 
-.safe-padding-horizontal,
+.safe-padding-horizontal{
+  @include safe-area-padding-horizontal(0px, 0px);
+}
+
 [padding].safe-padding-horizontal,
 ion-app.ios [padding].safe-padding-horizontal {
-  @include safe-area-padding-horizontal(0px, 0px);
+  @include safe-area-padding-horizontal($content-padding, $content-padding);
 }
 
 ion-app.ios .split-pane-side,

src/assets/lang/en.json

@@ -1156,6 +1156,7 @@
     "core.accounts": "Accounts",
     "core.add": "Add",
     "core.agelocationverification": "Age and location verification",
+    "core.ago": "{{$a}} ago",
     "core.all": "All",
     "core.allparticipants": "All participants",
     "core.android": "Android",

src/lang/en.json

@@ -2,6 +2,7 @@
     "accounts": "Accounts",
     "add": "Add",
     "agelocationverification": "Age and location verification",
+    "ago": "{{$a}} ago",
     "all": "All",
     "allparticipants": "All participants",
     "android": "Android",

src/pipes/time-ago.ts

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 import { Pipe, PipeTransform } from '@angular/core';
+import { TranslateService } from '@ngx-translate/core';
 import { CoreLoggerProvider } from '@providers/logger';
 import * as moment from 'moment';
 
@@ -25,7 +26,7 @@ import * as moment from 'moment';
 export class CoreTimeAgoPipe implements PipeTransform {
     protected logger;
 
-    constructor(logger: CoreLoggerProvider) {
+    constructor(logger: CoreLoggerProvider, private translate: TranslateService) {
         this.logger = logger.getInstance('CoreTimeAgoPipe');
     }
 
@@ -47,6 +48,6 @@ export class CoreTimeAgoPipe implements PipeTransform {
             timestamp = numberTimestamp;
         }
 
-        return moment(timestamp * 1000).fromNow(true);
+        return this.translate.instant('core.ago', {$a: moment(timestamp * 1000).fromNow(true)});
     }
 }