Merge pull request #455 from ONLYOFFICE/refactor/document-templates-s…

…ubmodule Refactor/document templates submodule
ONLYOFFICE · Feb 19, 2024 · 6bf22ba · 6bf22ba
2 parents 66df7f4 + 1e5c3dd
commit 6bf22ba
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/artifact.yml b/.github/workflows/artifact.yml
@@ -27,7 +27,7 @@ jobs:
           rm -rf ./.github/
           rm -rf ./.git/
           rm ./.gitmodules
-          rm -rf ./assets/.git
+          rm -rf ./assets/document-templates/.git
           cd ./appinfo
           sed -i 's|<licence>apl2|<licence>agpl|' info.xml 
           cd $cwd

diff --git a/.gitmodules b/.gitmodules
@@ -1,4 +1,4 @@
-[submodule "assets"]
-	path = assets
+[submodule "assets/document-templates"]
+	path = assets/document-templates
 	url = https://github.com/ONLYOFFICE/document-templates
 	branch = main/new
diff --git a/assets → assets/document-templates b/assets → assets/document-templates
diff --git a/lib/templatemanager.php b/lib/templatemanager.php
@@ -177,7 +177,7 @@ public static function getEmptyTemplatePath($lang, $ext) {
 			$lang = "en";
 		}
 
-		return \dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . self::$localPath[$lang] . DIRECTORY_SEPARATOR . "new" . $ext;
+		return \dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . "document-templates" . DIRECTORY_SEPARATOR . self::$localPath[$lang] . DIRECTORY_SEPARATOR . "new" . $ext;
 	}
 
 	/**
-Original file line number
+Diff line change
@@ Expand Up / @@ -177,7 +177,7 @@ public static function getEmptyTemplatePath($lang, $ext) { @@
     			$lang = "en";
     		}
-    		return \dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . self::$localPath[$lang] . DIRECTORY_SEPARATOR . "new" . $ext;
+    		return \dirname(__DIR__) . DIRECTORY_SEPARATOR . "assets" . DIRECTORY_SEPARATOR . "document-templates" . DIRECTORY_SEPARATOR . self::$localPath[$lang] . DIRECTORY_SEPARATOR . "new" . $ext;
     	}
     	/**
@@ Expand Down @@