Show
Ignore:
Timestamp:
05/21/08 10:44:04 (5 months ago)
Author:
erickson
Message:

Merged revisions 9641-9642,9649-9650,9652 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........

r9641 | miker | 2008-05-19 14:01:23 -0400 (Mon, 19 May 2008) | 1 line


simple xslt (with embeded usage info) for extracting perms from the IDL permacrud definitions

........

r9642 | miker | 2008-05-19 14:17:07 -0400 (Mon, 19 May 2008) | 1 line


script to find new perms from permacrud that are not in the permission seed data yet

........

r9649 | dbs | 2008-05-20 23:42:34 -0400 (Tue, 20 May 2008) | 8 lines


Patch from Craig Ricciuto:


opac.xul changes:


cat.properties changes:

  • Added the strings from opac.xul

........

r9650 | dbs | 2008-05-21 00:23:02 -0400 (Wed, 21 May 2008) | 16 lines


i18n patch from Craig Ricciuto:


Changes for record_buckets.xul:

  • converted hard-coded strings in the JavaScript? to be stored in the DTD.
  • No XML strings to change.

    Changes for record_buckets.js:
  • Removed trailing commas in places
  • Converted all hard-coded strings to use JavaScript? from the .properties file(s)

    Changes for cat.properties:
  • Added the property string names/values from record_buckets.js/.xul

    Changes for common.properties:
  • Added a common string that appear multiple times in record_buckets.js to here.

........

r9652 | dbs | 2008-05-21 10:30:54 -0400 (Wed, 21 May 2008) | 7 lines


i18n patch from Craig Ricciuto (Laurentian University):


opac.xul: Converted a string that was missed
record_buckets.js: Converted a string that was missed


cat.properties: Added the variables and values for the missed strings from above files

........

Location:
branches/acq-experiment
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • branches/acq-experiment

    • Property svnmerge-integrated changed from /trunk:1-9634 to /trunk:1-9652
  • branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/opac.xul

    r9536 r9653  
    3333        <script> 
    3434        <![CDATA[ 
     35                function $(id) { return document.getElementById(id); } 
     36                function $w(id,text) { if ($(id)) util.widgets.set_text($(id),text); } 
    3537 
    3638                var docid; var marc_html; var top_pane; var bottom_pane; var opac_frame;  
     
    4547                        try { 
    4648                                netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect"); 
    47                 if (typeof JSAN == 'undefined') { throw( "The JSAN library object is missing."); } 
     49                                        if (typeof JSAN == 'undefined') { throw( $("commonStrings").getString('common.jsan.missing') ); } 
    4850                                JSAN.errorLevel = "die"; // none, warn, or die 
    4951                                JSAN.addRepository('/xul/server/'); 
     
    6769 
    6870                        } catch(E) { 
    69                                 var err_msg = "!! This software has encountered an error.  Please tell your friendly " + 
    70                                         "system administrator or software developer the following:\ncat/opac.xul\n" + E + '\n'; 
     71                                var err_msg = $("commonStrings").getFormattedString('common.exception', ['cat/opac.xul', E]); 
    7172                                try { g.error.sdump('D_ERROR',err_msg); } catch(E) { dump(err_msg); } 
    7273                                alert(err_msg); 
     
    8586                                                'set_tab_name' : function(n) {  
    8687                                                        if (typeof window.xulG == 'object' && typeof window.xulG.set_tab_name == 'function') { 
    87                                                                 try { window.xulG.set_tab_name('Bib Record: ' + n); } catch(E) { alert(E); } 
     88                                                                try { window.xulG.set_tab_name($("catStrings").getFormattedString('staff.cat.opac.set_tab_name', [n])); } catch(E) { alert(E); } 
    8889                                                        } else { 
    8990                                                                dump('no set_tab_name\n'); 
     
    127128                                                                                throw(r); 
    128129                                                                        } else { 
    129                                                                                 alert('Record successfully saved.'); 
     130                                                                                alert( $("catStrings").getString('staff.cat.opac.set_marc_edit.alert') ); 
    130131                                                                        } 
    131132                                                                } catch(E) { 
    132                                                                                 g.error.standard_unexpected_error_alert('Record not likely updated.',E); 
     133                                                                                g.error.standard_unexpected_error_alert( $("catStrings").getString('staff.cat.opac.set_marc_edit.std_unexpected_error'), E ); 
    133134                                                                } 
    134135                                                        } 
     
    321322 
    322323                function refresh() { 
    323                         alert('Not yet implemented.  Work around: Choose Duplicate in New Tab option'); 
     324                        alert( $("catStrings").getString('staff.cat.opac.refresh.function_not_implemented.alert') ); 
    324325                } 
    325326        ]]> 
    326327        </script> 
     328         
     329        <messagecatalog id="catStrings" src="/xul/server/locale/<!--#echo var='locale'-->/cat.properties" /> 
     330        <messagecatalog id="circStrings" src="/xul/server/locale/<!--#echo var='locale'-->/circ.properties" /> 
     331        <messagecatalog id="commonStrings" src="/xul/server/locale/<!--#echo var='locale'-->/common.properties" /> 
    327332 
    328333        <commandset><command id="cmd_forward"/><command id="cmd_back"/></commandset>