← Back to team overview

mahara-contributors team mailing list archive

[Bug 901569] A change has been merged

 

Reviewed:  https://reviews.mahara.org/1075
Committed: http://gitorious.org/mahara/mahara/commit/16e4f15481f426c653e8742ded5e4f5e361031e0
Submitter: Francois Marier (francois@xxxxxxxxxxxxxxx)
Branch:    master

commit 16e4f15481f426c653e8742ded5e4f5e361031e0
Author: Kristina D.C. Hoeppner <kristina@xxxxxxxxxxxxxxx>
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 <kristina@xxxxxxxxxxxxxxx>

-- 
You received this bug notification because you are a member of Mahara
Contributors, which is subscribed to Mahara.
https://bugs.launchpad.net/bugs/901569

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

Status in Mahara ePortfolio:
  Fix Committed

Bug description:
  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>

To manage notifications about this bug go to:
https://bugs.launchpad.net/mahara/+bug/901569/+subscriptions


References