[Koha-cvs] CVS: koha/admin branches.pl,1.22.2.3,1.22.2.4

[Ambrose C. LI]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28544/admin

Modified Files:
      Tag: rel_2_0
	branches.pl 
Log Message:
Make the page headings translatable while trying not to break old templates


Index: branches.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/branches.pl,v
retrieving revision 1.22.2.3
retrieving revision 1.22.2.4
diff -C2 -r1.22.2.3 -r1.22.2.4
*** branches.pl	26 Jan 2004 10:36:03 -0000	1.22.2.3
--- branches.pl	11 Mar 2004 05:16:50 -0000	1.22.2.4
***************
*** 11,15 ****
  #        notify translators
  # FIXME: need to implement the branch categories stuff
- # FIXME: heading() need to be moved to templates, need to notify translators
  # FIXME: there are too many TMPL_IF's; the proper way to do it is to have
  #        separate templates for each individual action; need to notify
--- 11,14 ----
***************
*** 18,21 ****
--- 17,26 ----
  #        of these should be converted into exported booleans / counters etc
  #        so that the error messages can be localized; need to notify translators
+ #
+ # NOTE:  heading() should now be called like this:
+ #        1. Use heading() as before
+ #        2. $template->param('heading-LISPISHIZED-HEADING-p' => 1);
+ #        3. $template->param('use-heading-flags-p' => 1);
+ #        This ensures that both converted and unconverted templates work
  
  # Finlay working on this file from 26-03-2002
***************
*** 82,85 ****
--- 87,92 ----
  	# If the user has pressed the "add new branch" button.
  	heading("Branches: Add Branch");
+ 	$template->param('heading-branches-add-branch-p' => 1);
+ 	$template->param('use-heading-flags-p' => 1);
  	editbranchform();
  
***************
*** 87,90 ****
--- 94,99 ----
  	# if the user has pressed the "edit branch settings" button.
  	heading("Branches: Edit Branch");
+ 	$template->param('heading-branches-edit-branch-p' => 1);
+ 	$template->param('use-heading-flags-p' => 1);
  	$template->param(add => 1);
  	editbranchform($branchcode);
***************
*** 115,120 ****
  	default("The branch with code $branchcode has been deleted.");
  } elsif ($op eq 'editcategory') {
! 	# If the user has pressed the "add new category" button.
  	heading("Branches: Edit Category");
  	editcatform($categorycode);
  } elsif ($op eq 'addcategory_validate') {
--- 124,131 ----
  	default("The branch with code $branchcode has been deleted.");
  } elsif ($op eq 'editcategory') {
! 	# If the user has pressed the "add new category" or "modify" buttons.
  	heading("Branches: Edit Category");
+ 	$template->param('heading-branches-edit-category-p' => 1);
+ 	$template->param('use-heading-flags-p' => 1);
  	editcatform($categorycode);
  } elsif ($op eq 'addcategory_validate') {
***************
*** 158,161 ****
--- 169,174 ----
  	my ($message) = @_;
  	heading("Branches");
+ 	$template->param('heading-branches-p' => 1);
+ 	$template->param('use-heading-flags-p' => 1);
  	$template->param(message => $message);
  	$template->param(action => $script_name);