Changeset 1542

Show
Ignore:
Timestamp:
12/19/2009 08:40:03 PM (9 months ago)
Author:
BrianKoontz
Message:

Moved strings to language file. Refs #821.

Location:
branches/1.3
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/1.3/actions/textsearch/textsearch.php

    r1483 r1542  
    2020 * @todo        i18n search button text   
    2121 */ 
    22  
    23         //constants 
    24         if (!defined('SEARCH_FOR')) define('SEARCH_FOR', 'Search for'); 
    25         if (!defined('SEARCH_ZERO_MATCH')) define('SEARCH_ZERO_MATCH', 'No matches'); 
    26         if (!defined('SEARCH_ONE_MATCH')) define('SEARCH_ONE_MATCH', 'One match found'); 
    27         if (!defined('SEARCH_N_MATCH')) define('SEARCH_N_MATCH', 'There was %d matches found'); 
    28         if (!defined('SEARCH_RESULTS')) define('SEARCH_RESULTS', 'Search results: <strong>%1$s</strong> for <strong>%2$s</strong>'); #%1$s: n matches for | %2$s: search term 
    29         if (!defined('SEARCH_TRY_EXPANDED')) define('SEARCH_TRY_EXPANDED', '<br />Not sure which page to choose?<br />Try the <a href="$1">Expanded Text Search</a> which shows surrounding text.'); 
    30         if (!defined('SEARCH_TIPS')) define('SEARCH_TIPS', "<br /><br /><hr /><br /><strong>Search Tips:</strong><br /><br />" 
    31                 ."<div class=\"indent\"><tt>apple banana</tt></div>" 
    32                 ."Find pages that contain at least one of the two words. <br />" 
    33                 ."<br />" 
    34                 ."<div class=\"indent\"><tt>+apple +juice</tt></div>" 
    35                 ."Find pages that contain both words. <br />" 
    36                 ."<br />" 
    37                 ."<div class=\"indent\"><tt>+apple -macintosh</tt></div>" 
    38                 ."Find pages that contain the word 'apple' but not 'macintosh'. <br />" 
    39                 ."<br />" 
    40                 ."<div class=\"indent\"><tt>apple*</tt></div>" 
    41                 ."Find pages that contain words such as apple, apples, applesauce, or applet. <br />" 
    42                 ."<br />" 
    43                 ."<div class=\"indent\"><tt>\"some words\"</tt></div>" 
    44                 ."Find pages that contain the exact phrase 'some words' (for example, pages that contain 'some words of wisdom' <br />" 
    45                 ."but not 'some noise words'). <br />"); 
    4622 
    4723// init 

  • branches/1.3/actions/textsearchexpanded/textsearchexpanded.php

    r1490 r1542  
    2121 
    2222 //constants 
    23         if (!defined('SEARCH_MYSQL_IDENTICAL_CHARS')) define('SEARCH_MYSQL_IDENTICAL_CHARS', 'aàáâã,eèéêë,iìîï,oòóôõ,uùúû,cç,nñ,yý'); 
    2423 
    2524// init 

  • branches/1.3/lang/en/en.inc.php

    r1541 r1542  
    778778 * Language constant shared by the {@link textsearch.php textsearch} and {@link textsearchexpanded.php textsearchexpanded} actions 
    779779 */ 
    780 // textsearch & textsearchexpanded 
    781 define('SEARCH_FOR', 'Search for'); 
    782 define('SEARCH_ZERO_MATCH', 'No matches'); 
    783 define('SEARCH_ONE_MATCH', 'One match found'); 
    784 define('SEARCH_N_MATCH', '%d matches found'); // %d - number of hits 
    785 define('SEARCH_RESULTS', 'Search results: <strong>%1$s</strong> for <strong>%2$s</strong>'); # %1$s: n matches for | %2$s: search term 
    786 define('SEARCH_NOT_SURE_CHOICE', 'Not sure which page to choose?'); 
    787 define('SEARCH_EXPANDED_LINK_DESC', 'Expanded Text Search'); // search link description 
    788 define('SEARCH_TRY_EXPANDED', 'Try the %s which shows surrounding text.'); // %s expanded search link 
    789 /* 
    790 define('SEARCH_TIPS', "<br /><br /><hr /><br /><strong>Search Tips:</strong><br /><br />" 
    791         ."<div class=\"indent\">apple banana</div>" 
     780if (!defined('SEARCH_FOR')) define('SEARCH_FOR', 'Search for'); 
     781if (!defined('SEARCH_ZERO_MATCH')) define('SEARCH_ZERO_MATCH', 'No matches'); 
     782if (!defined('SEARCH_ONE_MATCH')) define('SEARCH_ONE_MATCH', 'One match found'); 
     783if (!defined('SEARCH_N_MATCH')) define('SEARCH_N_MATCH', 'There was %d matches found'); 
     784if (!defined('SEARCH_RESULTS')) define('SEARCH_RESULTS', 'Search results: <strong>%1$s</strong> for <strong>%2$s</strong>'); #%1$s: n matches for | %2$s: search term 
     785if (!defined('SEARCH_TRY_EXPANDED')) define('SEARCH_TRY_EXPANDED', '<br />Not sure which page to choose?<br />Try the <a href="$1">Expanded Text Search</a> which shows surrounding text.'); 
     786if (!defined('SEARCH_TIPS')) define('SEARCH_TIPS', "<br /><br /><hr /><br /><strong>Search Tips:</strong><br /><br />" 
     787        ."<div class=\"indent\"><tt>apple banana</tt></div>" 
    792788        ."Find pages that contain at least one of the two words. <br />" 
    793789        ."<br />" 
    794         ."<div class=\"indent\">+apple +juice</div>" 
     790        ."<div class=\"indent\"><tt>+apple +juice</tt></div>" 
    795791        ."Find pages that contain both words. <br />" 
    796792        ."<br />" 
    797         ."<div class=\"indent\">+apple -macintosh</div>" 
     793        ."<div class=\"indent\"><tt>+apple -macintosh</tt></div>" 
    798794        ."Find pages that contain the word 'apple' but not 'macintosh'. <br />" 
    799795        ."<br />" 
    800         ."<div class=\"indent\">apple*</div>" 
     796        ."<div class=\"indent\"><tt>apple*</tt></div>" 
    801797        ."Find pages that contain words such as apple, apples, applesauce, or applet. <br />" 
    802798        ."<br />" 
    803         ."<div class=\"indent\">\"some words\"</div>" 
     799        ."<div class=\"indent\"><tt>\"some words\"</tt></div>" 
    804800        ."Find pages that contain the exact phrase 'some words' (for example, pages that contain 'some words of wisdom' <br />" 
    805801        ."but not 'some noise words'). <br />"); 
    806 */ 
    807 define('SEARCH_TIPS', 'Search Tips:'); 
    808 define('SEARCH_WORD_1', 'apple'); 
    809 define('SEARCH_WORD_2', 'banana'); 
    810 define('SEARCH_WORD_3', 'juice'); 
    811 define('SEARCH_WORD_4', 'macintosh'); 
    812 define('SEARCH_WORD_5', 'some'); 
    813 define('SEARCH_WORD_6', 'words'); 
    814 define('SEARCH_PHRASE',sprintf('%s %s',SEARCH_WORD_5,SEARCH_WORD_6)); 
    815 define('SEARCH_TARGET_1', 'Find pages that contain at least one of the two words.'); 
    816 define('SEARCH_TARGET_2', 'Find pages that contain both words.'); 
    817 define('SEARCH_TARGET_3',sprintf("Find pages that contain the word '%1\$s' but not '%2\$s'.",SEARCH_WORD_1,SEARCH_WORD_4)); 
    818 define('SEARCH_TARGET_4',"Find pages that contain words such as 'apple', 'apples', 'applesauce', or 'applet'."); // make sure target words all *start* with SEARCH_WORD_1 
    819 define('SEARCH_TARGET_5',sprintf("Find pages that contain the exact phrase '%1\$s' (for example, pages that contain '%1\$s of wisdom' but not '%2\$s noise %3\$s').",SEARCH_PHRASE,SEARCH_WORD_5,SEARCH_WORD_6)); 
    820 define('SEARCH_MAX_SNIPPETS', 3); 
     802if (!defined('SEARCH_MYSQL_IDENTICAL_CHARS')) define('SEARCH_MYSQL_IDENTICAL_CHARS', 'aàáâã,eèéêë,iìîï,oòóôõ,uùúû,cç,nñ,yý'); 
    821803/**#@-*/ 
    822804