From: stronk7 Date: Sun, 10 May 2009 15:31:03 +0000 (+0000) Subject: MDL-15534 wiki special pages heading title. Apply ewiki_t() to get translated heading... X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=5bd8324b2488b4d4f3d010c1167123cafec22401;p=moodle.git MDL-15534 wiki special pages heading title. Apply ewiki_t() to get translated heading names ; merged from 19_STABLE --- diff --git a/mod/wiki/ewiki/ewiki.php b/mod/wiki/ewiki/ewiki.php index 2014ef3b1b..ef9020503f 100644 --- a/mod/wiki/ewiki/ewiki.php +++ b/mod/wiki/ewiki/ewiki.php @@ -1067,20 +1067,20 @@ function ewiki_page_ordered_list($orderby="created", $asc=0, $print, $title) { function ewiki_page_newest($id=0, $data=0) { - return( ewiki_page_ordered_list("created", 1, "LASTCHANGED", ewiki_t("NEWESTPAGES")) ); + return( ewiki_page_ordered_list("created", 1, "LASTCHANGED", ewiki_t(EWIKI_PAGE_NEWEST)) ); } function ewiki_page_updates($id=0, $data=0) { - return( ewiki_page_ordered_list("lastmodified", -1, "LASTCHANGED", EWIKI_PAGE_UPDATES) ); + return( ewiki_page_ordered_list("lastmodified", -1, "LASTCHANGED", ewiki_t(EWIKI_PAGE_UPDATES)) ); } function ewiki_page_hits($id=0, $data=0) { ##### BEGIN MOODLE ADDITION ##### - return( ewiki_page_ordered_list("hits", 1, "hits", EWIKI_PAGE_HITS) ); + return( ewiki_page_ordered_list("hits", 1, "hits", ewiki_t(EWIKI_PAGE_HITS)) ); } function ewiki_page_versions($id=0, $data=0) { - return( ewiki_page_ordered_list("version", -1, "changes", EWIKI_PAGE_VERSIONS) ); + return( ewiki_page_ordered_list("version", -1, "changes", ewiki_t(EWIKI_PAGE_VERSIONS)) ); ##### END MOODLE ADDITION ##### } diff --git a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php index 7bc467f88f..9a9a0a7555 100644 --- a/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php +++ b/mod/wiki/ewiki/plugins/moodle/moodle_wikidump.php @@ -67,7 +67,7 @@ function moodle_ewiki_page_wiki_dump($id=0, $data=0, $action=0) { } $url = ewiki_script("", "WikiExport"); - $ret = ewiki_make_title($id, $id, 2); + $ret = ewiki_make_title($id, ewiki_t($id), 2); $ret .= ($cont&&$cont!==true)?$cont."

\n":""; $ret .= get_string("wikiexportcomment","wiki"); // removing name="form" from the following form as it does not validate diff --git a/mod/wiki/ewiki/plugins/moodle/sitemap.php b/mod/wiki/ewiki/plugins/moodle/sitemap.php index b1298a5ed6..79a0b660d9 100644 --- a/mod/wiki/ewiki/plugins/moodle/sitemap.php +++ b/mod/wiki/ewiki/plugins/moodle/sitemap.php @@ -36,7 +36,7 @@ function ewiki_page_sitemap($id=0, $data=0, $action=0){ //creates the title bar on top of page if($id == EWIKI_PAGE_SITEMAP){ - $o = ewiki_make_title($id, $id, 2); + $o = ewiki_make_title($id, ewiki_t($id), 2); foreach($ewiki_config["SiteMap"]["RootList"] as $root){ if(isset($a_validpages[$root])){ diff --git a/mod/wiki/ewiki/plugins/page/orphanedpages.php b/mod/wiki/ewiki/plugins/page/orphanedpages.php index bba6058a63..3007680907 100755 --- a/mod/wiki/ewiki/plugins/page/orphanedpages.php +++ b/mod/wiki/ewiki/plugins/page/orphanedpages.php @@ -12,7 +12,7 @@ function ewiki_page_orphanedpages($id, $data, $action) { global $ewiki_links; - $o = ewiki_make_title($id, $id, 2); + $o = ewiki_make_title($id, ewiki_t($id), 2); $pages = array(); $refs = array(); @@ -59,4 +59,4 @@ function ewiki_page_orphanedpages($id, $data, $action) { } -?> \ No newline at end of file +?> diff --git a/mod/wiki/ewiki/plugins/page/pageindex.php b/mod/wiki/ewiki/plugins/page/pageindex.php index 87039a5b1b..72058c9f41 100755 --- a/mod/wiki/ewiki/plugins/page/pageindex.php +++ b/mod/wiki/ewiki/plugins/page/pageindex.php @@ -12,7 +12,7 @@ function ewiki_page_index($id=0, $data=0, $action=0, $args=array()) { global $ewiki_plugins; - $o = ewiki_make_title($id, $id, 2); + $o = ewiki_make_title($id, ewiki_t($id), 2); $sorted = array(); $sorted = array_merge($sorted, array_keys($ewiki_plugins["page"])); @@ -41,4 +41,4 @@ function ewiki_page_index($id=0, $data=0, $action=0, $args=array()) { } -?> \ No newline at end of file +?>