From 884a77ecb5505154ba2eb37fa758346c735c7236 Mon Sep 17 00:00:00 2001 From: bradymiller Date: Tue, 7 Jan 2014 20:22:00 -0800 Subject: [PATCH] Fix to using most recent development translation set on development demo. Github can not serve text files are 10MB, so needed a work around. The development demo now serves this file; this is not ideal since it goes down for about 20 minutes a day while resetting, but it at least works for now. Will also direct the wiki link for most recent translation development set to this file. --- contrib/util/installScripts/InstallerAuto.php | 2 +- contrib/util/installScripts/cvsDemoInstall | 12 ++++++++++++ library/classes/Installer.class.php | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/contrib/util/installScripts/InstallerAuto.php b/contrib/util/installScripts/InstallerAuto.php index 061d221e6..987594a7f 100644 --- a/contrib/util/installScripts/InstallerAuto.php +++ b/contrib/util/installScripts/InstallerAuto.php @@ -45,7 +45,7 @@ // no_root_db_access -> if set to anything, will use pre-created and pre-configured login/pass/dbname and // will disable cloning / migration since that generally requires root access to the db // development_translations -> If set to anything, will then download and use the development set (updated daily) -// of translations from the github repository. +// of translations (indirectly) from the github repository. // // Examples of use: // 1) Install using default configuration settings diff --git a/contrib/util/installScripts/cvsDemoInstall b/contrib/util/installScripts/cvsDemoInstall index ad99228ff..b44b635ef 100644 --- a/contrib/util/installScripts/cvsDemoInstall +++ b/contrib/util/installScripts/cvsDemoInstall @@ -13,6 +13,10 @@ # Logs errors. # +# OPTIONS +#flag for the isntance to serve as the developer translation set server +translationServe=true + # PATH VARIABLES WEB=/var/www/html OPENEMR=$WEB/openemr @@ -21,6 +25,8 @@ CVS=/home/openemr/cvs GITMAIN=/home/openemr/git GIT=$GITMAIN/openemr TMPDIR=/tmp/openemr-tmp +TRANSSERVEDIR=$WEB/translations +GITTRANS=$GITMAIN/translations_development_openemr # PATH OF INSTALL SCRIPT INST=$OPENEMR/contrib/util/installScripts/InstallerAuto.php @@ -66,6 +72,12 @@ if ! [ -d $GITMAIN ]; then mkdir -p $GITMAIN cd $GITMAIN git clone git://github.com/openemr/openemr.git + if $translationServe ; then + # download the translations git repo and place the set sql file for serving + git clone git://github.com/openemr/translations_development_openemr.git + mkdir -p $TRANSSERVEDIR + cp $GITTRANS/languageTranslations_utf8.sql $TRANSSERVEDIR/ + fi else echo "The OpenEMR git repository already exist" echo "The OpenEMR git repository already exist" >> $LOG diff --git a/library/classes/Installer.class.php b/library/classes/Installer.class.php index d255473aa..5976307e2 100644 --- a/library/classes/Installer.class.php +++ b/library/classes/Installer.class.php @@ -41,7 +41,7 @@ class Installer // Record names of sql table files $this->main_sql = dirname(__FILE__) . '/../../sql/database.sql'; $this->translation_sql = dirname(__FILE__) . '/../../contrib/util/language_translations/currentLanguage_utf8.sql'; - $this->devel_translation_sql = "http://github.com/openemr/translations_development_openemr/raw/master/languageTranslations_utf8.sql"; + $this->devel_translation_sql = "http://demo.open-emr.org:2089/translations/languageTranslations_utf8.sql"; $this->ippf_sql = dirname(__FILE__) . "/../../sql/ippf_layout.sql"; $this->icd9 = dirname(__FILE__) . "/../../sql/icd9.sql"; $this->cvx = dirname(__FILE__) . "/../../sql/cvx_codes.sql"; -- 2.11.4.GIT