From 94149de0e76772057014bff013fe92c6cdffc6b0 Mon Sep 17 00:00:00 2001
From: Marco Dickert <marco@misterunknown.de>
Date: Fri, 28 Jul 2017 16:07:58 +0200
Subject: [PATCH] render all modals via mustache

---
 build/libifm.php | 20 ++++++++++----------
 ifm.php          | 20 ++++++++++----------
 src/ifm.js       | 20 ++++++++++----------
 3 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/build/libifm.php b/build/libifm.php
index 70b9976..de6a859 100644
--- a/build/libifm.php
+++ b/build/libifm.php
@@ -1146,7 +1146,7 @@ function IFM( params ) {
 	this.showFileDialog = function () {
 		var filename = arguments.length > 0 ? arguments[0] : "newfile.txt";
 		var content = arguments.length > 1 ? arguments[1] : "";
-		self.showModal( Mustache.render( self.templates.file, { filename: filename } ), { large: true } );
+		self.showModal( Mustache.render( self.templates.file, { filename: filename, i18n: self.i18n } ), { large: true } );
 		var form = $('#formFile');
 		form.find('input[name="filename"]').on( 'keypress', self.preventEnter );
 		form.find('#buttonSave').on( 'click', function() {
@@ -1251,7 +1251,7 @@ function IFM( params ) {
 	 * Shows the create directory dialog
 	 */
 	this.showCreateDirDialog = function() {
-		self.showModal( self.templates.createdir );
+		self.showModal( Mustache.render( self.templates.createdir, { i18n: self.i18n } ) );
 		var form = $( '#formCreateDir' );
 		form.find( 'input[name=dirname]' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonSave' ).on( 'click', function() {
@@ -1298,7 +1298,7 @@ function IFM( params ) {
 	 * @param string name - name of the file
 	 */
 	this.showDeleteFileDialog = function( filename ) {
-		self.showModal( Mustache.render( self.templates.deletefile, { filename: name } ) );
+		self.showModal( Mustache.render( self.templates.deletefile, { filename: name, i18n: self.i18n } ) );
 		var form = $( '#formDeleteFile' );
 		form.find( '#buttonYes' ).on( 'click', function() {
 			self.deleteFile( filename );
@@ -1342,7 +1342,7 @@ function IFM( params ) {
 	 * @params string name - name of the file
 	 */
 	this.showRenameFileDialog = function( filename ) {
-		self.showModal( Mustache.render( self.templates.renamefile, { filename: filename } ) );
+		self.showModal( Mustache.render( self.templates.renamefile, { filename: filename, i18n: self.i18n } ) );
 		var form = $( '#formRenameFile' );
 		form.find( 'input[name=newname]' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonRename' ).on( 'click', function() {
@@ -1388,7 +1388,7 @@ function IFM( params ) {
 	 * @params string name - name of the file
 	 */
 	this.showCopyMoveDialog = function( name ) {
-		self.showModal( self.templates.copymove );
+		self.showModal( Mustache.render( self.templates.copymove, { i18n: self.i18n } ) );
 		$.ajax({
 			url: self.api,
 			type: "POST",
@@ -1482,7 +1482,7 @@ function IFM( params ) {
 		if( filename.lastIndexOf( '.' ) > 1 )
 			targetDirSuggestion = filename.substr( 0, filename.lastIndexOf( '.' ) );
 		else targetDirSuggestion = filename;
-		self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion } ) );
+		self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion, i18n: self.i18n } ) );
 		var form = $('#formExtractFile');
 		form.find('#buttonExtract').on( 'click', function() {
 			var t = form.find('input[name=extractTargetLocation]:checked').val();
@@ -1531,7 +1531,7 @@ function IFM( params ) {
 	 * Shows the upload file dialog
 	 */
 	this.showUploadFileDialog = function() {
-		self.showModal( self.templates.uploadfile );
+		self.showModal( Mustache.render( self.templates.uploadfile, { i18n: self.i18n } ) );
 		var form = $('#formUploadFile');
 		form.find( 'input[name=newfilename]' ).on( 'keypress', self.preventEnter );
 		form.find( 'input[name=files]' ).on( 'change', function( e ) {
@@ -1628,7 +1628,7 @@ function IFM( params ) {
 	 * Show the remote upload dialog
 	 */
 	this.showRemoteUploadDialog = function() {
-		self.showModal( self.templates.remoteupload );
+		self.showModal( Mustache.render( self.templates.remoteupload, { i18n: self.i18n } ) );
 		var form = $('#formRemoteUpload');
 		form.find( '#url' )
 			.on( 'keypress', self.preventEnter )
@@ -1682,7 +1682,7 @@ function IFM( params ) {
 	 * Shows the ajax request dialog
 	 */
 	this.showAjaxRequestDialog = function() {
-		self.showModal( self.templates.ajaxrequest );
+		self.showModal( Mustache.render( self.templates.ajaxrequest, { i18n: self.i18n } ) );
 		var form = $('#formAjaxRequest');
 		form.find( '#ajaxurl' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonRequest' ).on( 'click', function() {
@@ -1713,7 +1713,7 @@ function IFM( params ) {
 	 * Shows the delete dialog for multiple files
 	 */
 	this.showMultiDeleteDialog = function() {
-		self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length } ) );
+		self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length, i18n: self.i18n } ) );
 		var form = $('#formDeleteFiles');
 		form.find( '#buttonYes' ).on( 'click', function() {
 			self.multiDelete();
diff --git a/ifm.php b/ifm.php
index abaf3f8..3373e6a 100644
--- a/ifm.php
+++ b/ifm.php
@@ -1146,7 +1146,7 @@ function IFM( params ) {
 	this.showFileDialog = function () {
 		var filename = arguments.length > 0 ? arguments[0] : "newfile.txt";
 		var content = arguments.length > 1 ? arguments[1] : "";
-		self.showModal( Mustache.render( self.templates.file, { filename: filename } ), { large: true } );
+		self.showModal( Mustache.render( self.templates.file, { filename: filename, i18n: self.i18n } ), { large: true } );
 		var form = $('#formFile');
 		form.find('input[name="filename"]').on( 'keypress', self.preventEnter );
 		form.find('#buttonSave').on( 'click', function() {
@@ -1251,7 +1251,7 @@ function IFM( params ) {
 	 * Shows the create directory dialog
 	 */
 	this.showCreateDirDialog = function() {
-		self.showModal( self.templates.createdir );
+		self.showModal( Mustache.render( self.templates.createdir, { i18n: self.i18n } ) );
 		var form = $( '#formCreateDir' );
 		form.find( 'input[name=dirname]' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonSave' ).on( 'click', function() {
@@ -1298,7 +1298,7 @@ function IFM( params ) {
 	 * @param string name - name of the file
 	 */
 	this.showDeleteFileDialog = function( filename ) {
-		self.showModal( Mustache.render( self.templates.deletefile, { filename: name } ) );
+		self.showModal( Mustache.render( self.templates.deletefile, { filename: name, i18n: self.i18n } ) );
 		var form = $( '#formDeleteFile' );
 		form.find( '#buttonYes' ).on( 'click', function() {
 			self.deleteFile( filename );
@@ -1342,7 +1342,7 @@ function IFM( params ) {
 	 * @params string name - name of the file
 	 */
 	this.showRenameFileDialog = function( filename ) {
-		self.showModal( Mustache.render( self.templates.renamefile, { filename: filename } ) );
+		self.showModal( Mustache.render( self.templates.renamefile, { filename: filename, i18n: self.i18n } ) );
 		var form = $( '#formRenameFile' );
 		form.find( 'input[name=newname]' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonRename' ).on( 'click', function() {
@@ -1388,7 +1388,7 @@ function IFM( params ) {
 	 * @params string name - name of the file
 	 */
 	this.showCopyMoveDialog = function( name ) {
-		self.showModal( self.templates.copymove );
+		self.showModal( Mustache.render( self.templates.copymove, { i18n: self.i18n } ) );
 		$.ajax({
 			url: self.api,
 			type: "POST",
@@ -1482,7 +1482,7 @@ function IFM( params ) {
 		if( filename.lastIndexOf( '.' ) > 1 )
 			targetDirSuggestion = filename.substr( 0, filename.lastIndexOf( '.' ) );
 		else targetDirSuggestion = filename;
-		self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion } ) );
+		self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion, i18n: self.i18n } ) );
 		var form = $('#formExtractFile');
 		form.find('#buttonExtract').on( 'click', function() {
 			var t = form.find('input[name=extractTargetLocation]:checked').val();
@@ -1531,7 +1531,7 @@ function IFM( params ) {
 	 * Shows the upload file dialog
 	 */
 	this.showUploadFileDialog = function() {
-		self.showModal( self.templates.uploadfile );
+		self.showModal( Mustache.render( self.templates.uploadfile, { i18n: self.i18n } ) );
 		var form = $('#formUploadFile');
 		form.find( 'input[name=newfilename]' ).on( 'keypress', self.preventEnter );
 		form.find( 'input[name=files]' ).on( 'change', function( e ) {
@@ -1628,7 +1628,7 @@ function IFM( params ) {
 	 * Show the remote upload dialog
 	 */
 	this.showRemoteUploadDialog = function() {
-		self.showModal( self.templates.remoteupload );
+		self.showModal( Mustache.render( self.templates.remoteupload, { i18n: self.i18n } ) );
 		var form = $('#formRemoteUpload');
 		form.find( '#url' )
 			.on( 'keypress', self.preventEnter )
@@ -1682,7 +1682,7 @@ function IFM( params ) {
 	 * Shows the ajax request dialog
 	 */
 	this.showAjaxRequestDialog = function() {
-		self.showModal( self.templates.ajaxrequest );
+		self.showModal( Mustache.render( self.templates.ajaxrequest, { i18n: self.i18n } ) );
 		var form = $('#formAjaxRequest');
 		form.find( '#ajaxurl' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonRequest' ).on( 'click', function() {
@@ -1713,7 +1713,7 @@ function IFM( params ) {
 	 * Shows the delete dialog for multiple files
 	 */
 	this.showMultiDeleteDialog = function() {
-		self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length } ) );
+		self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length, i18n: self.i18n } ) );
 		var form = $('#formDeleteFiles');
 		form.find( '#buttonYes' ).on( 'click', function() {
 			self.multiDelete();
diff --git a/src/ifm.js b/src/ifm.js
index f0a769f..0f8f0ba 100644
--- a/src/ifm.js
+++ b/src/ifm.js
@@ -264,7 +264,7 @@ function IFM( params ) {
 	this.showFileDialog = function () {
 		var filename = arguments.length > 0 ? arguments[0] : "newfile.txt";
 		var content = arguments.length > 1 ? arguments[1] : "";
-		self.showModal( Mustache.render( self.templates.file, { filename: filename } ), { large: true } );
+		self.showModal( Mustache.render( self.templates.file, { filename: filename, i18n: self.i18n } ), { large: true } );
 		var form = $('#formFile');
 		form.find('input[name="filename"]').on( 'keypress', self.preventEnter );
 		form.find('#buttonSave').on( 'click', function() {
@@ -369,7 +369,7 @@ function IFM( params ) {
 	 * Shows the create directory dialog
 	 */
 	this.showCreateDirDialog = function() {
-		self.showModal( self.templates.createdir );
+		self.showModal( Mustache.render( self.templates.createdir, { i18n: self.i18n } ) );
 		var form = $( '#formCreateDir' );
 		form.find( 'input[name=dirname]' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonSave' ).on( 'click', function() {
@@ -416,7 +416,7 @@ function IFM( params ) {
 	 * @param string name - name of the file
 	 */
 	this.showDeleteFileDialog = function( filename ) {
-		self.showModal( Mustache.render( self.templates.deletefile, { filename: name } ) );
+		self.showModal( Mustache.render( self.templates.deletefile, { filename: name, i18n: self.i18n } ) );
 		var form = $( '#formDeleteFile' );
 		form.find( '#buttonYes' ).on( 'click', function() {
 			self.deleteFile( filename );
@@ -460,7 +460,7 @@ function IFM( params ) {
 	 * @params string name - name of the file
 	 */
 	this.showRenameFileDialog = function( filename ) {
-		self.showModal( Mustache.render( self.templates.renamefile, { filename: filename } ) );
+		self.showModal( Mustache.render( self.templates.renamefile, { filename: filename, i18n: self.i18n } ) );
 		var form = $( '#formRenameFile' );
 		form.find( 'input[name=newname]' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonRename' ).on( 'click', function() {
@@ -506,7 +506,7 @@ function IFM( params ) {
 	 * @params string name - name of the file
 	 */
 	this.showCopyMoveDialog = function( name ) {
-		self.showModal( self.templates.copymove );
+		self.showModal( Mustache.render( self.templates.copymove, { i18n: self.i18n } ) );
 		$.ajax({
 			url: self.api,
 			type: "POST",
@@ -600,7 +600,7 @@ function IFM( params ) {
 		if( filename.lastIndexOf( '.' ) > 1 )
 			targetDirSuggestion = filename.substr( 0, filename.lastIndexOf( '.' ) );
 		else targetDirSuggestion = filename;
-		self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion } ) );
+		self.showModal( Mustache.render( self.templates.extractfile, { filename: filename, destination: targetDirSuggestion, i18n: self.i18n } ) );
 		var form = $('#formExtractFile');
 		form.find('#buttonExtract').on( 'click', function() {
 			var t = form.find('input[name=extractTargetLocation]:checked').val();
@@ -649,7 +649,7 @@ function IFM( params ) {
 	 * Shows the upload file dialog
 	 */
 	this.showUploadFileDialog = function() {
-		self.showModal( self.templates.uploadfile );
+		self.showModal( Mustache.render( self.templates.uploadfile, { i18n: self.i18n } ) );
 		var form = $('#formUploadFile');
 		form.find( 'input[name=newfilename]' ).on( 'keypress', self.preventEnter );
 		form.find( 'input[name=files]' ).on( 'change', function( e ) {
@@ -746,7 +746,7 @@ function IFM( params ) {
 	 * Show the remote upload dialog
 	 */
 	this.showRemoteUploadDialog = function() {
-		self.showModal( self.templates.remoteupload );
+		self.showModal( Mustache.render( self.templates.remoteupload, { i18n: self.i18n } ) );
 		var form = $('#formRemoteUpload');
 		form.find( '#url' )
 			.on( 'keypress', self.preventEnter )
@@ -800,7 +800,7 @@ function IFM( params ) {
 	 * Shows the ajax request dialog
 	 */
 	this.showAjaxRequestDialog = function() {
-		self.showModal( self.templates.ajaxrequest );
+		self.showModal( Mustache.render( self.templates.ajaxrequest, { i18n: self.i18n } ) );
 		var form = $('#formAjaxRequest');
 		form.find( '#ajaxurl' ).on( 'keypress', self.preventEnter );
 		form.find( '#buttonRequest' ).on( 'click', function() {
@@ -831,7 +831,7 @@ function IFM( params ) {
 	 * Shows the delete dialog for multiple files
 	 */
 	this.showMultiDeleteDialog = function() {
-		self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length } ) );
+		self.showModal( Mustache.render( self.templates.multidelete, { count: $('#filetable tr.selectedItem').length, i18n: self.i18n } ) );
 		var form = $('#formDeleteFiles');
 		form.find( '#buttonYes' ).on( 'click', function() {
 			self.multiDelete();