Version 1.0.8 Complete

Rafael Grigorian · Rafael Grigorian · commit ede791df13e2 · 2017-11-14T17:13:02.000-06:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -37,4 +37,10 @@
 - 	New logo for jetrails
 
 ## Version 1.0.7
-- 	On install, invalidate logged in sessions.
+- 	On install, invalidate logged in sessions.
+
+## Version 1.0.8
+-	Only kept English translations
+- 	Changed/Added text translations throughout module
+- 	Enabled translations to work in Adminhtml area
+- 	Added MIT license
diff --git a/package.json b/package.json
@@ -1,5 +1,5 @@
 {
-	"version": "1.0.7",
+	"version": "1.0.8",
 	"name": "TwoFactor",
 	"description": "Two-factor authorization for admin accounts",
 	"author": "Rafael Grigorian",
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Button/Reset.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Button/Reset.php
@@ -5,7 +5,7 @@
 	 * config section of the admin area.  The reset button simply resets the currently logged in
 	 * user's state.  This class defines the HTML for the widget element, and it also un-binds it
 	 * from any store view.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Button
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Email/Admin.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Email/Admin.php
@@ -4,7 +4,7 @@
 	 * Admin.php - This block is meant to be used inline with the email template file.  It simply
 	 * has a method that is called to fill the plain text body portion of the HTML email.  This
 	 * block describes the message that the admin users within the 'Administrators' role will see.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Email
 	 * @author          Rafael Grigorian - JetRails®
@@ -25,11 +25,11 @@ public function getMessage () {
 			// Return the formated message that will appear in the email body
 			return sprintf (
 				$this->__(
-					"%d unsuccessful two factor authentication attempts have been made for '%s' w" .
-					"ith a user id of '%d'.  Last detected authentication attempt was detected on" .
-					" '%s' at '%s UTC'.  A %d minute block has been set to the account.  The acco" .
-					"unt in question and all other admins in the 'Administrator' role have been n" .
-					"otified about this block."
+					"%d unsuccessful two-factor authentication attempts have been made for '%s' w" .
+					"ith a user id of '%d'. Last detected authentication attempt was detected fro" .
+					"m '%s' at '%s UTC'. A %d minute block has been set to the account. The accou" .
+					"nt in question and all other admins in the 'Administrator' role have been no" .
+					"tified about this block."
 				),
 				$auth::MAX_ATTEMPTS,
 				$user->getEmail (),
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Email/User.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Email/User.php
@@ -4,7 +4,7 @@
 	 * User.php - This block is meant to be used inline with the email template file.  It simply
 	 * has a method that is called to fill the plain text body portion of the HTML email.  This
 	 * block describes the message that the admin who's account is currently being used will see.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Email
 	 * @author          Rafael Grigorian - JetRails®
@@ -24,11 +24,11 @@ public function getMessage () {
 			// Return the formated message that will appear in the email body
 			return sprintf (
 				$this->__(
-					"%d unsuccessful two factor authentication attempts have been made to log int" .
-					"o your account. If this was not you, please contact your system administrato" .
-					"rs immediately.  Additional emails have been sent to the administrators rega" .
-					"rding this failed authentication attempt.  If this was you, you can attempt " .
-					"to authenticate your account again in %d minutes."
+					"Your Magento administrator account has been locked after %d unsuccessful two" .
+					"-factor authentication attempts. Additional emails have been sent to the adm" .
+					"inistrators regarding this failed authentication attempt. If this was you, t" .
+					"ry logging into the system in %d minutes. If this was not you, please contac" .
+					"t your system administrators immediately."
 				),
 				$auth::MAX_ATTEMPTS,
 				$auth::BLOCK_TIME_MINUTES
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Backup.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Backup.php
@@ -3,7 +3,7 @@
 	/**
 	 * Backup.php - This template block is used in hand with the associated template file and it
 	 * is used to prepare information for the template file.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Blocked.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Blocked.php
@@ -3,7 +3,7 @@
 	/**
 	 * Blocked.php - This template block is used in hand with the associated template file and it
 	 * is used to prepare information for the template file.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Scan.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Scan.php
@@ -3,7 +3,7 @@
 	/**
 	 * Scan.php - This template block is used in hand with the associated template file and it
 	 * is used to prepare information for the template file.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Verify.php b/src/app/code/community/JetRails/TwoFactor/Block/Adminhtml/Template/Verify.php
@@ -3,7 +3,7 @@
 	/**
 	 * Verify.php - This function aids the Verify template.  This block offers helpful function that
 	 * are used within the template, such as suppling the form action and stylesheet URL.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Template
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Helper/Cookie.php b/src/app/code/community/JetRails/TwoFactor/Helper/Cookie.php
@@ -4,7 +4,7 @@
 	 * Cookie.php - This helper class contains functions that deal with cookie creation, deletion,
 	 * and authentication.  This cookie class is used to aid in the "remember for 7 days"
 	 * functionality.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Helper/Data.php b/src/app/code/community/JetRails/TwoFactor/Helper/Data.php
@@ -5,7 +5,7 @@
 	 * checks to see if the logged in admin user should be authenticated.  Since the ACL permission
 	 * is currently located in the system configuration section, it may change in the future and it
 	 * can be changed in one place.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Helper/TOTP.php b/src/app/code/community/JetRails/TwoFactor/Helper/TOTP.php
@@ -5,7 +5,7 @@
 	 * pins.  It is very flexible and can be initialized to different sized secrets and pins.
 	 * Although the default values conform to the generally accepted configuration for TFA.  Apps
 	 * such as Authy and Google Authenticator use the default configuration.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Helper
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Auth.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Auth.php
@@ -7,7 +7,7 @@
 	 * passed TOTP pin, and registers failed authentication attempts.  In addition the constants
 	 * that are defined within this class are used throughout the module and are accessed
 	 * statically.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Notify.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Notify.php
@@ -4,7 +4,7 @@
 	 * Notify.php - This class contains methods that help log and communicate messages.  Messages
 	 * can be logged into a custom log file, the logged in admin user can be notified, or all admin
 	 * users in the 'Administrators' role can be notified.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Observer.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Observer.php
@@ -5,7 +5,7 @@
 	 * config.xml file.  This observer fires before any adminhtml action gets executed.  This way if
 	 * a user is not authenticated, we can block access to those actions and redirect to the
 	 * verification page.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Page.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Page.php
@@ -3,7 +3,7 @@
 	/**
 	 * Page.php - This class contains the page route constants that are used throughout the module.
 	 * It also contains methods that link the state to the associated route.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Resource/Auth.php b/src/app/code/community/JetRails/TwoFactor/Model/Adminhtml/Resource/Auth.php
@@ -4,7 +4,7 @@
 	 * Auth.php - This class is the resource model for the authentication model.  There is not much
 	 * going on here other than the standard setup.  The database table and primary column is
 	 * defined in the constructor and auto incrementing primary key on data save is disabled.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Resource Model
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/LoginController.php b/src/app/code/community/JetRails/TwoFactor/controllers/LoginController.php
@@ -5,7 +5,7 @@
 	 * their two factor authentication account.  Actions that render the verification page as well
 	 * as the blocked page that a user will see on failed login are all encapsulated within this
 	 * controller.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/controllers/SetupController.php b/src/app/code/community/JetRails/TwoFactor/controllers/SetupController.php
@@ -4,7 +4,7 @@
 	 * SetupController.php - This controller contains all actions that relate to setting up the two
 	 * factor authentication on an admin user's account.  Actions that render both the scan and
 	 * backup pages for setup, as well as an action that resets the whole process for an admin user.
-	 * @version         1.0.7
+	 * @version         1.0.8
 	 * @package         JetRails® TwoFactor
 	 * @category        Controllers
 	 * @author          Rafael Grigorian - JetRails®
diff --git a/src/app/code/community/JetRails/TwoFactor/etc/config.xml b/src/app/code/community/JetRails/TwoFactor/etc/config.xml
@@ -3,7 +3,7 @@
 <config>
 	<modules>
 		<JetRails_TwoFactor>
-			<version>1.0.7</version>
+			<version>1.0.8</version>
 		</JetRails_TwoFactor>
 	</modules>
 	<admin>
@@ -72,5 +72,14 @@
 				</twofactor>
 			</updates>
 		</layout>
+		<translate>
+			<modules>
+				<JetRails_TwoFactor>
+					<files>
+						<default>JetRails_TwoFactor.csv</default>
+					</files>
+				</JetRails_TwoFactor>
+			</modules>
+		</translate>
 	</adminhtml>
 </config>
diff --git a/src/app/code/community/JetRails/TwoFactor/etc/system.xml b/src/app/code/community/JetRails/TwoFactor/etc/system.xml
@@ -14,16 +14,17 @@
 			<tab>extensions</tab>
 			<sort_order>152</sort_order>
 			<show_in_default>1</show_in_default>
-			<show_in_website>0</show_in_website>
-			<show_in_store>0</show_in_store>
+			<show_in_website>1</show_in_website>
+			<show_in_store>1</show_in_store>
 			<groups>
-				<configuration translate="label" module="twofactor" >
+				<configuration translate="label comment" module="twofactor" >
 					<label>Account Setup</label>
+					<comment>If you wish to reset your two-factor authentication account, click on the reset button below.  Your will be logged out and once you log back in, you will be prompted to setup your two-factor authentication account again.  This process will re-generate new backup codes as well.</comment>
 					<frontend_type>text</frontend_type>
 					<sort_order>0</sort_order>
 					<show_in_default>1</show_in_default>
-					<show_in_website>0</show_in_website>
-					<show_in_store>0</show_in_store>
+					<show_in_website>1</show_in_website>
+					<show_in_store>1</show_in_store>
 					<expanded>1</expanded>
 					<fields>
 						<reset translate="label comment" module="twofactor" >
@@ -33,8 +34,8 @@
 							<frontend_model>twofactor/adminhtml_button_reset</frontend_model>
 							<sort_order>0</sort_order>
 							<show_in_default>1</show_in_default>
-							<show_in_website>0</show_in_website>
-							<show_in_store>0</show_in_store>
+							<show_in_website>1</show_in_website>
+							<show_in_store>1</show_in_store>
 						</reset>
 					</fields>
 				</configuration>
diff --git a/src/app/design/adminhtml/base/default/template/twofactor/blocked.phtml b/src/app/design/adminhtml/base/default/template/twofactor/blocked.phtml
@@ -16,9 +16,9 @@
 				<p class="col s12 left-align" >
 					<?php echo sprintf (
 						$this->__(
-							"You failed to enter in a valid verification pin and/or backup code. " .
-							"The maximum number of failed attempts that is allowed is %s in a spa" .
-							"n of %s minutes."
+							"You failed to enter a valid verification pin and/or backup code. The" .
+							" maximum number of failed attempts that is allowed is %s in a span o" .
+							"f %s minutes."
 						),
 						$this->getMaxAttempts (),
 						$this->getBlockTime ()
@@ -29,10 +29,9 @@
 				<p class="col s12 left-align" >
 					<?php echo sprintf (
 						$this->__(
-							"If you are the genuine owner of this account and you got blocked, it" .
-							"'s okay! Just wait %s minutes and you can try to authenticate again." .
-							" Please remember that this is for your own good, it's better to be s" .
-							"afe than sorry."
+							"If you are the owner of this account and you are accidentally blocke" .
+							"d, it's okay! Just wait %s minutes and you can try to authenticate a" .
+							"gain."
 						),
 						$this->getBlockTime ()
 					)?>
diff --git a/src/app/locale/en_US/JetRails_TwoFactor.csv b/src/app/locale/en_US/JetRails_TwoFactor.csv
@@ -1,5 +1,5 @@
-"%d unsuccessful two factor authentication attempts have been made for '%s' with a user id of '%d'.  Last detected authentication attempt was detected on '%s' at '%s UTC'.  A %d minute block has been set to the account.  The account in question and all other admins in the 'Administrator' role have been notified about this block.","%d unsuccessful two factor authentication attempts have been made for '%s' with a user id of '%d'.  Last detected authentication attempt was detected on '%s' at '%s UTC'.  A %d minute block has been set to the account.  The account in question and all other admins in the 'Administrator' role have been notified about this block."
-"%d unsuccessful two factor authentication attempts have been made to log into your account. If this was not you, please contact your system administrators immediately.  Additional emails have been sent to the administrators regarding this failed authentication attempt.  If this was you, you can attempt to authenticate your account again in %d minutes.","%d unsuccessful two factor authentication attempts have been made to log into your account. If this was not you, please contact your system administrators immediately.  Additional emails have been sent to the administrators regarding this failed authentication attempt.  If this was you, you can attempt to authenticate your account again in %d minutes."
+"%d unsuccessful two-factor authentication attempts have been made for '%s' with a user id of '%d'. Last detected authentication attempt was detected from '%s' at '%s UTC'. A %d minute block has been set to the account. The account in question and all other admins in the 'Administrator' role have been notified about this block.","%d unsuccessful two-factor authentication attempts have been made for '%s' with a user id of '%d'. Last detected authentication attempt was detected from '%s' at '%s UTC'. A %d minute block has been set to the account. The account in question and all other admins in the 'Administrator' role have been notified about this block."
+"Your Magento administrator account has been locked after %d unsuccessful two-factor authentication attempts. Additional emails have been sent to the administrators regarding this failed authentication attempt. If this was you, try logging into the system in %d minutes. If this was not you, please contact your system administrators immediately.","Your Magento administrator account has been locked after %d unsuccessful two-factor authentication attempts. Additional emails have been sent to the administrators regarding this failed authentication attempt. If this was you, try logging into the system in %d minutes. If this was not you, please contact your system administrators immediately."
 "6 Digit Pin","6 Digit Pin"
 "Account Setup","Account Setup"
 "Account blocked, failed two factor authentication","Account blocked, failed two factor authentication"
@@ -10,14 +10,15 @@
 "Complete Setup","Complete Setup"
 "Continue","Continue"
 "Emails have been sent to all administrators regarding this failed attempt to authenticate. An additional email has been sent to the owner of the account.","Emails have been sent to all administrators regarding this failed attempt to authenticate. An additional email has been sent to the owner of the account."
-"If you are the genuine owner of this account and you got blocked, it's okay! Just wait %s minutes and you can try to authenticate again. Please remember that this is for your own good, it's better to be safe than sorry.","If you are the genuine owner of this account and you got blocked, it's okay! Just wait %s minutes and you can try to authenticate again. Please remember that this is for your own good, it's better to be safe than sorry."
+"If you are the owner of this account and you are accidentally blocked, it's okay! Just wait %s minutes and you can try to authenticate again.","If you are the owner of this account and you are accidentally blocked, it's okay! Just wait %s minutes and you can try to authenticate again."
 "In order to setup two-factor authentication for this account, download and install an authentication app.  We suggest %s which is available for both %s and %s.","In order to setup two-factor authentication for this account, download and install an authentication app.  We suggest %s which is available for both %s and %s."
 "JetRails TwoFactor","JetRails TwoFactor"
 "JetRails®","JetRails®"
+"Logout","Logout"
 "Open your authentication app and add a new account by scanning the QR code or entering in %s manually. Continue to the next step to verify setup.","Open your authentication app and add a new account by scanning the QR code or entering in %s manually. Continue to the next step to verify setup."
 "Remember for 7 days","Remember for 7 days"
-"Reset","Reset"
 "Reset Two Factor Authentication","Reset Two Factor Authentication"
+"Reset","Reset"
 "Step 1","Step 1"
 "Step 2","Step 2"
 "Step 3","Step 3"
@@ -28,4 +29,5 @@
 "Verification Pin","Verification Pin"
 "Verify","Verify"
 "Will be logged out and prompted to setup on next login","Will be logged out and prompted to setup on next login"
-"You failed to enter in a valid verification pin and/or backup code. The maximum number of failed attempts that is allowed is %s in a span of %s minutes.","You failed to enter in a valid verification pin and/or backup code. The maximum number of failed attempts that is allowed is %s in a span of %s minutes."
+"You failed to enter a valid verification pin and/or backup code. The maximum number of failed attempts that is allowed is %s in a span of %s minutes.","You failed to enter a valid verification pin and/or backup code. The maximum number of failed attempts that is allowed is %s in a span of %s minutes."
+"If you wish to reset your two-factor authentication account, click on the reset button below.  Your will be logged out and once you log back in, you will be prompted to setup your two-factor authentication account again.  This process will re-generate new backup codes as well.","If you wish to reset your two-factor authentication account, click on the reset button below.  Your will be logged out and once you log back in, you will be prompted to setup your two-factor authentication account again.  This process will re-generate new backup codes as well."
diff --git a/src/app/locale/es_MX/JetRails_TwoFactor.csv b/src/app/locale/es_MX/JetRails_TwoFactor.csv
diff --git a/src/app/locale/ru_RU/JetRails_TwoFactor.csv b/src/app/locale/ru_RU/JetRails_TwoFactor.csv

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "version": "1.0.7",`
	`2`	`+ "version": "1.0.8",`
`3`	`3`	`"name": "TwoFactor",`
`4`	`4`	`"description": "Two-factor authorization for admin accounts",`
`5`	`5`	`"author": "Rafael Grigorian",`