Merge pull request #1803 from pedro-mendonca/i18n-issue-gettext

i18n Gettext issues

fields/gravatar/config.php

@@ -9,13 +9,13 @@
 
 <?php
 $avatar_defaults = array(
-	'mystery' => __('Mystery Man'),
-	'blank' => __('Blank'),
-	'gravatar_default' => __('Gravatar Logo'),
-	'identicon' => __('Identicon (Generated)'),
-	'wavatar' => __('Wavatar (Generated)'),
-	'monsterid' => __('MonsterID (Generated)'),
-	'retro' => __('Retro (Generated)')
+	'mystery' => __('Mystery Person', 'caldera-forms'),
+	'blank' => __('Blank', 'caldera-forms'),
+	'gravatar_default' => __('Gravatar Logo', 'caldera-forms'),
+	'identicon' => __('Identicon (Generated)', 'caldera-forms'),
+	'wavatar' => __('Wavatar (Generated)', 'caldera-forms'),
+	'monsterid' => __('MonsterID (Generated)', 'caldera-forms'),
+	'retro' => __('Retro (Generated)', 'caldera-forms')
 );
 
 ?>

fields/text/config.php

@@ -7,7 +7,7 @@
 </div>
 <div class="caldera-config-group">
 	<label for="{{_id}}_default">
-		<?php esc_html_e('Default'); ?>
+		<?php esc_html_e('Default', 'caldera-forms'); ?>
 	</label>
 	<div class="caldera-config-field">
 		<input type="text" id="{{_id}}_default" class="block-input field-config magic-tag-enabled" name="{{_name}}[default]" value="{{default}}">
@@ -50,7 +50,7 @@
 		</div>
 	</div>
 	<div class="caldera-config-group">
-		<p class="description">e.g (aaa-99-999-a9-9*)</p>
+		<p class="description"><?php _e('e.g.', 'caldera-forms' ); ?>: aaa-99-999-a9-9*</p>
 		<ul>
 			<li>9 : <?php _e('numeric', 'caldera-forms'); ?></li>
 			<li>a : <?php _e('alphabetical', 'caldera-forms'); ?></li>

includes/ajax.php

@@ -73,7 +73,7 @@ function cf_form_ajaxsetup($form){
 			<div class="caldera-config-field">
 				<input id="caldera-forms-custom_callback" type="text" value="<?php echo $form['custom_callback']; ?>" name="config[custom_callback]" class="field-config block-input" aria-describedby="caldera-forms-custom_callback-desc">
 				<p class="description" id="caldera-forms-custom_callback-desc">
-					<?php esc_html_e('Javascript function to call on submission. Passed an object containing form submission result.'); ?> <a href="#" onclick="jQuery('#json_callback_example').toggle();return false;"><?php esc_html_e( 'See Example', 'caldera-forms' ); ?></a>
+					<?php esc_html_e('Javascript function to call on submission. Passed an object containing form submission result.', 'caldera-forms' ); ?> <a href="#" onclick="jQuery('#json_callback_example').toggle();return false;"><?php esc_html_e( 'See Example', 'caldera-forms' ); ?></a>
 				</p>
 					<pre id="json_callback_example" style="display:none;"><?php echo htmlentities('
 {    

includes/custom_field_class.php

@@ -35,7 +35,7 @@ function cf_live_gravatar_field($fieldtypes){
 		"field"			=>	"Gravatar",
 		"file"			=>	CFCORE_PATH . "fields/gravatar/field.php",
 		"category"		=>	__( 'Special' , 'caldera-forms' ),
-		"description" 	=> 'A live gravatar preview',
+		"description" 	=> __( 'A live gravatar preview', 'caldera-forms' ),
 		'icon'          => CFCORE_URL . 'assets/build/images/user.svg',
 		"setup"			=>	array(
 			"template"	=>	CFCORE_PATH . "fields/gravatar/config.php",

ui/edit.php

@@ -359,7 +359,7 @@
 
 $default_template = "
 <div class=\"caldera-config-group\">
-	<label>Default</label>
+	<label>" . esc_html__( 'Default', 'caldera-forms' ) . "</label>
 	<div class=\"caldera-config-field\">
 		<input type=\"text\" class=\"block-input field-config\" name=\"{{_name}}[default]\" value=\"{{default}}\">
 	</div>
@@ -1162,7 +1162,7 @@ class="toggle_label_field option-setting field-config required"
 </script>
 <script type="text/html" id="noconfig_field_templ" class="cf-editor-template">
 <div class="caldera-config-group">
-	<label>Default</label>
+	<label><?php _e( 'Default', 'caldera-forms' ); ?></label>
 	<div class="caldera-config-field">
 		<input type="text" class="block-input field-config" name="{{_name}}[default]" value="{{default}}">
 	</div>
@@ -1175,7 +1175,7 @@ class="toggle_label_field option-setting field-config required"
 			<div class="caldera-condition-lines" id="{{id}}_conditions_lines">
 				{{#each lines}}
 				<div class="caldera-condition-line">
-					if 
+					<?php _e( 'if', 'caldera-forms' ); ?>
 					<select name="config[{{../type}}][{{../../id}}][conditions][group][{{../id}}][{{id}}][field]" data-condition="{{../type}}" class="caldera-field-bind caldera-conditional-field-set" data-id="{{../../id}}" {{#if field}}data-default="{{field}}"{{/if}} data-line="{{id}}" data-row="{{../id}}" data-all="true" style="max-width:120px;">
 						{{#if field}}<option value="{{field}}" class="bound-field" selected="selected"></option>{{else}}<option value="">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>{{/if}}
 					</select>
@@ -1200,7 +1200,7 @@ class="toggle_label_field option-setting field-config required"
 <script type="text/html" id="conditional-line-tmpl">
 	<div class="caldera-condition-line">
 		<div class="caldera-condition-line-label"><?php echo esc_html__( 'and', 'caldera-forms' ); ?></div>
-		if 
+		<?php _e( 'if', 'caldera-forms' ); ?>
 		<select name="{{name}}[field]" class="caldera-field-bind caldera-conditional-field-set" data-condition="{{type}}" data-id="{{id}}" data-line="{{lineid}}" data-row="{{rowid}}" data-all="true" style="max-width:120px;"></select>
 		<select name="{{name}}[compare]" style="max-width:110px;">
 			<option value="is"><?php echo esc_html__( 'is', 'caldera-forms' ); ?></option>

ui/panels/conditions.php

@@ -61,7 +61,7 @@ class="ajax-trigger"
 					</div>
 
 					<div class="caldera-config-group">
-						<label for="{{id}}_lable">Type</label>
+						<label for="{{id}}_lable"><?php _e( 'Type', 'caldera-forms' ); ?></label>
 						<div class="caldera-config-field">
 							<select name="conditions[{{id}}][type]" data-live-sync="true">
 								<option value=""></option>