CauseFX пре 4 година
родитељ
комит
0fe2bdc9c2

+ 2 - 2
api/classes/organizr.class.php

@@ -2500,8 +2500,8 @@ class Organizr
 					<div class="row">
 						<div class="col-md-12">
 							<div class="white-box">
-								<h3 class="box-title m-b-0">Custom Certificate Status</h3>
-								<p class="text-muted m-b-30 custom-certificate-status">' . $certificateStatus . '</p>
+								<h3 class="box-title m-b-0" lang="en">Custom Certificate Status</h3>
+								<p class="text-muted m-b-30 custom-certificate-status" lang="en">' . $certificateStatus . '</p>
 								<form action="#" class="dropzone dz-clickable" id="upload-custom-certificate">
 									<div class="dz-default dz-message"><span lang="en">Drop Certificate file here to upload</span></div>
 								</form>

+ 2 - 2
api/pages/settings-settings-logs.php

@@ -36,7 +36,7 @@ function get_page_settings_settings_logs($Organizr)
         <button type="button" class="btn btn-default btn-outline waves-effect bg-org swapLog active" data-name="loginLog" data-path="' . $Organizr->organizrLoginLog . '" lang="en">Login Log</button>
         <button type="button" class="btn btn-default btn-outline waves-effect bg-org swapLog" data-name="orgLog" data-path="' . $Organizr->organizrLog . '" lang="en">Organizr Log</button>
     </div>
-    <button class="btn btn-danger btn-sm waves-effect waves-light pull-right purgeLog" type="button"><span class="btn-label"><i class="fa fa-trash"></i></span>Purge Log</button>
+    <button class="btn btn-danger btn-sm waves-effect waves-light pull-right purgeLog" type="button"><span class="btn-label"><i class="fa fa-trash"></i></span><span lang="en">Purge Log</span></button>
     <div class="clearfix"></div>
     <div class="white-box bg-org logTable loginLogDiv">
         <h3 class="box-title m-b-0" lang="en">Login Logs</h3>
@@ -172,4 +172,4 @@ function get_page_settings_settings_logs($Organizr)
     } );
     </script>
     ';
-}
+}

+ 8 - 8
api/pages/settings.php

@@ -287,19 +287,19 @@ function get_page_settings($Organizr)
 										</ul>
 										<div class="tab-content">
 											<div class="tab-pane active" id="donate-github">
-												<blockquote>Want to show support on Github?  Sponsor me :)<br/>Please click the button to continue.</blockquote>
+												<blockquote lang="en">Want to show support on Github?  Sponsor me :)<br/><span lang="en">Please click the button to continue.</span></blockquote>
 												<button onclick="window.open(\'https://github.com/sponsors/causefx\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
 											</div>
 											<div class="tab-pane" id="donate-paypal">
-												<blockquote>I have chosen to go with PayPal Pools so everyone can see how much people have donated.<br/>Please click the button to continue.</blockquote>
+												<blockquote lang="en">I have chosen to go with PayPal Pools so everyone can see how much people have donated.<br/><span lang="en">Please click the button to continue.</span></blockquote>
 												<button onclick="window.open(\'https://paypal.me/pools/c/83JNaMBESR\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
 											</div>
 											<div class="tab-pane" id="donate-square">
-												<blockquote>If you use the Square Cash App, you can donate with that if you like.<br/>Please click the button to continue.</blockquote>
+												<blockquote lang="en">If you use the Square Cash App, you can donate with that if you like.<br/><span lang="en">Please click the button to continue.</span></blockquote>
 												<button onclick="window.open(\'https://cash.me/$CauseFX\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
 											</div>
 											<div class="tab-pane" id="donate-crypto">
-												<blockquote>Want to donate a small amount of Crypto?.<br/>Please use the QR Code or Wallet ID.</blockquote>
+												<blockquote lang="en">Want to donate a small amount of Crypto?.<br/>Please use the QR Code or Wallet ID.</blockquote>
 												<div class="col-lg-4 col-xs-12">
 													<div class="lazyload qr-code" data-src="plugins/images/Bitcoin_QR_code.png"></div>
 													<div class="clearfix"></div>
@@ -318,15 +318,15 @@ function get_page_settings($Organizr)
 												<div class="clearfix"></div>
 											</div>
 											<div class="tab-pane" id="donate-patreon">
-												<blockquote>Need specialized support or just want to support Organizr?  If so head to Patreon...<br/>Please click the button to continue.</blockquote>
+												<blockquote lang="en">Need specialized support or just want to support Organizr?  If so head to Patreon...<br/><span lang="en">Please click the button to continue.</span></blockquote>
 												<button onclick="window.open(\'https://www.patreon.com/join/organizr?\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
 											</div>
 											<div class="tab-pane" id="donate-open-collective">
-												<blockquote>Need specialized support or just want to support Organizr?  If so head to Open Collective...<br/>Please click the button to continue.</blockquote>
+												<blockquote lang="en">Need specialized support or just want to support Organizr?  If so head to Open Collective...<br/><span lang="en">Please click the button to continue.</span></blockquote>
 												<button onclick="window.open(\'https://opencollective.com/organizr\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
 											</div>
 											<div class="tab-pane" id="donate-ads">
-												<blockquote>Money not an option?  No problem.  Show some love to this Google Ad below:</blockquote>
+												<blockquote lang="en">Money not an option?  No problem.  Show some love to this Google Ad below:</blockquote>
 												 <button onclick="window.open(\'https://organizr.app/ads/google.html\', \'_blank\')" class="btn btn-primary btn-rounded waves-effect waves-light" type="button"><span class="btn-label"><i class="fa fa-link"></i></span><span lang="en">Continue To Website</span></button>
 											</div>
 										</div>
@@ -356,4 +356,4 @@ function get_page_settings($Organizr)
 </form>
 <div id="editHomepageItemDiv"><div id="editHomepageItem" class=""></div></div>
 ';
-}
+}

+ 4 - 4
api/plugins/bookmark/plugin.php

@@ -150,10 +150,10 @@ class Bookmark extends Organizr
 							<div class="panel-wrapper collapse in" aria-expanded="true">
 								<div class="panel-body">
 									<ul class="list-icons">
-										<li><i class="fa fa-chevron-right text-info"></i> Add tab that points to <i>api/v2/plugins/bookmark/page</i> and set it\'s type to <i>Organizr</i>.</li>
-										<li><i class="fa fa-chevron-right text-info"></i> Create Bookmark categories in the new area in <i>Tab Editor</i>.</li>
-										<li><i class="fa fa-chevron-right text-info"></i> Create Bookmark tabs in the new area in <i>Tab Editor</i>.</li>
-										<li><i class="fa fa-chevron-right text-info"></i> Open your custom Bookmark page via menu.</li>
+										<li><i class="fa fa-chevron-right text-info"></i> <span lang="en">Add tab that points to <i>api/v2/plugins/bookmark/page</i> and set it\'s type to <i>Organizr</i>.</span></li>
+										<li><i class="fa fa-chevron-right text-info"></i> <span lang="en">Create Bookmark categories in the new area in <i>Tab Editor</i>.</span></li>
+										<li><i class="fa fa-chevron-right text-info"></i> <span lang="en">Create Bookmark tabs in the new area in <i>Tab Editor</i>.</span></li>
+										<li><i class="fa fa-chevron-right text-info"></i> <span lang="en">Open your custom Bookmark page via menu.</span></li>
 									</ul>
 								</div>
 							</div>

+ 6 - 6
api/plugins/chat/plugin.php

@@ -33,12 +33,12 @@ class Chat extends Organizr
                             <div class="panel-wrapper collapse in" aria-expanded="true">
                                 <div class="panel-body">
 									<ul class="list-icons">
-                                        <li><i class="fa fa-chevron-right text-danger"></i> <a href="https://dashboard.pusher.com/accounts/sign_up" target="_blank">Signup for Pusher [FREE]</a></li>
-                                        <li><i class="fa fa-chevron-right text-danger"></i> Create an App called whatever you like and choose a cluster (Close to you)</li>
-                                        <li><i class="fa fa-chevron-right text-danger"></i> Frontend (JQuery) - Backend (PHP)</li>
-                                        <li><i class="fa fa-chevron-right text-danger"></i> Click the overview tab on top left</li>
-                                        <li><i class="fa fa-chevron-right text-danger"></i> Copy and paste the 4 values into Organizr</li>
-                                        <li><i class="fa fa-chevron-right text-danger"></i> Save and reload!</li>
+                                        <li><i class="fa fa-chevron-right text-danger"></i> <a href="https://dashboard.pusher.com/accounts/sign_up" target="_blank"><span lang="en">Signup for Pusher [FREE]</span></a></li>
+                                        <li><i class="fa fa-chevron-right text-danger"></i> <span lang="en">Create an App called whatever you like and choose a cluster (Close to you)</span></li>
+                                        <li><i class="fa fa-chevron-right text-danger"></i> <span lang="en">Frontend (JQuery) - Backend (PHP)</span></li>
+                                        <li><i class="fa fa-chevron-right text-danger"></i> <span lang="en">Click the overview tab on top left</span></li>
+                                        <li><i class="fa fa-chevron-right text-danger"></i> <span lang="en">Copy and paste the 4 values into Organizr</span></li>
+                                        <li><i class="fa fa-chevron-right text-danger"></i> <span lang="en">Save and reload!</span></li>
                                     </ul>
                                 </div>
                             </div>

+ 1 - 1
api/plugins/healthChecks/settings.js

@@ -13,7 +13,7 @@ $(document).on('click', '#HEALTHCHECKS-settings-button', function() {
         $('#HEALTHCHECKS-settings-items').html(buildFormGroup(response.data));
         var elAddButtonStart = $('#HEALTHCHECKS-settings-page [id*="Services"] .row.start');
         var items = $('#HEALTHCHECKS-settings-page [id*="Services"] .row.m-b-40 span');
-        $(elAddButtonStart).after('<div class="row"><button type="button" class="btn btn-info pull-right m-r-20 addNewHCService" ><i class="fa fa-plus"></i> Add New Service</button><button type="button" class="btn btn-primary pull-right m-r-20 importNewHCService" ><i class="fa fa-database"></i> Import Services</button></div>');
+        $(elAddButtonStart).after('<div class="row"><button type="button" class="btn btn-info pull-right m-r-20 addNewHCService" ><i class="fa fa-plus"></i> <span lang="en">Add New Service</span></button><button type="button" class="btn btn-primary pull-right m-r-20 importNewHCService" ><i class="fa fa-database"></i> <span lang="en">Import Services</span></button></div>');
         $.each(items, function(key,val) {
             var el = $(val);
             var text = el.text();

+ 1 - 1
api/plugins/invites/plugin.php

@@ -345,7 +345,7 @@ class Invites extends Organizr
 				array(
 					'type' => 'html',
 					'label' => 'Note',
-					'html' => 'After enabling for the first time, please reload the page - Menu is located under User menu on top right'
+					'html' => '<span lang="en">After enabling for the first time, please reload the page - Menu is located under User menu on top right</span>'
 				)
 			)
 		);

+ 3 - 3
js/functions.js

@@ -1095,7 +1095,7 @@ function buildFormItem(item){
 	var pwd1 = createRandomString(6);
 	var pwd2 = createRandomString(6);
 	var pwd3 = createRandomString(6);
-	var helpInfo = (item.help) ? '<div class="collapse" id="help-info-'+item.name+'"><blockquote>'+item.help+'</blockquote></div>' : '';
+	var helpInfo = (item.help) ? '<div class="collapse" id="help-info-'+item.name+'"><blockquote lang="en">'+item.help+'</blockquote></div>' : '';
     var smallLabel = (item.smallLabel) ? '<label><span lang="en">'+item.smallLabel+'</span></label>'+helpInfo : ''+helpInfo;
 	var pwgMgr = `
 	<input name="disable-pwd-mgr-`+pwd1+`" type="password" id="disable-pwd-mgr-`+pwd1+`" style="display: none;" value="disable-pwd-mgr-`+pwd1+`" />
@@ -1938,8 +1938,8 @@ function createImageSwal(attr){
                 <div class="panel-body">
                 	<h5 lang="en">Choose action:</h5>
 					<div class="button-box">
-                        <button class="btn btn-info waves-effect waves-light clipboard" type="button" data-clipboard-text="`+clipboardText+`"><span class="btn-label"><i class="ti-clipboard"></i></span>Copy to Clipboard</button>
-                        <button class="btn btn-danger waves-effect waves-light deleteImage" type="button" data-image-path="`+fullPath+`" data-image-name="`+name+`" data-image-name-ext="`+extension+`"><span class="btn-label"><i class="fa fa-trash"></i></span>Delete</button>                        
+                        <button class="btn btn-info waves-effect waves-light clipboard" type="button" data-clipboard-text="`+clipboardText+`"><span class="btn-label"><i class="ti-clipboard"></i></span><span lang="en">Copy to Clipboard</span></button>
+                        <button class="btn btn-danger waves-effect waves-light deleteImage" type="button" data-image-path="`+fullPath+`" data-image-name="`+name+`" data-image-name-ext="`+extension+`"><span class="btn-label"><i class="fa fa-trash"></i></span><span lang="en">Delete</span></button>                        
                     </div>
                 </div>
             </div>