Merge pull request #2272 from crazyserver/MOBILE-3325

Mobile 3325

Author: jleyva

scripts/langindex.json

@@ -1760,7 +1760,6 @@
   "core.login.visitchangepassword": "local_moodlemobileapp",
   "core.login.webservicesnotenabled": "local_moodlemobileapp",
   "core.lostconnection": "local_moodlemobileapp",
-  "core.mainmenu.appsettings": "local_moodlemobileapp",
   "core.mainmenu.changesite": "local_moodlemobileapp",
   "core.mainmenu.help": "moodle",
   "core.mainmenu.logout": "moodle",
@@ -1891,6 +1890,7 @@
   "core.sending": "chat",
   "core.serverconnection": "error",
   "core.settings.about": "local_moodlemobileapp",
+  "core.settings.appsettings": "local_moodlemobileapp",
   "core.settings.appversion": "local_moodlemobileapp",
   "core.settings.cannotsyncoffline": "local_moodlemobileapp",
   "core.settings.cannotsyncwithoutwifi": "local_moodlemobileapp",
@@ -1941,6 +1941,7 @@
   "core.settings.navigatoruseragent": "local_moodlemobileapp",
   "core.settings.networkstatus": "local_moodlemobileapp",
   "core.settings.opensourcelicenses": "local_moodlemobileapp",
+  "core.settings.preferences": "moodle",
   "core.settings.privacypolicy": "local_moodlemobileapp",
   "core.settings.publisher": "local_moodlemobileapp",
   "core.settings.pushid": "local_moodlemobileapp",
@@ -1951,8 +1952,10 @@
   "core.settings.siteinfo": "local_moodlemobileapp",
   "core.settings.sites": "moodle",
   "core.settings.spaceusage": "local_moodlemobileapp",
+  "core.settings.spaceusagehelp": "local_moodlemobileapp",
   "core.settings.synchronization": "local_moodlemobileapp",
   "core.settings.synchronizenow": "local_moodlemobileapp",
+  "core.settings.synchronizenowhelp": "local_moodlemobileapp",
   "core.settings.syncsettings": "local_moodlemobileapp",
   "core.settings.total": "moodle",
   "core.settings.wificonnection": "local_moodlemobileapp",

src/addon/block/activitymodules/components/activitymodules/addon-block-activitymodules.html

@@ -2,7 +2,7 @@
     <h2>{{ 'addon.block_activitymodules.pluginname' | translate }}</h2>
 </ion-item-divider>
 <core-loading [hideUntil]="loaded" class="core-loading-center">
-    <a ion-item text-wrap *ngFor="let entry of entries" class="item-media" detail-none [navPush]="'CoreCourseListModTypePage'" [navParams]="{title: entry.name, courseId: instanceId, modName: entry.modName}">
+    <a ion-item text-wrap *ngFor="let entry of entries" class="item-media" detail-none navPush="CoreCourseListModTypePage" [navParams]="{title: entry.name, courseId: instanceId, modName: entry.modName}">
         <img item-start [src]="entry.icon" alt="" role="presentation" class="core-module-icon">
         {{ entry.name }}
     </a>

src/addon/files/pages/list/list.html

@@ -23,7 +23,7 @@
         <!-- List of files. -->
         <ion-list *ngIf="files && files.length > 0">
             <ng-container *ngFor="let file of files">
-                <a *ngIf="file.isdir" ion-item class="item-media" [navPush]="'AddonFilesListPage'" [navParams]="{path: file.link, title: file.filename}">
+                <a *ngIf="file.isdir" ion-item class="item-media" navPush="AddonFilesListPage" [navParams]="{path: file.link, title: file.filename}">
                     <img [src]="file.imgPath" alt="" role="presentation" item-start>
                     <p>{{file.filename}}</p>
                 </a>

src/addon/messages/pages/settings/settings.html

@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title>{{ 'addon.messages.messagepreferences' | translate }}</ion-title>
+        <ion-title>{{ 'addon.messages.messages' | translate }}</ion-title>
     </ion-navbar>
 </ion-header>
 <ion-content>

src/addon/messages/providers/settings-handler.ts

@@ -44,9 +44,9 @@ export class AddonMessagesSettingsHandler implements CoreSettingsHandler {
     getDisplayData(): CoreSettingsHandlerData {
         return {
             icon: 'chatbubbles',
-            title: 'addon.messages.messagepreferences',
+            title: 'addon.messages.messages',
             page: 'AddonMessagesSettingsPage',
-            class: 'addon-messages-settings-handler'
+            class: 'addon-messages-settings-handler',
         };
     }
 

src/addon/mod/folder/components/index/addon-mod-folder-index.html

@@ -17,7 +17,7 @@
 
     <ion-list *ngIf="contents && contents.length > 0">
         <ng-container *ngFor="let file of contents">
-            <a *ngIf="file.type === 'folder'" ion-item class="item-media" [navPush]="'AddonModFolderIndexPage'" [navParams]="{path: file.filepath, courseId: courseId, module: file}">
+            <a *ngIf="file.type === 'folder'" ion-item class="item-media" navPush="AddonModFolderIndexPage" [navParams]="{path: file.filepath, courseId: courseId, module: file}">
                 <ion-icon name="folder" item-start></ion-icon>
                 <h2>{{file.name}}</h2>
             </a>

src/addon/mod/lesson/components/index/addon-mod-lesson-index.html

@@ -244,7 +244,7 @@
                             {{ 'addon.mod_lesson.overview' | translate }}
                         </ion-card-header>
 
-                        <a ion-item text-wrap *ngFor="let student of overview.students" [navPush]="'AddonModLessonUserRetakePage'" [navParams]="{courseId: courseId, lessonId: lesson.id, userId: student.id}">
+                        <a ion-item text-wrap *ngFor="let student of overview.students" navPush="AddonModLessonUserRetakePage" [navParams]="{courseId: courseId, lessonId: lesson.id, userId: student.id}">
                             <ion-avatar core-user-avatar [user]="student" item-start [userId]="student.id" [courseId]="courseId"></ion-avatar>
                             <h2>{{ student.fullname }}</h2>
                             <core-progress-bar [progress]="student.bestgrade"></core-progress-bar>

src/addon/mod/quiz/components/index/addon-mod-quiz-index.html

@@ -52,7 +52,7 @@ <h2>{{ 'addon.mod_quiz.summaryofattempts' | translate }}</h2>
                 </ion-row>
             </ion-item>
             <!-- List of attempts. -->
-            <a ion-item text-wrap *ngFor="let attempt of attempts" [ngClass]='{"addon-mod_quiz-highlighted core-white-push-arrow": attempt.highlightGrade}' [navPush]="'AddonModQuizAttemptPage'" [navParams]="{courseId: courseId, quizId: quiz.id, attemptId: attempt.id}" [attr.aria-label]="'core.seemoredetail' | translate">
+            <a ion-item text-wrap *ngFor="let attempt of attempts" [ngClass]='{"addon-mod_quiz-highlighted core-white-push-arrow": attempt.highlightGrade}' navPush="AddonModQuizAttemptPage" [navParams]="{courseId: courseId, quizId: quiz.id, attemptId: attempt.id}" [attr.aria-label]="'core.seemoredetail' | translate">
                 <ion-row align-items-center>
                     <ion-col text-center *ngIf="quiz.showAttemptColumn && attempt.preview">{{ 'addon.mod_quiz.preview' | translate }}</ion-col>
                     <ion-col text-center *ngIf="quiz.showAttemptColumn && !attempt.preview">{{ attempt.attempt }}</ion-col>

src/addon/mod/quiz/pages/attempt/attempt.html

@@ -31,7 +31,7 @@ <h2>{{ 'addon.mod_quiz.feedback' | translate }}</h2>
                 <p><core-format-text [component]="component" [componentId]="componentId" [text]="attempt.feedback" contextLevel="module" [contextInstanceId]="quiz.coursemodule" [courseId]="courseId"></core-format-text></p>
             </ion-item>
             <ion-item *ngIf="quiz.showReviewColumn && attempt.finished">
-                <button ion-button block icon-start [navPush]="'AddonModQuizReviewPage'" [navParams]="{courseId: courseId, quizId: quiz.id, attemptId: attempt.id}">
+                <button ion-button block icon-start navPush="AddonModQuizReviewPage" [navParams]="{courseId: courseId, quizId: quiz.id, attemptId: attempt.id}">
                     <ion-icon name="search"></ion-icon>
                     {{ 'addon.mod_quiz.review' | translate }}
                 </button>

src/addon/notifications/pages/settings/settings.html

@@ -1,6 +1,6 @@
 <ion-header>
     <ion-navbar core-back-button>
-        <ion-title>{{ 'addon.notifications.notificationpreferences' | translate }}</ion-title>
+        <ion-title>{{ 'addon.notifications.notifications' | translate }}</ion-title>
         <ion-buttons end>
         </ion-buttons>
     </ion-navbar>