Commit 7ac1eb33 authored by Richard Mansfield's avatar Richard Mansfield Committed by Gerrit Code Review
Browse files

Merge "Remove unused js strings from web.php (bug #845274)"

parents 2a6b052b c1a50f47
...@@ -222,7 +222,6 @@ $string['requestedfriendlistmessagereason'] = '%s has requested that you add the ...@@ -222,7 +222,6 @@ $string['requestedfriendlistmessagereason'] = '%s has requested that you add the
$string['removefromfriendslist'] = 'Remove from friends'; $string['removefromfriendslist'] = 'Remove from friends';
$string['removefromfriends'] = 'Remove %s from friends'; $string['removefromfriends'] = 'Remove %s from friends';
$string['confirmremovefriend'] = 'Are you sure you want to remove this user from your friends list?';
$string['removedfromfriendslistsubject'] = 'Removed from friends list'; $string['removedfromfriendslistsubject'] = 'Removed from friends list';
$string['removedfromfriendslistmessage'] = '%s has removed you from their friends list.'; $string['removedfromfriendslistmessage'] = '%s has removed you from their friends list.';
$string['removedfromfriendslistmessagereason'] = '%s has removed you from their friends list. Their reason was: '; $string['removedfromfriendslistmessagereason'] = '%s has removed you from their friends list. Their reason was: ';
...@@ -246,7 +245,6 @@ $string['backtofriendslist'] = 'Back to Friends List'; ...@@ -246,7 +245,6 @@ $string['backtofriendslist'] = 'Back to Friends List';
$string['findnewfriends'] = 'Find New Friends'; $string['findnewfriends'] = 'Find New Friends';
$string['Views'] = 'Pages'; $string['Views'] = 'Pages';
$string['Files'] = 'Files'; $string['Files'] = 'Files';
$string['seeallviews'] = 'See all %s pages...';
$string['noviewstosee'] = 'None that you can see :('; $string['noviewstosee'] = 'None that you can see :(';
$string['whymakemeyourfriend'] = 'This is why you should make me your friend:'; $string['whymakemeyourfriend'] = 'This is why you should make me your friend:';
$string['approverequest'] = 'Approve Request!'; $string['approverequest'] = 'Approve Request!';
......
...@@ -511,7 +511,6 @@ $string['emailnotsent'] = 'Failed to send contact email. Error messa ...@@ -511,7 +511,6 @@ $string['emailnotsent'] = 'Failed to send contact email. Error messa
// mahara.js // mahara.js
$string['namedfieldempty'] = 'The required field "%s" is empty'; $string['namedfieldempty'] = 'The required field "%s" is empty';
$string['processing'] = 'Processing'; $string['processing'] = 'Processing';
$string['requiredfieldempty'] = 'A required field is empty';
$string['unknownerror'] = 'An unknown error occurred (0x20f91a0)'; $string['unknownerror'] = 'An unknown error occurred (0x20f91a0)';
// menu // menu
......
...@@ -819,14 +819,11 @@ function jsstrings() { ...@@ -819,14 +819,11 @@ function jsstrings() {
'mahara' => array( // section 'mahara' => array( // section
'namedfieldempty', // string name 'namedfieldempty', // string name
'processing', 'processing',
'requiredfieldempty',
'unknownerror', 'unknownerror',
'loading', 'loading',
'showtags', 'showtags',
'unreadmessages', 'unreadmessages',
'unreadmessage', 'unreadmessage',
'pendingfriend',
'pendingfriends',
'couldnotgethelp', 'couldnotgethelp',
'password', 'password',
'username', 'username',
...@@ -845,45 +842,10 @@ function jsstrings() { ...@@ -845,45 +842,10 @@ function jsstrings() {
'lastpage', 'lastpage',
) )
), ),
'friends' => array(
'group' => array(
'confirmremovefriend',
'seeallviews',
'noviewstosee',
'sendmessage',
'whymakemeyourfriend',
'approverequest',
'denyrequest',
'pending',
'removefromfriendslist',
'views',
'trysearchingforfriends',
'nobodyawaitsfriendapproval',
'sendfriendrequest',
'addtomyfriends',
'friendshiprequested',
'userdoesntwantfriends',
'existingfriend',
'nosearchresultsfound',
'reason',
'requestfriendship',
'cancel',
),
),
'views' => array( 'views' => array(
'view' => array( 'view' => array(
'confirmdeleteblockinstance', 'confirmdeleteblockinstance',
'blocksinstructionajax', 'blocksinstructionajax',
'Configure',
),
),
'adminusersearch' => array(
'admin' => array(
'suspenduser',
'suspensionreason',
),
'mahara' => array(
'cancel',
), ),
), ),
); );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment