From 18e4313cf34b0fbaf77606724c5a7ee1150faaa8 Mon Sep 17 00:00:00 2001 From: Ben Shum Date: Thu, 11 Feb 2016 15:40:05 -0500 Subject: [PATCH] LP#1544606: Change i18n Makefile so that there are different dirs for opac vs webstaff In i18n Makefile, we only have a single directory variable TT2_DATA_DIR. Remove that variable, and add distinct variables for TT2_OPAC_DATA_DIR and TT2_WEBSTAFF_DATA_DIR that point to more distinct defined areas. Signed-off-by: Ben Shum Signed-off-by: Jason Stephenson --- build/i18n/Makefile | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/build/i18n/Makefile b/build/i18n/Makefile index 4370b97be3..41f8e2da18 100644 --- a/build/i18n/Makefile +++ b/build/i18n/Makefile @@ -6,7 +6,8 @@ POTLIST=$(shell ls -d po/*) DTDDIR=../../Open-ILS/web/opac/locale CHROME_PROPSDIR=../../Open-ILS/xul/staff_client/chrome/locale SERVER_PROPSDIR=../../Open-ILS/xul/staff_client/server/locale -TT2_DATA_DIR=../../Open-ILS/src/data/locale +TT2_OPAC_DATA_DIR=../../Open-ILS/src/data/locale/opac +TT2_WEBSTAFF_DATA_DIR=../../Open-ILS/src/data/locale/staff DOJO_LOCALE := $(shell echo ${LOCALE} | tr '[:upper:]' '[:lower:]') DOJO_ACQ_SRC=../../Open-ILS/web/js/dojo/openils/acq/nls DOJO_ACTOR_SRC=../../Open-ILS/web/js/dojo/openils/actor/nls @@ -362,9 +363,10 @@ install: updatepo project fmidl2fmidlent fmidlpo2entity-en cp $(PROJECT)/$(LOCALE)/Searcher.js $(DOJO_WIDGET_SRC)/$(DOJO_LOCALE)/Searcher.js cp $(PROJECT)/$(LOCALE)/TranslatorPopup.js $(DOJO_WIDGET_SRC)/$(DOJO_LOCALE)/TranslatorPopup.js cp $(PROJECT)/$(LOCALE)/XULTermLoader.js $(DOJO_WIDGET_SRC)/$(DOJO_LOCALE)/XULTermLoader.js - mkdir -p $(TT2_DATA_DIR) - cp $(PO)/tpac/$(LOCALE).po $(TT2_DATA_DIR)/. - cp $(PO)/webstaff/$(LOCALE).po $(TT2_DATA_DIR)/. + mkdir -p $(TT2_OPAC_DATA_DIR) + cp $(PO)/tpac/$(LOCALE).po $(TT2_OPAC_DATA_DIR)/. + mkdir -p $(TT2_WEBSTAFF_DATA_DIR) + cp $(PO)/webstaff/$(LOCALE).po $(TT2_WEBSTAFF_DATA_DIR)/. install_all_locales: newpot for i in `ls po/*/*po|grep -v en-US | cut -f3 -d'/' | cut -f1 -d. | sort | uniq`; \ -- 2.11.0