diff --git a/Makefile b/Makefile index b959bce756..dc0ab4370f 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,15 @@ rpm: rpmbuild -ba ~/rpmbuild/SPECS/zentaopms.spec cp ~/rpmbuild/RPMS/noarch/zentaopms-${VERSION}-1.noarch.rpm ./ rm -rf ~/rpmbuild +en: + unzip ZenTaoPMS.${VERSION}.zip + cd zentaopms/; grep -rl 'zentao.net'|xargs sed -i 's/zentao.net/zentao.pm/g'; + zip -r -9 ZenTaoPMS.$(VERSION).int.zip zentaopms + rm -fr zentaopms + echo $(VERSION).int > VERSION + make deb + make rpm + echo $(VERSION) > VERSION patchphpdoc: sudo cp misc/doc/phpdoc/*.tpl /usr/share/php/data/PhpDocumentor/phpDocumentor/Converters/HTML/frames/templates/phphtmllib/templates/ phpdoc: diff --git a/module/common/model.php b/module/common/model.php index 5dc2531776..368c5a97bf 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -437,6 +437,7 @@ class commonModel extends model { global $lang, $app; + if(isset($lang->menugroup->$moduleName)) $moduleName = $lang->menugroup->$moduleName; if(!isset($lang->$moduleName->menu)) { echo "