From ed07feaea961b6121ff98f6c06fd70cb887a5a3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pau=20Ferrer=20Oca=C3=B1a?= <crazyserver@gmail.com>
Date: Tue, 18 Dec 2018 10:04:56 +0100
Subject: [PATCH] MOBILE-2638 badges: Align fields with web version

---
 scripts/langindex.json                        |  2 +-
 src/addon/badges/lang/en.json                 | 16 +++++++--------
 .../pages/issued-badge/issued-badge.html      | 20 ++++++-------------
 src/assets/lang/en.json                       | 12 +++++------
 4 files changed, 21 insertions(+), 29 deletions(-)

diff --git a/scripts/langindex.json b/scripts/langindex.json
index bb6996369..b252d570f 100644
--- a/scripts/langindex.json
+++ b/scripts/langindex.json
@@ -17,10 +17,10 @@
   "addon.badges.issuerdetails": "badges",
   "addon.badges.issueremail": "badges",
   "addon.badges.issuername": "badges",
+  "addon.badges.issuerurl": "badges",
   "addon.badges.language": "badges",
   "addon.badges.noalignment": "badges",
   "addon.badges.nobadges": "badges",
-  "addon.badges.noendorsement": "badges",
   "addon.badges.norelated": "badges",
   "addon.badges.recipientdetails": "badges",
   "addon.badges.relatedbages": "badges",
diff --git a/src/addon/badges/lang/en.json b/src/addon/badges/lang/en.json
index 5a02d9185..71a943904 100644
--- a/src/addon/badges/lang/en.json
+++ b/src/addon/badges/lang/en.json
@@ -1,9 +1,9 @@
 {
-    "alignment": "Competencies alignment",
+    "alignment": "Competency",
     "badgedetails": "Badge details",
     "badges": "Badges",
     "bendorsement": "Endorsement",
-    "claimcomment": "Endorsement Comment",
+    "claimcomment": "Endorsement comment",
     "claimid": "Claim URL",
     "contact": "Contact",
     "dateawarded": "Date issued",
@@ -15,15 +15,15 @@
     "imagecaption": "Image caption",
     "issuancedetails": "Badge expiry",
     "issuerdetails": "Issuer details",
-    "issuername": "Issuer name",
     "issueremail": "Email",
+    "issuername": "Issuer name",
+    "issuerurl": "Issuer URL",
     "language": "Language",
-    "noalignment": "This badge does not have a competencies alignment.",
+    "noalignment": "This badge does not have any competencies specified.",
     "nobadges": "There are no badges available.",
-    "noendorsement": "This badge does not have an endorsement.",
-    "norelated": "This badge does not have related badges.",
+    "norelated": "This badge does not have any related badges.",
     "recipientdetails": "Recipient details",
     "relatedbages": "Related badges",
     "version": "Version",
-    "warnexpired": " (This badge has expired!)"
-}
+    "warnexpired": "(This badge has expired!)"
+}
\ No newline at end of file
diff --git a/src/addon/badges/pages/issued-badge/issued-badge.html b/src/addon/badges/pages/issued-badge/issued-badge.html
index 65f1272d0..f1e232737 100644
--- a/src/addon/badges/pages/issued-badge/issued-badge.html
+++ b/src/addon/badges/pages/issued-badge/issued-badge.html
@@ -42,9 +42,9 @@
             </ion-item>
             <ion-item text-wrap *ngIf="badge.issuercontact">
                 <h2>{{ 'addon.badges.contact' | translate}}</h2>
-                <p>
-                    <core-format-text clean="true" [text]="badge.issuercontact"></core-format-text>
-                </p>
+                <p><a href="mailto:{{badge.issuercontact}}" core-link auto-login="no">
+                    <core-format-text [text]="badge.issuercontact"></core-format-text>
+                </a></p>
             </ion-item>
         </ion-item-group>
 
@@ -105,12 +105,12 @@
             </ion-item-divider>
             <ion-item text-wrap *ngIf="badge.dateissued">
                 <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
-                <p>{{badge.dateissued | coreToLocaleString }}</p>
+                <p>{{badge.dateissued * 1000 | coreFormatDate }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.dateexpire">
                 <h2>{{ 'addon.badges.expirydate' | translate}}</h2>
                 <p>
-                    {{ badge.dateexpire | coreToLocaleString }}
+                    {{ badge.dateexpire * 1000 | coreFormatDate }}
                     <span class="text-danger" *ngIf="currentTime >= badge.dateexpire">
                         {{ 'addon.badges.warnexpired' | translate }}
                     </span>
@@ -142,7 +142,7 @@
             </ion-item>
             <ion-item text-wrap *ngIf="badge.endorsement.dateissued">
                 <h2>{{ 'addon.badges.dateawarded' | translate}}</h2>
-                <p>{{ badge.endorsement.dateissued | coreToLocaleString }}</p>
+                <p>{{ badge.endorsement.dateissued * 1000 | coreFormatDate }}</p>
             </ion-item>
             <ion-item text-wrap *ngIf="badge.endorsement.claimid">
                 <h2>{{ 'addon.badges.claimid' | translate}}</h2>
@@ -157,14 +157,6 @@
                 </p>
             </ion-item>
         </ion-item-group>
-        <ion-item-group *ngIf="badge.relatedbadges && !badge.endorsement">
-            <ion-item-divider color="light">
-                <h2>{{ 'addon.badges.bendorsement' | translate}}</h2>
-            </ion-item-divider>
-            <ion-item text-wrap>
-                <h2>{{ 'addon.badges.noendorsement' | translate}}</h2>
-            </ion-item>
-        </ion-item-group>
 
         <!-- Related badges -->
         <ion-item-group *ngIf="badge.relatedbadges">
diff --git a/src/assets/lang/en.json b/src/assets/lang/en.json
index daefba4eb..880a6d7fa 100644
--- a/src/assets/lang/en.json
+++ b/src/assets/lang/en.json
@@ -1,9 +1,9 @@
 {
-    "addon.badges.alignment": "Competencies alignment",
+    "addon.badges.alignment": "Competency",
     "addon.badges.badgedetails": "Badge details",
     "addon.badges.badges": "Badges",
     "addon.badges.bendorsement": "Endorsement",
-    "addon.badges.claimcomment": "Endorsement Comment",
+    "addon.badges.claimcomment": "Endorsement comment",
     "addon.badges.claimid": "Claim URL",
     "addon.badges.contact": "Contact",
     "addon.badges.dateawarded": "Date issued",
@@ -17,15 +17,15 @@
     "addon.badges.issuerdetails": "Issuer details",
     "addon.badges.issueremail": "Email",
     "addon.badges.issuername": "Issuer name",
+    "addon.badges.issuerurl": "Issuer URL",
     "addon.badges.language": "Language",
-    "addon.badges.noalignment": "This badge does not have a competencies alignment.",
+    "addon.badges.noalignment": "This badge does not have any competencies specified.",
     "addon.badges.nobadges": "There are no badges available.",
-    "addon.badges.noendorsement": "This badge does not have an endorsement.",
-    "addon.badges.norelated": "This badge does not have related badges.",
+    "addon.badges.norelated": "This badge does not have any related badges.",
     "addon.badges.recipientdetails": "Recipient details",
     "addon.badges.relatedbages": "Related badges",
     "addon.badges.version": "Version",
-    "addon.badges.warnexpired": " (This badge has expired!)",
+    "addon.badges.warnexpired": "(This badge has expired!)",
     "addon.block_activitymodules.pluginname": "Activities",
     "addon.block_myoverview.all": "All",
     "addon.block_myoverview.favourites": "Starred",