svn commit: r791606 - in /ofbiz/trunk: applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl framework/common/config/CommonUiLabels.xml

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

svn commit: r791606 - in /ofbiz/trunk: applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl framework/common/config/CommonUiLabels.xml

adrianc
Author: adrianc
Date: Mon Jul  6 20:33:30 2009
New Revision: 791606

URL: http://svn.apache.org/viewvc?rev=791606&view=rev
Log:
Small fix for iCalendar Help screen.

Modified:
    ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl
    ofbiz/trunk/framework/common/config/CommonUiLabels.xml

Modified: ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl?rev=791606&r1=791605&r2=791606&view=diff
==============================================================================
--- ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl (original)
+++ ofbiz/trunk/applications/workeffort/webapp/workeffort/workeffort/ICalendarHelp.ftl Mon Jul  6 20:33:30 2009
@@ -16,4 +16,8 @@
 specific language governing permissions and limitations
 under the License.
 -->
-${StringUtil.wrapString(wikiContent)}
+<#if wikiContent?has_content>
+    ${StringUtil.wrapString(wikiContent)}
+<#else>
+    <h2>${uiLabelMap.CommonHelpNotFound}</h2>
+</#if>

Modified: ofbiz/trunk/framework/common/config/CommonUiLabels.xml
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/common/config/CommonUiLabels.xml?rev=791606&r1=791605&r2=791606&view=diff
==============================================================================
--- ofbiz/trunk/framework/common/config/CommonUiLabels.xml (original)
+++ ofbiz/trunk/framework/common/config/CommonUiLabels.xml Mon Jul  6 20:33:30 2009
@@ -2905,6 +2905,9 @@
         <value xml:lang="zh">帮助</value>
         <value xml:lang="zh_CN">帮助</value>
     </property>
+    <property key="CommonHelpNotFound">
+        <value xml:lang="en">Help file or URL not found</value>
+    </property>
     <property key="CommonHideFields">
         <value xml:lang="ar">اخفاء الحقول</value>
         <value xml:lang="de">Felder ausblenden</value>