Index: branches/1.2.x/platform/designs/default_design.des.tpl
===================================================================
diff -u -N -r16344 -r16608
--- branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 16344)
+++ branches/1.2.x/platform/designs/default_design.des.tpl	(.../default_design.des.tpl)	(revision 16608)
@@ -43,7 +43,7 @@
 					<inp2:m_ifnot check="m_Param" name="is_last">,</inp2:m_ifnot>
 				</inp2:m_DefineElement>
 
-				var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang"/>);
+				var aMultiLanguageSelector = new MultiLanguageSelector({<inp2:lang.enabled_PrintList render_as="ml_selector_language_element" per_page="-1" no_editing="1" strip_nl="2"/>}, <inp2:m_Get name="m_lang" js_escape="1"/>);
 			</inp2:m_Cache>
 		</script>
 
Index: branches/1.2.x/platform/elements/forms.elm.tpl
===================================================================
diff -u -N -r16017 -r16608
--- branches/1.2.x/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 16017)
+++ branches/1.2.x/platform/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 16608)
@@ -84,7 +84,7 @@
 			</inp2:m_if>
 
 			<script type="text/javascript">
-				FormManager.registerField('<inp2:m_Param name="prefix"/>', '<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="formatter" equals_to="kMultiLanguage">l<inp2:m_Get name="m_lang"/>_</inp2:m_if><inp2:m_Param name="field"/>', undefined, '<inp2:m_Param name="field_type"/>');
+				FormManager.registerField('<inp2:m_Param name="prefix"/>', '<inp2:m_if check="{$prefix}_FieldOption" field="$field" option="formatter" equals_to="kMultiLanguage">l<inp2:m_Get name="m_lang" js_escape="1"/>_</inp2:m_if><inp2:m_Param name="field"/>', undefined, '<inp2:m_Param name="field_type"/>');
 			</script>
 		</td>
 	</tr>
@@ -538,7 +538,7 @@
 		<script type="text/javascript">
 			var $delete_button = '&nbsp;&nbsp;<input type="button" class="delete-button" value="<inp2:m_Phrase label='lu_btn_Delete' no_editing='1'/>" onclick="$ItemCategories.DeleteCategory(#CATEGORY_ID#);"/>';
 			var $phrases = ['<inp2:m_Phrase name="lu_error_CategoryLimitReached" escape="1"/>', '<inp2:m_Phrase name="lu_error_AlreadyAdded"/>'];
-			var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id"/>, $phrases);
+			var $ItemCategories = new ItemCategories('item_categories', '<inp2:{$prefix}_InputName field="$field"/>', <inp2:m_Get name="m_cat_id" js_escape="1"/>, $phrases);
 		</script>
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>