The TinyMCE library should be moved to intranet-tmpl/lib so that it doesn't have to be duplicated for each translation and so that the translation script won't have to parse it each time. Rather than move the existing library I propose that the old copy be removed an an upgraded version be added to intranet-tmpl/lib/tiny_mce. I also propose that we do not distribute the docs and examples directories, reducing further TinyMCE's overall footprint.
Oh, another proposed change: To create a configuration include in which to specify translatable strings just as we do with the DatePicker and calendar.inc.
The patch for this bug is too large to upload (2.6MB), but there is a branch for it on my Gitorious repo (http://gitorious.org/koha-dev/koha-dev) called ps-bug-9172-tinymce-lib-path-2012-11-30
The branch has been rebased against current master to resolve conflicts. Here is the commit message since I can't attach the patch: Bug 9172 - Move TinyMCE library outside of language-specific directory This patch removes the TinyMCE library from its language-specific location and puts it in intranet-tmpl/lib. The most recent version of TinyMCE is used, and the files added have been limited to those required for proper functionality of the editor. Files omitted: documentation, examples, unused plugins. To test, visit each page which uses the TinyMCE editor: News editing (tools/koha-news.pl), library editing (admin/branches.pl), and online help editing (help/edithelp.pl). The editor should look and function as before.
[SIGNED-OFF]Bug 9172 - Move TinyMCE library outside of language-specific directory Comment: Work as described. Koha complains about forbidden pattern (====), but is a false positive, just comments in function definition. Could be removed, ej #=================================== sub get_params { #=================================== Test 1) git clone git://gitorious.org/koha-dev/koha-dev.git kohaclone 2) git checkout -b bug_9172 origin/ps-bug-9172-tinymce-lib-path-2012-11-30 3) Editor works as usual in News, Help and Branch editing How to merge.. is not my problem :)
(In reply to comment #4) > [SIGNED-OFF]Bug 9172 - Move TinyMCE library outside of language-specific > directory > > Comment: Work as described. Koha complains about forbidden pattern (====), > but is a false positive, just comments in function definition. Could be > removed, > ej > #=================================== > sub get_params { > #=================================== QA comments... the patch looks good, and works perfectly just one change before passing QA, can we please replace or delete the above mentioned string, used for detecting merge conflicts in files ps: i think this patch is a really a bugfix, rather than enhancement :)
> QA comments... > the patch looks good, and works perfectly > > just one change before passing QA, can we please replace or delete the above > mentioned string, used for detecting merge conflicts in files > > ps: i think this patch is a really a bugfix, rather than enhancement :) also, this patch depends on 9926
(In reply to comment #5) > > #=================================== > > sub get_params { > > #=================================== Since these lines are in a file which is part of the TinyMCE distribution I hesitate to modify them. I notice too that we have a couple of examples of that construction in existing Koha scripts: kohaclone/authorities/authorities.pl: 535 # ======================== 536 # MAIN 537: #========================= 538 my $input = new CGI; 539 my $z3950 = $input->param('z3950'); kohaclone/cataloguing/addbiblio.pl: 714 # ======================== 715 # MAIN 716: #========================= 717 my $input = new CGI; 718 my $error = $input->param('error');
(In reply to comment #7) > Since these lines are in a file which is part of the TinyMCE distribution I > hesitate to modify them. I notice too that we have a couple of examples of > that construction in existing Koha scripts: Sorry for my comment, as Owen points there are other files with "===" marks. I think that this may pass, but of course is up to the QA people and RM.
(In reply to comment #7) > (In reply to comment #5) > > > > #=================================== > > > sub get_params { > > > #=================================== > > Since these lines are in a file which is part of the TinyMCE distribution I > hesitate to modify them. yes, i agree :) so, now passing QA on this...
I will need the QAed branch for merging. Mason, could you make it available somewhere?
(In reply to comment #10) > I will need the QAed branch for merging. Mason, could you make it available > somewhere? hmmm, using Owens repo/branch should still apply fine to master (from memory, i had one tiny merge conflict) http://gitorious.org/koha-dev/koha-dev branch is 'ps-bug-9172-tinymce-lib-path-2012-11-30' will that be OK?
(In reply to comment #11) > (In reply to comment #10) > > I will need the QAed branch for merging. Mason, could you make it available > > somewhere? i have signed off on this patch, its available for merging here... https://github.com/KohaAloha/Koha-Dev/tree/bug_9172
This patch has been pushed to master and 3.12.x.
fyi this patch seems to break package builds.