| Index: trunk/extensions/SemanticForms/specials/SF_FormStart.php |
| — | — | @@ -93,7 +93,7 @@ |
| 94 | 94 | $description = wfMsg('sf_formstart_noform_docu', $form_name); |
| 95 | 95 | else |
| 96 | 96 | $description = wfMsg('sf_formstart_docu', $form_name); |
| 97 | | - $button_text = wfMsg('addoreditdata'); |
| | 97 | + $button_text = wfMsg('createoredit'); |
| 98 | 98 | $text =<<<END |
| 99 | 99 | <form action="" method="post"> |
| 100 | 100 | <p>$description</p> |
| Index: trunk/extensions/SemanticForms/specials/SF_FormEdit.php |
| — | — | @@ -60,7 +60,7 @@ |
| 61 | 61 | // get contents of form and target page - if there's only one, |
| 62 | 62 | // it might be a target with only alternate forms |
| 63 | 63 | if ($form_name == '') { |
| 64 | | - $wgOut->addHTML( "<p class='error'>" . wfMsg('sf_adddata_badurl') . '</p>'); |
| | 64 | + $wgOut->addHTML( "<p class='error'>" . wfMsg('sf_formedit_badurl') . '</p>'); |
| 65 | 65 | return; |
| 66 | 66 | } elseif ($target_name == '') { |
| 67 | 67 | // parse the form to see if it has a 'page name' value set |
| — | — | @@ -77,7 +77,7 @@ |
| 78 | 78 | $page_name_formula = substr($page_name_formula, 0, $pos); |
| 79 | 79 | } |
| 80 | 80 | } elseif (count($alt_forms) == 0) { |
| 81 | | - $wgOut->addWikiText( "<p class='error'>" . wfMsg('sf_adddata_badurl') . '</p>'); |
| | 81 | + $wgOut->addWikiText( "<p class='error'>" . wfMsg('sf_formedit_badurl') . '</p>'); |
| 82 | 82 | return; |
| 83 | 83 | } |
| 84 | 84 | } |
| — | — | @@ -87,9 +87,9 @@ |
| 88 | 88 | if ($target_name != '') { |
| 89 | 89 | $target_title = Title::newFromText($target_name); |
| 90 | 90 | if ($target_title->exists()) { |
| 91 | | - $s = wfMsg('sf_editdata_title', $form_title->getText(), $target_title->getPrefixedText()); |
| | 91 | + $s = wfMsg('sf_formedit_edittitle', $form_title->getText(), $target_title->getPrefixedText()); |
| 92 | 92 | } else { |
| 93 | | - $s = wfMsg('sf_adddata_title', $form_title->getText(), $target_title->getPrefixedText()); |
| | 93 | + $s = wfMsg('sf_formedit_createtitle', $form_title->getText(), $target_title->getPrefixedText()); |
| 94 | 94 | } |
| 95 | 95 | $wgOut->setPageTitle($s); |
| 96 | 96 | } |
| — | — | @@ -114,17 +114,17 @@ |
| 115 | 115 | |
| 116 | 116 | if (! $form_title || ! $form_title->exists()) { |
| 117 | 117 | if ($form_name == '') |
| 118 | | - $text = '<p class="error">' . wfMsg('sf_adddata_badurl') . "</p>\n"; |
| | 118 | + $text = '<p class="error">' . wfMsg('sf_formedit_badurl') . "</p>\n"; |
| 119 | 119 | else { |
| 120 | 120 | if (count($alt_forms) > 0) { |
| 121 | | - $text .= '<div class="infoMessage">' . wfMsg('sf_adddata_altformsonly') . ' '; |
| | 121 | + $text .= '<div class="infoMessage">' . wfMsg('sf_formedit_altformsonly') . ' '; |
| 122 | 122 | $text .= self::printAltFormsList($alt_forms, $form_name); |
| 123 | 123 | $text .= "</div>\n"; |
| 124 | 124 | } else |
| 125 | 125 | $text = '<p class="error">' . wfMsg('sf_formstart_badform', SFUtils::linkText(SF_NS_FORM, $form_name)) . ".</p>\n"; |
| 126 | 126 | } |
| 127 | 127 | } elseif ($target_name == '' && $page_name_formula == '') { |
| 128 | | - $text = '<p class="error">' . wfMsg('sf_adddata_badurl') . "</p>\n"; |
| | 128 | + $text = '<p class="error">' . wfMsg('sf_formedit_badurl') . "</p>\n"; |
| 129 | 129 | } else { |
| 130 | 130 | $form_article = new Article($form_title); |
| 131 | 131 | $form_definition = $form_article->getContent(); |
| — | — | @@ -218,7 +218,7 @@ |
| 219 | 219 | } |
| 220 | 220 | $text = ""; |
| 221 | 221 | if (count($alt_forms) > 0) { |
| 222 | | - $text .= '<div class="infoMessage">' . wfMsg('sf_adddata_altforms') . ' '; |
| | 222 | + $text .= '<div class="infoMessage">' . wfMsg('sf_formedit_altforms') . ' '; |
| 223 | 223 | $text .= self::printAltFormsList($alt_forms, $target_name); |
| 224 | 224 | $text .= "</div>\n"; |
| 225 | 225 | } |
| Index: trunk/extensions/SemanticForms/includes/SF_ParserFunctions.php |
| — | — | @@ -318,7 +318,7 @@ |
| 319 | 319 | $str .= ' <input type="hidden" name="' . $key . '" value="' . $val . '">' . "\n"; |
| 320 | 320 | } |
| 321 | 321 | wfLoadExtensionMessages('SemanticForms'); |
| 322 | | - $button_str = ($inButtonStr != '') ? $inButtonStr : wfMsg('addoreditdata'); |
| | 322 | + $button_str = ($inButtonStr != '') ? $inButtonStr : wfMsg('createoredit'); |
| 323 | 323 | if (empty($inAutocompletionSource)) { |
| 324 | 324 | $str .= <<<END |
| 325 | 325 | <input type="submit" value="$button_str"></p> |
| Index: trunk/extensions/SemanticForms/includes/SF_FormEditPage.php |
| — | — | @@ -28,7 +28,7 @@ |
| 29 | 29 | parent::setHeaders(); |
| 30 | 30 | global $wgOut, $wgTitle; |
| 31 | 31 | if( !$this->isConflict ) { |
| 32 | | - $wgOut->setPageTitle( wfMsg( 'sf_editdata_title', |
| | 32 | + $wgOut->setPageTitle( wfMsg( 'sf_formedit_title', |
| 33 | 33 | $this->form->getText(), $wgTitle->getPrefixedText() ) ); |
| 34 | 34 | } |
| 35 | 35 | } |
| Index: trunk/extensions/SemanticForms/includes/SF_FormUtils.inc |
| — | — | @@ -244,7 +244,7 @@ |
| 245 | 245 | } |
| 246 | 246 | |
| 247 | 247 | static function instancesJavascript($using_choosers) { |
| 248 | | - $remove_text = wfMsg('sf_editdata_remove'); |
| | 248 | + $remove_text = wfMsg('sf_formedit_remove'); |
| 249 | 249 | $javascript_text =<<<END |
| 250 | 250 | |
| 251 | 251 | var num_elements = 0; |
| Index: trunk/extensions/SemanticForms/includes/SF_FormInputs.inc |
| — | — | @@ -681,7 +681,7 @@ |
| 682 | 682 | $text .= ' checked="checked"'; |
| 683 | 683 | $check_set = true; |
| 684 | 684 | } |
| 685 | | - $text .= " $disabled_text $javascript_text/> " . wfMsg('sf_editdata_none') . "\n"; |
| | 685 | + $text .= " $disabled_text $javascript_text/> " . wfMsg('sf_formedit_none') . "\n"; |
| 686 | 686 | } |
| 687 | 687 | |
| 688 | 688 | if (($possible_values = $other_args['possible_values']) == null) |
| — | — | @@ -801,7 +801,7 @@ |
| 802 | 802 | $check_set = true; |
| 803 | 803 | } |
| 804 | 804 | $disabled_text = ($is_disabled) ? "disabled" : ""; |
| 805 | | - $text .= " $disabled_text/> <em>" . wfMsg('sf_editdata_none') . "</em>\n"; |
| | 805 | + $text .= " $disabled_text/> <em>" . wfMsg('sf_formedit_none') . "</em>\n"; |
| 806 | 806 | } |
| 807 | 807 | |
| 808 | 808 | global $wgCategoryTreeMaxDepth; |
| Index: trunk/extensions/SemanticForms/includes/SF_FormPrinter.inc |
| — | — | @@ -1113,7 +1113,7 @@ |
| 1114 | 1114 | // in the form, to differentiate the inputs the form starts out |
| 1115 | 1115 | // with from any inputs added by the Javascript |
| 1116 | 1116 | $section = str_replace('[num]', "[{$instance_num}a]", $section); |
| 1117 | | - $remove_text = wfMsg('sf_editdata_remove'); |
| | 1117 | + $remove_text = wfMsg('sf_formedit_remove'); |
| 1118 | 1118 | $form_text .=<<<END |
| 1119 | 1119 | <div id="wrapper_$sfgFieldNum" class="multipleTemplate"> |
| 1120 | 1120 | $section |
| — | — | @@ -1136,7 +1136,7 @@ |
| 1137 | 1137 | <div id="main_$query_template_name"></div> |
| 1138 | 1138 | |
| 1139 | 1139 | END; |
| 1140 | | - $add_another = wfMsg('sf_editdata_addanother'); |
| | 1140 | + $add_another = wfMsg('sf_formedit_addanother'); |
| 1141 | 1141 | $form_text .=<<<END |
| 1142 | 1142 | <p style="margin-left:10px;"> |
| 1143 | 1143 | <p><input type="button" onclick="addInstance('starter_$query_template_name', 'main_$query_template_name', '$sfgFieldNum');" value="$add_another" tabindex="$sfgTabIndex" class="addAnother" /></p> |
| — | — | @@ -1215,7 +1215,7 @@ |
| 1216 | 1216 | // add a warning in, if we're editing an existing page and that page |
| 1217 | 1217 | // appears to not have been created with this form |
| 1218 | 1218 | if ($this->mPageTitle->exists() && ($existing_page_content != '') && ! $source_page_matches_this_form) { |
| 1219 | | - $form_text = ' <div class="warningMessage">' . wfMsg('sf_editdata_formwarning', $this->mPageTitle->getFullURL()) . "</div>\n" . $form_text; |
| | 1219 | + $form_text = ' <div class="warningMessage">' . wfMsg('sf_formedit_formwarning', $this->mPageTitle->getFullURL()) . "</div>\n" . $form_text; |
| 1220 | 1220 | } |
| 1221 | 1221 | |
| 1222 | 1222 | //Substitute the choosers in here too. |
| — | — | @@ -1291,7 +1291,7 @@ |
| 1292 | 1292 | } |
| 1293 | 1293 | $chooser_text .= "</select>\n"; |
| 1294 | 1294 | } |
| 1295 | | - $chooser_text .= "<input type='button' onclick=\"addInstanceFromChooser('chooserselect$chooser_count');\" value='" . wfMsg('sf_editdata_addanother') . "' disabled='true' id='chooserbutton$chooser_count'></p>"; |
| | 1295 | + $chooser_text .= "<input type='button' onclick=\"addInstanceFromChooser('chooserselect$chooser_count');\" value='" . wfMsg('sf_formedit_addanother') . "' disabled='true' id='chooserbutton$chooser_count'></p>"; |
| 1296 | 1296 | } |
| 1297 | 1297 | |
| 1298 | 1298 | $form_text = str_replace('{{{choosers}}}', $chooser_text, $form_text); |
| Index: trunk/extensions/SemanticForms/includes/SF_FormEditTab.php |
| — | — | @@ -132,7 +132,7 @@ |
| 133 | 133 | } |
| 134 | 134 | if (count($form_names) > 1) { |
| 135 | 135 | wfLoadExtensionMessages('SemanticForms'); |
| 136 | | - $warning_text = ' <div class="warningMessage">' . wfMsg('sf_editdata_morethanoneform') . "</div>\n"; |
| | 136 | + $warning_text = ' <div class="warningMessage">' . wfMsg('sf_formedit_morethanoneform') . "</div>\n"; |
| 137 | 137 | global $wgOut; |
| 138 | 138 | $wgOut->addHTML($warning_text); |
| 139 | 139 | } |