[LON-CAPA-cvs] cvs: loncom /interface lonsearchcat.pm /localize/localize de.pm es.pm zh.pm

[bisitz]

bisitz		Fri Oct 23 16:55:19 2009 EDT

  Modified files:              
    /loncom/interface	lonsearchcat.pm 
    /loncom/localize/localize	de.pm es.pm zh.pm 
  Log:
  Basic Search:
  - Exclude checkbox from &mt() call
  - Highlight domain
  - de.pm: wording optimized
  
  
Index: loncom/interface/lonsearchcat.pm
diff -u loncom/interface/lonsearchcat.pm:1.317 loncom/interface/lonsearchcat.pm:1.318
--- loncom/interface/lonsearchcat.pm:1.317	Thu Oct 22 13:48:55 2009
+++ loncom/interface/lonsearchcat.pm	Fri Oct 23 16:55:15 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Search Catalog
 #
-# $Id: lonsearchcat.pm,v 1.317 2009/10/22 13:48:55 bisitz Exp $
+# $Id: lonsearchcat.pm,v 1.318 2009/10/23 16:55:15 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -770,14 +770,26 @@
                               portfolio => 'Portfolio Search',
     );
     my ($userelatedwords,$onlysearchdomain,$inclext,$adv_search_link,$scrout);
-    $userelatedwords = '<label>'.&mt('[_1] use related words',
-      &Apache::lonhtmlcommon::checkbox('related',$env{'form.related'},'related')).
-                       '</label>';
-    $onlysearchdomain = '<label>'.&mt('[_1] only search domain [_2]',
-      &Apache::lonhtmlcommon::checkbox('domains',$env{'form.domains'},
-                                       $r->dir_config('lonDefDomain')),
-				      $r->dir_config('lonDefDomain')).
-                        '</label>';
+
+    $userelatedwords = '<label>'
+                      .&Apache::lonhtmlcommon::checkbox(
+                           'related',
+                           $env{'form.related'},
+                           'related')
+                      .' '
+                     .&mt('use related words')
+                     .'</label>';
+
+    $onlysearchdomain = '<label>'
+                       .&Apache::lonhtmlcommon::checkbox(
+                           'domains',
+                           $env{'form.domains'},
+                           $r->dir_config('lonDefDomain'))
+                       .' '
+                       .&mt('only search domain [_1]'
+                               ,'<b>'.$r->dir_config('lonDefDomain').'</b>')
+                       .'</label>';
+
     $adv_search_link = '<a href="/adm/searchcat?'.
 	               &Apache::loncommon::inhibit_menu_check().
 		       '&amp;phase=disp_adv'.
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.332 loncom/localize/localize/de.pm:1.333
--- loncom/localize/localize/de.pm:1.332	Fri Oct 23 16:14:46 2009
+++ loncom/localize/localize/de.pm	Fri Oct 23 16:55:18 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.332 2009/10/23 16:14:46 bisitz Exp $
+# $Id: de.pm,v 1.333 2009/10/23 16:55:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4679,8 +4679,8 @@
    'only check if you know what you are doing'
 => 'nur auswählen, wenn Sie wissen, was Sie tun',
 
-   '[_1] only search domain [_2]' # 1: checkbox, 2: domain
-=> '[_1] Nur in Domäne [_2] suchen',
+   'only search domain [_1]'
+=> 'nur in Domäne [_1] suchen',
 
    'optional'
 => 'optional',
@@ -4728,10 +4728,7 @@
 => 'Gesamte Auswahl aufheben',
 
    'use related words'
-=> 'Verwende ähnliche Wörter',
-
-   '[_1] use related words'
-=> '[_1] verwende ähnliche Wörter',
+=> 'ähnliche Wörter verwenden',
 
    'username'
 => 'Benutzerkennung',
Index: loncom/localize/localize/es.pm
diff -u loncom/localize/localize/es.pm:1.32 loncom/localize/localize/es.pm:1.33
--- loncom/localize/localize/es.pm:1.32	Fri Oct 23 16:14:47 2009
+++ loncom/localize/localize/es.pm	Fri Oct 23 16:55:18 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Spanish Localization Lexicon
 #
-# $Id: es.pm,v 1.32 2009/10/23 16:14:47 bisitz Exp $
+# $Id: es.pm,v 1.33 2009/10/23 16:55:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4725,8 +4725,8 @@
    'only check if you know what you are doing'
 => 'seleccione sólo si sabe lo que está haciendo',
 
-   '[_1] only search domain [_2]' # 1: checkbox, 2: domain
-=> '[_1] buscar sólo en el dominio [_2]',
+   'only search domain [_1]'
+=> 'buscar sólo en el dominio [_1]',
 
    'optional'
 => 'opcional',
@@ -4773,9 +4773,6 @@
    'use related words'
 => 'utilice palabras similares',
 
-   '[_1] use related words'
-=> '[_1] utilice palabras similares',
-
    'username'
 => 'usuario',
 
Index: loncom/localize/localize/zh.pm
diff -u loncom/localize/localize/zh.pm:1.81 loncom/localize/localize/zh.pm:1.82
--- loncom/localize/localize/zh.pm:1.81	Fri Oct 23 16:14:47 2009
+++ loncom/localize/localize/zh.pm	Fri Oct 23 16:55:18 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Chinese Simplified Localization Lexicon
 #
-# $Id: zh.pm,v 1.81 2009/10/23 16:14:47 bisitz Exp $
+# $Id: zh.pm,v 1.82 2009/10/23 16:55:18 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4721,8 +4721,8 @@
    'only check if you know what you are doing'
 => 'nur auswählen, wenn Sie wissen, was Sie tun',
 
-   '[_1] only search domain [_2]' # 1: checkbox, 2: domain
-=> '[_1] 只在该域 [_2] 搜索',
+   'only search domain [_1]'
+=> '只在该域 [_1] 搜索',
 
    'optional'
 => '可选的',
@@ -4769,9 +4769,6 @@
    'use related words'
 => '使用相关的关键词',
 
-   '[_1] use related words'
-=> '[_1] 使用相关的关键词',
-
    'username'
 => '用户名',