SAK-33825: default HTML text content for Home's 'Home Information Dis…

…play' still references 'My Workspace' (sakaiproject#5204)

kernel/api/src/main/java/org/sakaiproject/content/api/ContentHostingService.java

@@ -1971,7 +1971,7 @@ public ContentCollectionEdit addCollection(String collectionId, String name, int
 				IdLengthException, IdInvalidException, TypeException, IdUniquenessException;
 
    /**
-    * gets the quota for a site collection or for a user's my workspace collection
+    * gets the quota for a site collection or for a user's Home collection
     *
     * @param collection the collection on which to test for a quota.  this can be the collection for a site
     * or a user's workspace collection

kernel/api/src/main/java/org/sakaiproject/content/cover/ContentHostingService.java

@@ -24,7 +24,6 @@
 import java.util.Collection;
 import java.util.Set;
 
-import org.sakaiproject.antivirus.api.VirusFoundException;
 import org.sakaiproject.component.cover.ComponentManager;
 import org.sakaiproject.content.api.ContentResource;
 import org.sakaiproject.exception.IdInvalidException;
@@ -33,7 +32,6 @@
 import org.sakaiproject.exception.InUseException;
 import org.sakaiproject.exception.InconsistentException;
 import org.sakaiproject.exception.OverQuotaException;
-import org.sakaiproject.content.api.ContentResourceFilter;
 import org.sakaiproject.content.api.GroupAwareEdit;
 import org.sakaiproject.entity.api.Entity;
 import org.sakaiproject.exception.PermissionException;
@@ -1088,7 +1086,7 @@ public static org.sakaiproject.content.api.ContentCollectionEdit addCollection(j
 	}
 
    /**
-    * gets the quota for a site collection or for a user's my workspace collection
+    * gets the quota for a site collection or for a user's Home collection
     *
     * @param collection the collection on which to test for a quota.  this can be the collection for a site
     * or a user's workspace collection

kernel/api/src/main/java/org/sakaiproject/site/api/SiteService.java

@@ -87,7 +87,7 @@ public interface SiteService extends EntityProducer
 	/** Name for the event of creating a site from a sakai archive (KNL-1210) */
 	static final String SECURE_IMPORT_ARCHIVE = "site.import.archive";
 
-	/** Name for the event of adding a user's My Workspace site. */
+	/** Name for the event of adding a user's Home site. */
 	static final String SECURE_ADD_USER_SITE = "site.add.usersite";
 
 	/** Name for the event of removing a site. */

kernel/component-manager/src/main/bundle/org/sakaiproject/config/kernel.properties

@@ -287,4 +287,4 @@ realm.allowed..auth=annc.all.groups,annc.read,asn.read,asn.receive.notifications
   rwiki.update,signup.attend,signup.attend.all,signup.view,signup.view.all,site.viewRoster,site.visit,sitestats.view,\
   usermembership.view,lessonbuilder.read
 
-[email protected]=sakai.gradebook.tool
+[email protected]=sakai.gradebook.tool

kernel/kernel-impl/src/main/java/org/sakaiproject/authz/impl/BaseAuthzGroup.java

@@ -489,7 +489,7 @@ public String getDescription()
 
 		else if (getId().equals("!site.user"))
 		{
-			return "My Workspace AuthzGroup Template";
+			return "Home AuthzGroup Template";
 		}
 
 		else if (getId().startsWith("!user.template"))

kernel/kernel-impl/src/main/java/org/sakaiproject/authz/impl/DbAuthzGroupService.java

@@ -2050,7 +2050,7 @@ public boolean isAllowed(String userId, String lock, Collection<String> realms)
 					&& userId != null && userId.equals(sessionManager().getCurrentSessionUserId())
 			) {
 
-				// First check in the user's own my workspace site realm if it's in the list
+				// First check in the user's own Home site realm if it's in the list
 				// We don't want to change the user's role in their own site, so call the regular function.
 				// This catches permission checks for entity references such as user dropboxes.
 

kernel/kernel-impl/src/main/java/org/sakaiproject/content/impl/BaseContentService.java

@@ -7600,7 +7600,7 @@ public Collection getEntityAuthzGroups(Reference ref, String userId)
 		{
 			boolean isDropbox = false;
 			boolean attachmentOverride = false;
-			// special check for group-user : the grant's in the user's My Workspace site
+			// special check for group-user : the grant's in the user's Home site
 			String parts[] = StringUtil.split(ref.getId(), Entity.SEPARATOR);
 			if ((parts.length > 3) && (parts[1].equals("group-user")))
 			{
@@ -9483,7 +9483,7 @@ protected long bytes2k(long bytes)
 	} // bytes2k
 
 	/**
-	 * gets the quota for a site collection or for a user's my workspace collection
+	 * gets the quota for a site collection or for a user's Home collection
 	 *
 	 * @param collection the collection on which to test for a quota.  this can be the collection for a site
 	 * or a user's workspace collection

library/src/webapp/content/myworkspace_info.html

@@ -37,12 +37,11 @@
 	<body>
 		<div class="portletBody"> 
 		<h3> Welcome to your personal workspace.</h3>
-			<p>In Sakai each user has his or her own individual worksite called Home. My
-			Workspace is a place where you can keep personal documents, create new sites, maintain a
+			<p>In Sakai each user has his or her own individual worksite called "Home".
+			Home is a place where you can keep personal documents, create new sites, maintain a
 			schedule, store resources, and much more.</p>
 			<p class="instruction">The default information displayed here for a new user can be modified by the Sakai
-				Administrator by editing the file sakai.properties configuration value "myworkspace.info.url" to point to the html file desired.</p>
-
+				Administrator by editing the file sakai.properties configuration value "myworkspace.info.url" to point to the HTML file desired.</p>
 		</div>
 	</body>
 </html>

library/src/webapp/content/myworkspace_info_ca.html

@@ -37,10 +37,10 @@
 	<body>
 		<div class="portletBody"> 
 		<h3> Us donem la benvinguda al vostre espai personal. </h3>
-			<p>A Sakai tots els usuaris disposen d'un espai de treball personal anomenat "El meu espai de treball". 
+			<p>A Sakai tots els usuaris disposen d'un espai de treball personal anomenat "Inici".
 			Es tracta d'un espai on poder desar els documents personals, crear espais nous, gestionar l'agenda, el perfil, entre altres possibilitats.</p>
 			<p class="instruction">L'administrador pot modificar la informaci&oacute;n predeterminada que apareix aqu&iacute; pel cas d'un usuari nou.
 			   Per fer-ho cal que editi la propietat "myworkspace.info.url" del fitxer sakai.properties per a que es mostri el fitxer html que desitgi.</p>
 		</div>
 	</body>
-</html>
+</html>

library/src/webapp/content/myworkspace_info_es.html

@@ -37,10 +37,10 @@
 	<body>
 		<div class="portletBody"> 
 		<h3> Bienvenido a su sitio personal. </h3>
-			<p>En Sakai cualquier usuario dispone de un sitio de trabajo personal llamado "Mi sitio". 
+			<p>En Sakai cualquier usuario dispone de un sitio de trabajo personal llamado "Casa".
 			Es un lugar donde puedes guardar tus documentos personales, crear nuevos sitios, gestionar tu agenda, tu perfil y mucho m&aacute;s</p>
 			<p class="instruction">La informaci&oacute;n por defecto que aparece aqu&iacute; para un usuario nuevo se puede modificar por el administrador.
 			   Para ello debe editar la propiedad "myworkspace.info.url" del fichero sakai.properties para que se muestre el fichero html que se desee</p>
 		</div>
 	</body>
-</html>
+</html>

library/src/webapp/content/myworkspace_info_mn.html

@@ -37,8 +37,8 @@
 	<body>
 		<div class="portletBody"> 
 		<h3> Хувийн ажлын хэсэгтээ тавтай морил.</h3>
-			<p>Сакайд хэрэглэгч бүр Home гэж нэрлэгддэг өөрийн тусдаа ажлын хэсэгтэй байна. My
-			Workspace нь та хувийнхаа баримтуудыг хадгалж, шинэ сайт үүсгэж, хуваарь
+			<p>Сакайд хэрэглэгч бүр Home гэж нэрлэгддэг өөрийн тусдаа ажлын хэсэгтэй байна.
+			Home нь та хувийнхаа баримтуудыг хадгалж, шинэ сайт үүсгэж, хуваарь
 			гаргах, нөөцүүд хадгалах,болон өөр олон зүйлийг хийж болох хэсэг юм.</p>
 			<p class="instruction">Энд өгөгдсөн, шинэ хэрэглэгчид зориулсан мэдээллийг Сакайгаас өөрчилж болно.
 				Хүссэн html файлруугаа чиглүүлэхийн тулд sakai.properties тохиргооны үнэлгээ "myworkspace.info.url" файлыг засах администратор.</p>

web/web-tool/tool/src/java/org/sakaiproject/web/tool/IFrameAction.java

@@ -73,7 +73,7 @@
  * </p>
  * <ul>
  * <li>"site" - to show the services "server.info.url" configuration URL setting</li>
- * <li>"workspace" - to show the configured "myworkspace.info.url" URL, introducing a my workspace to users</li>
+ * <li>"workspace" - to show the configured "myworkspace.info.url" URL, introducing a "Home" site to users</li>
  * <li>"worksite" - to show the current site's "getInfoUrlFull()" setting</li>
  * <li>"annotatedurl" - to show a link to a configured target url, with a description following the link. Aid in redirection.</li>
  * </ul>