diff --git a/plugins/TranslateSite/TranslateSitePlugin.py b/plugins/TranslateSite/TranslateSitePlugin.py
new file mode 100644
index 00000000..c987be85
--- /dev/null
+++ b/plugins/TranslateSite/TranslateSitePlugin.py
@@ -0,0 +1,67 @@
+import time
+
+from Plugin import PluginManager
+from Translate import translate
+
+
+@PluginManager.registerTo("UiRequest")
+class UiRequestPlugin(object):
+    def actionSiteMedia(self, path, header_length=True):
+        file_name = path.split("/")[-1]
+        if not file_name:  # Path ends with /
+            file_name = "index.html"
+        extension = file_name.split(".")[-1]
+        if translate.lang != "en" and extension in ["js", "html"]:
+            path_parts = self.parsePath(path)
+            file_generator = super(UiRequestPlugin, self).actionSiteMedia(path, header_length=False)
+            if "next" in dir(file_generator):  # File found and generator returned
+                site = self.server.sites.get(path_parts["address"])
+                return self.actionPatchFile(site, path_parts["inner_path"], file_generator)
+            else:
+                return file_generator
+
+        else:
+            return super(UiRequestPlugin, self).actionSiteMedia(path)
+
+    def actionUiMedia(self, path):
+        file_generator = super(UiRequestPlugin, self).actionUiMedia(path)
+        if translate.lang != "en" and path.endswith(".js"):
+            s = time.time()
+            data = "".join(list(file_generator))
+            data = translate.translateData(data)
+            self.log.debug("Patched %s (%s bytes) in %.3fs" % (path, len(data), time.time() - s))
+            return iter([data])
+        else:
+            return file_generator
+
+    def actionPatchFile(self, site, inner_path, file_generator):
+        content_json = site.content_manager.contents["content.json"]
+        lang_file = "languages/%s.json" % translate.lang
+        lang_file_exist = False
+        if site.settings.get("own"):  # My site, check if the file is exist (allow to add new lang without signing)
+            if site.storage.isFile(lang_file):
+                lang_file_exist = True
+        else:  # Not my site the reference in content.json is enough (will wait for download later)
+            if lang_file in content_json["files"]:
+                lang_file_exist = True
+
+        if not lang_file_exist or inner_path not in content_json.get("translate", []):
+            for part in file_generator:
+                if inner_path.endswith(".html"):
+                    yield part.replace("lang={lang}", "lang=" + str(translate.lang))  # lang get parameter to .js file to avoid cache
+                else:
+                    yield part
+        else:
+            s = time.time()
+            data = "".join(list(file_generator))
+
+            # if site.content_manager.contents["content.json"]["files"].get(lang_file):
+            site.needFile(lang_file)
+            if inner_path.endswith("js"):
+                data = translate.translateData(data, site.storage.loadJson(lang_file), "js")
+            else:
+                data = translate.translateData(data, site.storage.loadJson(lang_file), "html")
+                data = data.replace("lang={lang}", "lang=" + str(translate.lang))  # lang get parameter to .js file to avoid cache
+
+            self.log.debug("Patched %s (%s bytes) in %.3fs" % (inner_path, len(data), time.time() - s))
+            yield data
diff --git a/plugins/TranslateSite/__init__.py b/plugins/TranslateSite/__init__.py
new file mode 100644
index 00000000..0b50ddc8
--- /dev/null
+++ b/plugins/TranslateSite/__init__.py
@@ -0,0 +1 @@
+import TranslateSitePlugin