Index: search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages.properties
===================================================================
--- search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages.properties (revision 66963)
+++ search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages.properties (working copy)
@@ -40,3 +40,31 @@
jsp_results_no_perm_plural={0} items matched the search terms but are not available (the items may have been deleted or moved, or you may not have permission to view them).
jsp_results_no_perm_singular={0} item matched the search terms but is not available (the item may have been deleted or moved, or you may not have permission to view it)
+jsp_searchadmin_index_last_loaded = Last loaded at {0} in {1}
Being indexed by {2} expected fo finish before {3}
Index contains {4} documents and {5} pending
+vm_searchadmin_last_loaded=Last loaded at
+vm_searchadmin_in=in
+vm_searchadmin_being_indexed=Being indexed by
+vm_searchadmin_expected_before=expected to finish before
+vm_searchadmin_index_contains=Index contains
+vm_searchadmin_documents=documents and
+vm_searchadmin_pending=pending
+
+
+searchadmin_index_adminsearch=Admin Search:
+searchadmin_index_search=Search
+searchadmin_index_master_control_records=Master Control Records
+searchadmin_index_context=Context
+searchadmin_index_operation=Operation
+searchadmin_index_current_status=Current Status
+searchadmin_index_last_update=Last Update
+searchadmin_index_site_control_records=Site Control Records
+searchadmin_index_list_index=A list of index workers
+searchadmin_index_indexer_workers=Indexer Workers
+searchadmin_index_due_before=Due Before
+searchadmin_index_worker_thread=Worker Thread
+searchadmin_index_status=Status
+searchadmin_index_list_segments=A list index segments
+searchadmin_index_segments=Segments
+searchadmin_index_segment_name=Segment Name
+searchadmin_index_segment_size=Size
+searchadmin_index_segment_last_update=Last update
Index: search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages_ca.properties
===================================================================
--- search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages_ca.properties (revision 66963)
+++ search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages_ca.properties (working copy)
@@ -55,7 +55,4 @@
jsp_results_no_perm_plural={0} elements coincideixen amb la cadena de b�squeda per� no estan disponibles (els elements han estat esborrats o moguts, o potser no t� permisos per veure'ls).
jsp_results_no_perm_singular={0} element coincideix amb la cadena de b�squeda per� no est� disponible (l'element deu haver estat esborrat o mogut, o potser no t� permisos per veure'l).
searchadmin_cmd_disablediagnostics=Desactivar diagn�stics
-searchadmin_cmd_enablediagnostics=Activar diagn�stics
-
-
-
+searchadmin_cmd_enablediagnostics=Activar diagn�stics
\ No newline at end of file
Index: search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages_es.properties
===================================================================
--- search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages_es.properties (revision 66971)
+++ search-tool/tool/src/bundle/org/sakaiproject/search/tool/bundle/Messages_es.properties (working copy)
@@ -38,3 +38,32 @@
jsp_results_no_perm_plural= {0} elementos coincidieron con los t\u00E9minos de b\u00FAqueda pero no est\u00E1n disponibles (los elementos pueden haber sido eliminados o movidos, o puede ser que no tenga permisos para verlos).
jsp_results_no_perm_singular= {0} elemento coincidi\u00F3 con los t\u00E9minos de b\u00FAqueda pero no est\u00E1 disponible (el elemento pueden haber sido eliminado o movido, o puede ser que no tenga permisos para verlo)
+jsp_sakai_search_title=Buscar
+
+jsp_searchadmin_index_last_loaded = \u00D9ltima carga el {0} en {1}.
Est\u00E1 siendo indexado por {2} y se espera que termine antes de {3}.
El \u00EDndice contiene {4} documentos y {5} pendientes
+vm_searchadmin_last_loaded=\u00D9ltima carga el
+vm_searchadmin_in=en
+vm_searchadmin_being_indexed=Est\u00E1 siendo indexado por
+vm_searchadmin_expected_before=y se espera que termine antes de
+vm_searchadmin_index_contains=El \u00EDndice contiene
+vm_searchadmin_documents=documentos y
+vm_searchadmin_pending=pendientes
+
+searchadmin_index_adminsearch=B\u00FAsqueda del administrador:
+searchadmin_index_search=Buscar
+searchadmin_index_master_control_records=Registros de Control Maestro
+searchadmin_index_context=Contexto
+searchadmin_index_operation=Operaci\u00F3n
+searchadmin_index_current_status=Estado Actual
+searchadmin_index_last_update=\u00D9ltima Actualizaci\u00F3n
+searchadmin_index_site_control_records=Registros de Control del Sitio
+searchadmin_index_list_index=Una lista de trabajadores de \u00EDndices
+searchadmin_index_indexer_workers=Trabajadores de \u00EDndices
+searchadmin_index_due_before=Acabado antes de
+searchadmin_index_worker_thread=Hilo del trabajador
+searchadmin_index_status=Estado
+searchadmin_index_list_segments=Una lista de los segmentos de \u00EDndices
+searchadmin_index_segments=Segmentos
+searchadmin_index_segment_name=Nombre del segmento
+searchadmin_index_segment_size=Tama\u00F1o
+searchadmin_index_segment_last_update=\u00D9ltima Actualizaci\u00F3n
\ No newline at end of file
Index: search-tool/tool/src/webapp/WEB-INF/pages/admin/index.jsp
===================================================================
--- search-tool/tool/src/webapp/WEB-INF/pages/admin/index.jsp (revision 66963)
+++ search-tool/tool/src/webapp/WEB-INF/pages/admin/index.jsp (working copy)
@@ -6,7 +6,7 @@
org.sakaiproject.search.tool.SearchAdminBean searchAdminBean = searchBeanFactory.newSearchAdminBean(request);
String adminOptionsFormat = "{1}";
- String indexStatusFormat = "Last loaded at {0} in {1}
Being indexed by {2} expected fo finish before {3}
Index contains {4} documents and {5} pending ";
+ String indexStatusFormat = org.sakaiproject.search.tool.Messages.getString("jsp_searchadmin_index_last_loaded") + " ";
String masterRowFormat = "
{2} | {3} | {4} | {5} |
";
String workerRowFormat = "{0} | {1} | {2} |
";
String segmentInfoRowFormat = "{0} | {1} | {2} |
";
@@ -16,7 +16,7 @@
- Admin Search: <%= searchAdminBean.getTitle() %>
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_adminsearch")%> <%= searchAdminBean.getTitle() %>
<%= request.getAttribute("sakai.html.head") %>
- Search
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_search")%>
<%= searchAdminBean.getAdminOptions(adminOptionsFormat) %>
@@ -37,24 +37,42 @@
<%= searchAdminBean.getIndexStatus(indexStatusFormat) %>
-
- Master Control Records |
- Context | Operation | Current Status | Last Update |
+ " >
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_master_control_records")%> |
+
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_context")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_operation")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_current_status")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_last_update")%> |
+
<%= searchAdminBean.getGlobalMasterDocuments(masterRowFormat) %>
-
- Site Control Records |
- Context | Operation | Current Status | Last Update |
+ ">
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_site_control_records")%> |
+
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_context")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_operation")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_current_status")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_last_update")%> |
+
<%= searchAdminBean.getSiteMasterDocuments(masterRowFormat) %>
-
- Indexer Workers |
- Worker Thread | Due Before | Status |
+ ">
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_indexer_workers")%> |
+
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_worker_thread")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_due_before")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_status")%> |
+
<%= searchAdminBean.getWorkers(workerRowFormat) %>
-
- Segments |
- Segment Name | Size | Last Update |
+ " >
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_segments")%> |
+
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_segment_name")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_segment_size")%> |
+ <%=org.sakaiproject.search.tool.Messages.getString("searchadmin_index_segment_last_update")%> |
+
<%= searchAdminBean.getSegmentInfo(segmentInfoRowFormat) %>
Index: search-tool/tool/src/webapp/WEB-INF/vm/admin/index.vm
===================================================================
--- search-tool/tool/src/webapp/WEB-INF/vm/admin/index.vm (revision 66963)
+++ search-tool/tool/src/webapp/WEB-INF/vm/admin/index.vm (working copy)
@@ -3,7 +3,7 @@