Increment version; fix non translateable strings

tlovett1 · Aug 31, 2015 · d96bbe0 · d96bbe0
1 parent 7fb796c
commit d96bbe0
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 16 deletions.
diff --git a/build/js/form-manager.js b/build/js/form-manager.js
@@ -520,7 +520,7 @@
 
 			defaults: function() {
 				var defaults = {
-					label: 'Field Label',
+					label: ccfSettings.fieldLabel,
 					value: '',
 					placeholder: '',
 					slug: '',

diff --git a/build/js/form-manager.min.js b/build/js/form-manager.min.js
diff --git a/classes/class-ccf-field-renderer.php b/classes/class-ccf-field-renderer.php
@@ -790,7 +790,7 @@ public function email( $field_id, $form_id ) {
 				<?php echo esc_html( $label ); ?>
 			</label>
 			<?php if ( empty( $email_confirmation ) ) { ?>
-				<input class="<?php if ( ! empty( $errors ) ) : ?>field-error-input<?php endif; ?> field-input" <?php if ( ! empty( $required ) ) : ?>required aria-required="true"<?php endif; ?> name="ccf_field_<?php echo esc_attr( $slug ); ?>" id="ccf_field_<?php echo esc_attr( $slug ); ?>"  placeholder="<?php if ( ! empty( $placeholder ) ) { ?><?php echo esc_attr( $placeholder ) ?><?php } else { ?>[email protected]<?php } ?>" type="text" value="<?php if ( ! empty( $email_post_value ) ) { echo esc_attr( $email_post_value ); } else { echo esc_attr( $value ); } ?>">
+				<input class="<?php if ( ! empty( $errors ) ) : ?>field-error-input<?php endif; ?> field-input" <?php if ( ! empty( $required ) ) : ?>required aria-required="true"<?php endif; ?> name="ccf_field_<?php echo esc_attr( $slug ); ?>" id="ccf_field_<?php echo esc_attr( $slug ); ?>"  placeholder="<?php if ( ! empty( $placeholder ) ) { ?><?php echo esc_attr( $placeholder ) ?><?php } else { ?><?php esc_html_e( '[email protected]', 'custom-contact-forms' ); ?><?php } ?>" type="text" value="<?php if ( ! empty( $email_post_value ) ) { echo esc_attr( $email_post_value ); } else { echo esc_attr( $value ); } ?>">
 				<?php if ( ! empty( $errors ) ) : foreach ( $errors as $error ) : ?>
 					<div class="error"><?php echo esc_html( $error ); ?></div>
 				<?php endforeach; endif; ?>

diff --git a/classes/class-ccf-form-manager.php b/classes/class-ccf-form-manager.php
@@ -1542,6 +1542,7 @@ public function action_admin_enqueue_scripts_css() {
 				'noNameFields' => esc_html__( 'You have no name fields', 'custom-contact-forms' ),
 				'invalidDate' => esc_html__( 'Invalid date', 'custom-contact-forms' ),
 				'allLabels' => array_merge( $field_labels, $structure_field_labels, $special_field_labels ),
+				'fieldLabel' => esc_html__( 'Field Label', 'custom-contact-forms' ),
 				'thickboxTitle' => esc_html__( 'Form Submission', 'custom-contact-forms' ),
 				'pauseMessage' => esc_html__( 'This form is paused right now. Check back later!', 'custom-contact-forms' ),
 				'skipFields' => apply_filters( 'ccf_no_submission_display_fields', array( 'html', 'section-header', 'recaptcha' ) ),

diff --git a/custom-contact-forms.php b/custom-contact-forms.php
@@ -4,7 +4,7 @@
  * Plugin URI: http://www.taylorlovett.com
  * Description: Build beautiful custom forms the WordPress way. View live previews of your forms while you build them.
  * Author: Taylor Lovett
- * Version: 6.8.1
+ * Version: 6.8.2
  * Author URI: http://www.taylorlovett.com
  */
 

diff --git a/js/manager/models.js b/js/manager/models.js
@@ -260,7 +260,7 @@
 
 			defaults: function() {
 				var defaults = {
-					label: 'Field Label',
+					label: ccfSettings.fieldLabel,
 					value: '',
 					placeholder: '',
 					slug: '',

diff --git a/languages/custom-contact-forms.mo b/languages/custom-contact-forms.mo
diff --git a/languages/custom-contact-forms.po b/languages/custom-contact-forms.po
@@ -5,8 +5,8 @@ msgstr ""
 "Project-Id-Version: Custom Contact Forms\n"
 "Report-Msgid-Bugs-To: https://github.com/tlovett1/custom-contact-forms/"
 "issues\n"
-"POT-Creation-Date: 2015-06-29 10:27-0500\n"
-"PO-Revision-Date: 2015-06-29 10:27-0500\n"
+"POT-Creation-Date: 2015-08-31 09:26-0500\n"
+"PO-Revision-Date: 2015-08-31 09:26-0500\n"
 "Last-Translator: Taylor Lovett <[email protected]>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
 "Language: en\n"
@@ -96,14 +96,14 @@ msgstr ""
 msgid "Form Field Choices"
 msgstr ""
 
-#: ../classes/class-ccf-custom-contact-forms.php:49
+#: ../classes/class-ccf-custom-contact-forms.php:71
 #, php-format
 msgid ""
 "Custom Contact Forms will not work unless pretty permalinks (not default) "
 "are enabled. Please update your <a href=\"%s\">permalinks settings</a>."
 msgstr ""
 
-#: ../classes/class-ccf-custom-contact-forms.php:67
+#: ../classes/class-ccf-custom-contact-forms.php:89
 #, php-format
 msgid "<a href=\"%s\">Forms and Submissions</a>"
 msgstr ""
@@ -173,6 +173,11 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
+#: ../classes/class-ccf-field-renderer.php:793
+#: ../classes/class-ccf-form-manager.php:1211
+msgid "[email protected]"
+msgstr ""
+
 #: ../classes/class-ccf-field-renderer.php:803
 #: ../classes/class-ccf-form-manager.php:1215
 #: ../classes/class-ccf-form-manager.php:1516
@@ -987,10 +992,6 @@ msgstr ""
 msgid "This is the sub-heading text."
 msgstr ""
 
-#: ../classes/class-ccf-form-manager.php:1211
-msgid "[email protected]"
-msgstr ""
-
 #: ../classes/class-ccf-form-manager.php:1249
 msgid "Edit"
 msgstr ""
@@ -1088,10 +1089,14 @@ msgid "Invalid date"
 msgstr ""
 
 #: ../classes/class-ccf-form-manager.php:1545
-msgid "Form Submission"
+msgid "Field Label"
 msgstr ""
 
 #: ../classes/class-ccf-form-manager.php:1546
+msgid "Form Submission"
+msgstr ""
+
+#: ../classes/class-ccf-form-manager.php:1547
 #: ../classes/class-ccf-form-renderer.php:120
 msgid "This form is paused right now. Check back later!"
 msgstr ""

diff --git a/readme.txt b/readme.txt
@@ -3,8 +3,8 @@ Contributors: tlovett1
 Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=HR34W94MM53RQ
 Tags: contact form, web form, custom contact form, custom forms, captcha form, contact fields, form mailers, forms
 Requires at least: 3.9
-Tested up to: 4.3
-Stable tag: 6.8
+Tested up to: 4.4
+Stable tag: 6.8.2
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
 
@@ -21,6 +21,8 @@ just contact forms.
 
 For detailed install and usage instructions, please visit [Github](http://github.com/tlovett1/custom-contact-forms).
 
+__Software integrity proudly assured by [Dockunit.io](https://dockunit.io).__
+
 == Installation ==
 
 Please refer to [Github](http://github.com/tlovett1/custom-contact-forms) for detailed installation instructions.
@@ -35,6 +37,10 @@ For questions, feature requests, and support concerning the Custom Contact Forms
 
 == Changelog ==
 
+= 6.8.2 =
+* Fix non-translateable strings
+* Include French translation. Props [pyrog](https://github.com/pyrog)
+
 = 6.8.1 =
 * Tighten post type permissions so submissions and forms don't have archives and single views.