Fixed use of '- or -' string to a language file string. Added back lost

initialcontent help file.

diff --git a/lang/en/help/wiki/initialcontent.html b/lang/en/help/wiki/initialcontent.html
new file mode 100755 (executable)
index 0000000..b3c470c
--- /dev/null
+++ b/lang/en/help/wiki/initialcontent.html
@@ -0,0 +1,7 @@
+<P ALIGN=CENTER><B>Fill in initial content</B></P>
+
+<P>This is the content which can be initially filled into the Wiki.</P>
+<P>If you want your own initial content, create it as text-files, and upload it to a directory in the course
+files area. Then select one of the files as the initial page. All pages in that directory will become content
+for every new wiki structure created for this wiki, and the selected page will be the first page.
+</P>

diff --git a/lang/en/wiki.php b/lang/en/wiki.php
index 036c89f8316635269f65176fd2eaf417666eb930..8abf1118c07d3cc04a3f20029bdbc9d1409b41de 100644 (file)
--- a/lang/en/wiki.php
+++ b/lang/en/wiki.php
@@ -5,13 +5,14 @@
 $string['modulename'] = 'Wiki';
 $string['modulenameplural'] = 'Wikis';
 
-$string['wikiname'] = "Page Name";
-$string['wikitype'] = "Type";
+$string['wikiname'] = 'Page Name';
+$string['wikitype'] = 'Type';
 $string['ewikiprinttitle'] = 'Print the title on every Wiki-Page';
 $string['htmlmode'] = 'HTML Mode';
 $string['ewikiacceptbinary'] = 'Allow binary files';
 $string['initialcontent'] = 'Choose an Initial Page';
 $string['chooseafile'] = 'Choose/upload initial page';
+$string['pagenamechoice'] = '- or -';
 
 $string['wikidefaultpagename'] = 'WikiIndex';
 $string['wikistartederror'] = 'Wiki already has entries - can\'t change.';

diff --git a/mod/wiki/mod.html b/mod/wiki/mod.html
index 9938d3a1f7f24da66780a13b307b565a692d0a1e..86784253423ac41d4d32c0b3a1be793f69b0adda 100644 (file)
--- a/mod/wiki/mod.html
+++ b/mod/wiki/mod.html
@@ -117,7 +117,8 @@
             }
             else {
         ?>
-        <INPUT type="text" name="pagename" size=30 value="<?php  p($form->pagename) ?>"><b> - or - </b>
+        <INPUT type="text" name="pagename" size=30 value="<?php  p($form->pagename) ?>"><b>
+        <?php print_string('pagenamechoice', 'wiki'); ?></b>
         <?php
             }
         ?>