Merge pull request #555 from aacirino/master

If you use UTF-8 for Localization then the changes would work with Git. In use UTF-8 for all my files. Added Brazilian Portuguese localization files, aboveDisplayPropertyKeys and belowDisplayPropertyKeys sections to ERModernLook components that feature entity editing
wocommunity · Apr 20, 2014 · 2c50e12 · 2c50e12
2 parents f8809a6 + c4142a3
commit 2c50e12
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 1 deletion.
diff --git a/Frameworks/Core/ERDirectToWeb/Resources/Portuguese_BR.lproj/Localizable.strings b/Frameworks/Core/ERDirectToWeb/Resources/Portuguese_BR.lproj/Localizable.strings
diff --git a/Frameworks/Core/ERDirectToWeb/Resources/Portuguese_BR.lproj/ValidationTemplate.strings b/Frameworks/Core/ERDirectToWeb/Resources/Portuguese_BR.lproj/ValidationTemplate.strings
diff --git a/Frameworks/Core/ERExtensions/Resources/Portuguese_BR.lproj/Localizable.strings b/Frameworks/Core/ERExtensions/Resources/Portuguese_BR.lproj/Localizable.strings
diff --git a/Frameworks/Core/ERExtensions/Resources/Portuguese_BR.lproj/ValidationTemplate.strings b/Frameworks/Core/ERExtensions/Resources/Portuguese_BR.lproj/ValidationTemplate.strings
diff --git a/Frameworks/D2W/ERModernDirectToWeb/Resources/Portuguese_BR.lproj/Localizable.strings b/Frameworks/D2W/ERModernDirectToWeb/Resources/Portuguese_BR.lproj/Localizable.strings
diff --git a/Frameworks/D2W/ERModernDirectToWeb/Resources/Portuguese_BR.lproj/ValidationTemplate.strings b/Frameworks/D2W/ERModernDirectToWeb/Resources/Portuguese_BR.lproj/ValidationTemplate.strings
diff --git a/.../D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.html b/.../D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.html
@@ -22,8 +22,10 @@
         </webobject>
       </webobject>
       <webobject name = "InnerWrapper">
+        <webobject name = "AboveDisplayPropertyKeys" />
         <webobject name = "ErrorBlock"/>
         <webobject name = "InspectPageRepetition" />
+        <webobject name = "BelowDisplayPropertyKeys" />
       </webobject><div class="InnerClear"></div>
       <webobject name = "ShowBottomActionBlock">
         <webobject name = "BottomActionBlock">

diff --git a/...s/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.wod b/...s/D2W/ERModernLook/Components/Nonlocalized.lproj/ERMODInspectPage.wo/ERMODInspectPage.wod
@@ -1,3 +1,13 @@
+AboveDisplayPropertyKeys: ERD2WExtraDisplayPropertyKeysComponent {
+    localContext = d2wContext;
+	extraPropertiesKey = "aboveDisplayPropertyKeys";
+}
+
+BelowDisplayPropertyKeys: ERD2WExtraDisplayPropertyKeysComponent {
+	localContext = d2wContext;
+	extraPropertiesKey = "belowDisplayPropertyKeys";
+}
+
 CancelButton: CCSmartAjaxButton {
 	alt = "Reverts your changes";
 	value = d2wContext.cancelButtonLabel;

diff --git a/...RModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.html b/...RModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.html
@@ -24,6 +24,7 @@
     <webobject name = "TabPanel">
       <webobject name = "InnerWrapper">
         <webobject name = "ErrorBlock"/>
+        <webobject name = "AboveDisplayPropertyKeys" />
         <webobject name = "InspectPageRepetition" />
       </webobject>
     </webobject>

diff --git a/...ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.wod b/...ERModernLook/Components/Nonlocalized.lproj/ERMODTabInspectPage.wo/ERMODTabInspectPage.wod
@@ -106,6 +106,11 @@ RequiredWrapper : ERMODRequiredWrapper {
 	watchedContainerID = d2wContext.idForPageTabContainer;
 }
 
+AboveDisplayPropertyKeys: ERD2WExtraDisplayPropertyKeysComponent {
+    localContext = d2wContext;
+	extraPropertiesKey = "aboveDisplayPropertyKeys";
+}
+
 ShowBottomActionBlock : WOConditional {
 	condition = d2wContext.showBottomActionBlock;
 }
@@ -132,4 +137,4 @@ SecondaryActionBlock : ERMODSecondaryActionButtons {
 
 ShouldShowDefaultPageButtons : WOConditional {
   condition = d2wContext.shouldShowDefaultPageButtons;
-}
+}
diff --git a/...ook/Components/Nonlocalized.lproj/ERMODWizardCreationPage.wo/ERMODWizardCreationPage.html b/...ook/Components/Nonlocalized.lproj/ERMODWizardCreationPage.wo/ERMODWizardCreationPage.html
@@ -1,6 +1,7 @@
 <webobject name = "PageWrapper">
   <webobject name = "RequiredWrapper">
     <webobject name = "InnerWrapper">
+      <webobject name = "AboveDisplayPropertyKeys" />
       <webobject name = "ShowBanner">
         <webobject name = "BannerDiv"> <webobject name = "BannerComponent" /> </webobject>
       </webobject>
@@ -41,6 +42,7 @@
           <li><webobject name = "SaveButton" /></li>
         </webobject>
       </ul>
+      <webobject name = "BelowDisplayPropertyKeys" />
     </webobject>
   </webobject>
 </webobject>
diff --git a/...Look/Components/Nonlocalized.lproj/ERMODWizardCreationPage.wo/ERMODWizardCreationPage.wod b/...Look/Components/Nonlocalized.lproj/ERMODWizardCreationPage.wo/ERMODWizardCreationPage.wod
@@ -1,3 +1,13 @@
+AboveDisplayPropertyKeys: ERD2WExtraDisplayPropertyKeysComponent {
+    localContext = d2wContext;
+	extraPropertiesKey = "aboveDisplayPropertyKeys";
+}
+
+BelowDisplayPropertyKeys: ERD2WExtraDisplayPropertyKeysComponent {
+	localContext = d2wContext;
+	extraPropertiesKey = "belowDisplayPropertyKeys";
+}
+
 CancelButton: CCSmartAjaxButton {
 	action = cancelAction;
 	alt = "Reverts your changes";