Replace hard-coded "Mahara" with %s to actually show site name

[Kristina Hoeppner]

Mahara 1.5

Change "Mahara" in the following instances to use %s in order to substitute it for the actual site name. I did not suggest this change to be made in the administrative area where it is good that the admin deals with "Mahara". In the user help files etc. the site name should be used though I think.

string emailvalidation_body artefact.internal.php

mahara.php line 426 $string['forgotpassemailsentanyway']

auth.php line 70 $string['errnoxmlrpcuser']

auth.php line 78 $string['xmlrpccouldnotlogyouindetail']

htdocs/lang/en.utf8/help/forms/uploadcsv.maildisabled.html:<p>Use this setting to stop Mahara from sending you email.</p>

htdocs/lang/en.utf8/help/forms/adduser.maildisabled.html:<p>Use this setting to stop Mahara from sending you email.</p>

htdocs/lang/en.utf8/help/forms/uploadcsv.showhomeinfo.html:<h3>Show information about Mahara on the home page</h3>

---
htdocs/lang/en.utf8/help/forms/uploadcsv.showhomeinfo.html:<p>If "On", information about Mahara and what can be done with it will be displayed on the home page, above your dashboard.</p>

htdocs/lang/en.utf8/help/forms/adduser.showhomeinfo.html:<h3>Show information about Mahara on the home page</h3>

htdocs/lang/en.utf8/help/forms/adduser.showhomeinfo.html:<p>If "On", information about Mahara and what can be done with it will be displayed on the home page, above your dashboard.</p>

htdocs/lang/en.utf8/help/forms/accountprefs.showhomeinfo.html:<h3>Show information about Mahara on the home page</h3>

htdocs/lang/en.utf8/help/forms/accountprefs.showhomeinfo.html:<p>If "On", information about Mahara and what can be done with it will be displayed on the home page, above your dashboard.</p>

-> for all the strings above change "home page" to "homepage" at the same time and take out the comma after "homepage"
----

htdocs/lang/en.utf8/help/forms/accountprefs.maildisabled.html:<p>Use this setting to stop Mahara from sending you email.</p>

htdocs/lang/en.utf8/account.php:$string['showhomeinfo'] = 'Show information about Mahara on the homepage';

htdocs/auth/saml/lang/en.utf8/auth.saml.php:$string['errormissinguserattributes'] = 'You seem to be authenticated but we did not receive the required user attributes. Please check that your Identity Provider releases these SSO fields for First Name, Surname, and Email to the Service Provider Mahara is running on or inform the webmaster of this server.';

htdocs/blocktype/googleapps/lang/en.utf8/help/forms/instconf.appsid.html:<p><strong>Note:</strong> The files you've uploaded to Mahara are not directly accessible, so you can't embed those files.</p>

[François Marier (fmarier)]

Actually, I don't think we can do placeholders in help files, so we can probably only fix the ones in regular langstrings.

[Kristina Hoeppner (kris-hoeppner)]

If that is the case, I can try to reword the help files so that Mahara is not needed. Let me know if the placeholder doesn't work in the help files.

[Richard Mansfield (richard-mansfield)]

Unfortunately the help files can't have placeholders, it'll have to be rewording.

[Kristina Hoeppner (kris-hoeppner)]

Thanks, Richard. Could you then please change the instances that are not in help files and I reword the help file text to take "Mahara" out?

[Richard Mansfield (richard-mansfield)]

Kristina, my bit is at https://reviews.mahara.org/1065. I'll allocate this to you for the help files.

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/1065
Committed: http://gitorious.org/mahara/mahara/commit/a1cf0c310aa22bfd39b997911a848df4e17d7112
Submitter: Francois Marier (<email address hidden>)
Branch: master

commit a1cf0c310aa22bfd39b997911a848df4e17d7112
Author: Richard Mansfield <email address hidden>
Date: Tue Feb 21 14:45:06 2012 +1300

    Replace hard-coded "Mahara" with site name (bug #901569)

    In strings outside the admin area, the user should usually see the
    site name rather than 'Mahara', because they don't care what the
    software's called.

    Change-Id: Ic876a2cd4971315bc4ac8dd62a9ae1272b89d8e9
    Signed-off-by: Richard Mansfield <email address hidden>

[Mahara Bot (dev-mahara)]

Reviewed: https://reviews.mahara.org/1075
Committed: http://gitorious.org/mahara/mahara/commit/16e4f15481f426c653e8742ded5e4f5e361031e0
Submitter: Francois Marier (<email address hidden>)
Branch: master

commit 16e4f15481f426c653e8742ded5e4f5e361031e0
Author: Kristina D.C. Hoeppner <email address hidden>
Date: Sat Feb 25 14:20:42 2012 +1300

    Change "Mahara" into "this site" (Bug 901569)

    Make the change so that "Mahara" does not appear in
    the help files anymore as users may not know their
    site as "Mahara" but something else.

    Change-Id: Id5ce37e49d2c6220cab6868cbafef43c30511403
    Signed-off-by: Kristina D.C. Hoeppner <email address hidden>

[Melissa Draper (melissa)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

status: fixreleased
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPjqbSAAoJECXBtiziiXdc9lQH/ihyu7QAsQTauz6R0kgBF2og
xGfwoCzflrqvhr0M52SR9mS/oVvb0ZerWl6CL2aJ8Aq5dTGNZ2+dHsDZTTYGQzF0
qLheaMcgjVQyCasJQzFwP4eVhxP5d7PUvHTPoB2SfQOMrzb6LdbF3ZuaPk11bImk
zjRhyzLIDuqPGCvkm/RSr3RlyuLlQD6/mSXfHLXRMKuG6ZXZQdgwvAgbRVrqCukJ
HeAfb9i1gVLgMoKO1OGur+sCYD155g6GtykNolwC1vXGI2lwL5yko4rBq47m1zTJ
iEMJngvutbkLqfkLye2DrqEGfPdJSD28cn0yTrGo4r8c8v+VErQG2fw28Do62AQ=
=PEOy
-----END PGP SIGNATURE-----

[Melissa Draper (melissa)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

status fixreleased
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPjrKtAAoJECXBtiziiXdcUwoH/2T7TneDztExyzwY3jqJTs/Y
RyZ+uApeCE5D2ICXyJjXwQa5J4hwSnVwXWB6W0BGUspaTlHk5DU2uHMV7tJ6GnyK
+Z/jxi99+oRi3ejXk21hpZou9c1uPTtHHzNw8l/y8S3yOBwo+kWE9UNjrpYHNGZc
BRtQyh447e+4x4ocrR5ldieyEo5gYiFztVAtxNKSx00iCTpGXEiGmLKQ+8RhABMc
b/yOYWmLrgcBrvbC8xuQWZoXYgiZvsC0pjZnMHVW1SDrXHLbxsdcE1D/T1Vm+U7q
f0tHry8pHQnJQlbd8hm6vlOQR8Zo3wEB8knRCR0euQFr9oC32PBHaVLHZ75Dx+4=
=NY/1
-----END PGP SIGNATURE-----

[Melissa Draper (melissa)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

 status fixreleased
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQEcBAEBAgAGBQJPjrT9AAoJECXBtiziiXdcoRgIAI6WEF/A3ND2GQDSpnq5f/tC
dX+/FeJZVxYHJpRv9z3v9pQ47AuNacrcWJkRdDsc7A+/XEP++DWUU5lvYy65941s
gekqH765BpnPqOU3QAWzhhQqQAJo/aSk94H+YZCoJTtw4tA4sOWxITkItb1SAt33
Q8bnKihJZYHtgfKtEv7gzd2oyk5Jk1xAJjE8fpcJpjXdkpF2Gda82JOpR2hrFnfo
k/nH5VLwHELKBMmLhFjTasfe2R5/LjBaDQp4r93ZdZBl5qer00yUQoEIgInJg+LK
Rs5onHkg5YWn5ezTrMkRBAp/goHyrcYaunC4sJ4cazP1+YtC10oJq8fnuv1Xq9A=
=fz6e
-----END PGP SIGNATURE-----