git.equinoxoli.org Git - koha-equinox.git/commit

author	Jared Camins-Esakov <jcamins@cpbibliography.com>
	Sun, 4 Aug 2013 14:15:14 +0000 (10:15 -0400)
committer	Galen Charlton <gmc@esilibrary.com>
	Thu, 10 Oct 2013 21:37:31 +0000 (21:37 +0000)
commit	cbd95910104e38545ef4371099f3af0584a5f301
tree	2a0058d5a73b1e1c58a9711e2e6438e935ef142d	tree \| snapshot
parent	1460065d244b4a54350cf83c23fdc560e773e34b	commit \| diff

Bug 5202: QA follow-up 2 - fix overeager error message

When rebasing the patch for this, I accidentally moved the line
setting the mergereference when merging from breeding to *before*
I checked whether we were merging from breeding. Needless to say,
this caused problems. This patch fixes that, and:
* Makes the error translatable.
* Adds a missing authtypesloop argument for the template.

Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>

authorities/merge.pl		diff \| blob \| history
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt		diff \| blob \| history