L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MDL-22050 removing moodle/langconfig duplicates

Browse Source 
AMOS BEGIN
  MOV [strftimedate,core],[strftimedate,core_langconfig]
  MOV [strftimedatefullshort,core],[strftimedatefullshort,core_langconfig]
  MOV [strftimedateshort,core],[strftimedateshort,core_langconfig]
  MOV [strftimedatetime,core],[strftimedatetime,core_langconfig]
  MOV [strftimedatetimeshort,core],[strftimedatetimeshort,core_langconfig]
  MOV [strftimedaydate,core],[strftimedaydate,core_langconfig]
  MOV [strftimedaydatetime,core],[strftimedaydatetime,core_langconfig]
  MOV [strftimedayshort,core],[strftimedayshort,core_langconfig]
  MOV [strftimedaytime,core],[strftimedaytime,core_langconfig]
  MOV [strftimemonthyear,core],[strftimemonthyear,core_langconfig]
  MOV [strftimerecent,core],[strftimerecent,core_langconfig]
  MOV [strftimerecentfull,core],[strftimerecentfull,core_langconfig]
  MOV [strftimetime,core],[strftimetime,core_langconfig]
AMOS END
This commit is contained in:
Petr Skoda
2010-04-10 18:15:30 +00:00
parent c9042db5c7
commit 6cf9b98a4a
2 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/en/moodle.php
-12
View File
@@ -1612,18 +1612,6 @@ $string['statsuserreads'] = 'Views';
$string['statsuserwrites'] = 'Posts';
$string['statswrites'] = 'Posts';
$string['status'] = 'Status';
$string['strftimedate'] = '%d %B %Y';
$string['strftimedateshort'] = '%d %B';
$string['strftimedatetime'] = '%d %B %Y, %I:%M %p';
$string['strftimedatetimeshort'] = '%d/%m/%Y %H:%M';
$string['strftimedaydate'] = '%A, %d %B %Y';
$string['strftimedaydatetime'] = '%A, %d %B %Y, %I:%M %p';
$string['strftimedayshort'] = '%A, %d %B';
$string['strftimedaytime'] = '%a, %H:%M';
$string['strftimemonthyear'] = '%B %Y';
$string['strftimerecent'] = '%d %b, %H:%M';
$string['strftimerecentfull'] = '%a, %d %b %Y, %I:%M %p';
$string['strftimetime'] = '%I:%M %p';
$string['stringsnotset'] = 'The following strings are not defined in {$a}';
$string['studentnotallowed'] = 'Sorry, but you can not enter this course as \'{$a}\'';
$string['students'] = 'Students';
lib/moodlelib.php
+16 -7
View File
@@ -5856,16 +5856,25 @@ class amos_string_manager implements string_manager {
* @return string The String !
*/
public function get_string($identifier, $component='', $a=NULL) {
// this will be replaced by merging of lang and langconfig
static $langconfigstrs = array('alphabet' => 1, 'backupnameformat' => 1, 'decsep' => 1,
'firstdayofweek' => 1, 'listsep' => 1, 'locale' => 1, 'localewin' => 1,
'localewincharset' => 1, 'oldcharset' => 1, 'parentlanguage' => 1,
'strftimedate' => 1, 'strftimedateshort' => 1, 'strftimedatefullshort' => 1,
'strftimedatetime' => 1, 'strftimedaydate' => 1, 'strftimedaydatetime' => 1,
'strftimedayshort' => 1, 'strftimedaytime' => 1, 'strftimemonthyear' => 1,
'strftimerecent' => 1, 'strftimerecentfull' => 1, 'strftimetime' => 1,
'thischarset' => 1, 'thisdirection' => 1, 'thislanguage' => 1,
'strftimedatetimeshort' => 1, 'thousandssep' => 1);
'thischarset' => 1, 'thisdirection' => 1, 'thislanguage' => 1, 'thousandssep' => 1,
'strftimedate' => 1,
'strftimedatefullshort' => 1,
'strftimedateshort' => 1,
'strftimedatetime' => 1,
'strftimedatetimeshort' => 1,
'strftimedaydate' => 1,
'strftimedaydatetime' => 1,
'strftimedayshort' => 1,
'strftimedaytime' => 1,
'strftimemonthyear' => 1,
'strftimerecent' => 1,
'strftimerecentfull' => 1,
'strftimetime' => 1,
);
if ((empty($component)) and isset($langconfigstrs[$identifier])) {
$component = 'core_langconfig';