jenkins-bot has submitted this change and it was merged. Change subject: Add missing i18n strings to searchPage ......................................................................
Add missing i18n strings to searchPage Change-Id: I35d9ebfec4b125649ba770cacd041dad377a5fe3 --- M api/searchPage.php M i18n/en.json M i18n/qqq.json 3 files changed, 37 insertions(+), 23 deletions(-) Approvals: Jean-Frédéric: Looks good to me, approved jenkins-bot: Verified diff --git a/api/searchPage.php b/api/searchPage.php index 4791534..b542950 100644 --- a/api/searchPage.php +++ b/api/searchPage.php @@ -37,48 +37,42 @@ $result[] = '<th>' . _( 'search-table-th-filter' ) . '</th>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n countries */ - $result[] = '<td><label>Countries</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-countries' ) . '</label></td>'; $result[] = '<td> <!-- Empty, no search for country --></td>'; $result[] = '<td>'; $result = array_merge( $result, $this->getCountriesFilter() ); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n languages */ - $result[] = '<td><label>Languages</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-languages' ) . '</label></td>'; $result[] = '<td> <!-- Empty, no search for languages --></td>'; $result[] = '<td>'; $result = array_merge( $result, $this->getLanguagesFilter() ); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n name */ - $result[] = '<td><label>Name</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-name' ) . '</label></td>'; $result[] = '<td><input type="text" name="srname" ' . $this->fieldStyle . '></td>'; $result[] = '<td>'; // $result = array_merge($result, $this->getNameSelect()); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n address */ - $result[] = '<td><label>Address</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-address' ) . '</label></td>'; $result[] = '<td><input type="text" name="sraddress" ' . $this->fieldStyle . '></td>'; $result[] = '<td>'; // $result = array_merge($result, $this->getAddressSelect()); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n municipality */ - $result[] = '<td><label>Municipality</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-municipality' ) . '</label></td>'; $result[] = '<td><input type="text" name="srmunicipality" ' . $this->fieldStyle . '></td>'; $result[] = '<td>'; // $result = array_merge($result, $this->getMunicipalitySelect()); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME coordinates */ - $result[] = '<td><label>Coordinates</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-coordinates' ) . '</label></td>'; $result[] = '<td><!-- Lat/lon bounding box --><!-- Lat/lon distance --></td>'; $result[] = '<td>'; // $result = array_merge($result, $this->getCoordinatesSelect()); @@ -86,34 +80,30 @@ $result[] = '</tr>'; $result[] = '<tr>'; /* FIXME i18n images */ - $result[] = '<td><label>Images</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-images' ) . '</label></td>'; $result[] = '<td><!-- Not search images --></td>'; $result[] = '<td>'; - $result[] = '<input type="checkbox" name="srwithoutimages" id="srwithoutimages" value="1"><label for="srwithoutimages">Only monuments without images</label>'; // FIXME: i18n + $result[] = '<input type="checkbox" name="srwithoutimages" id="srwithoutimages" value="1"><label for="srwithoutimages">' . _( 'search-table-checkbox-only-images' ) . '</label>'; // $result = array_merge($result, $this->getImagesSelect()); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n output */ - $result[] = '<th colspan="3">Output</th>'; + $result[] = '<th colspan="3">' . _( 'search-table-th-output' ) . '</th>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n output language */ - $result[] = '<td><label>Output language</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-output-language' ) . '</label></td>'; $result[] = '<td colspan="2">'; $result = array_merge( $result, $this->getOutputLanguageSelect() ); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n format */ - $result[] = '<td><label>Output format</label></td>'; + $result[] = '<td><label>' . _( 'search-table-tr-output-format' ) . '</label></td>'; $result[] = '<td colspan="2">'; $result = array_merge( $result, $this->getOutputFormatSelect() ); $result[] = '</td>'; $result[] = '</tr>'; $result[] = '<tr>'; - /* FIXME i18n search */ - $result[] = '<td colspan="3" align="right"><input type="submit" value="Search"> </td>'; + $result[] = '<td colspan="3" align="right"><input type="submit" value="' . _( 'search-table-button-search' ) . '"> </td>'; $result[] = '</tr>'; $result[] = '</table>'; $result[] = '</form>'; diff --git a/i18n/en.json b/i18n/en.json index 35be86e..a7d9fab 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -1,4 +1,4 @@ -{ + { "@metadata": [], "title": "Monuments API", "search-title": "Monuments search", @@ -6,6 +6,18 @@ "search-table-th-field": "Field", "search-table-th-filter": "Filter", "search-table-th-search": "Search", + "search-table-th-output": "Output", + "search-table-tr-countries": "Countries", + "search-table-tr-languages": "Languages", + "search-table-tr-name": "Name", + "search-table-tr-address": "Address", + "search-table-tr-municipality": "Municipality", + "search-table-tr-coordinates": "Coordinates", + "search-table-tr-images": "Images", + "search-table-tr-output-language": "Output language", + "search-table-tr-output-format": "Output format", + "search-table-checkbox-only-images": "Only monuments without images", + "search-table-button-search": "Search", "filter-all-countries": "All countries", "filter-all-languages": "All languages", "db-field-country": "Country", diff --git a/i18n/qqq.json b/i18n/qqq.json index a275e65..a0d1e8b 100644 --- a/i18n/qqq.json +++ b/i18n/qqq.json @@ -16,6 +16,18 @@ "search-table-th-field": "Table header for the Field-column in the search table. {{Identical|Field}}", "search-table-th-filter": "Form: verb\n{{Identical|Filter}}", "search-table-th-search": "Form: verb\n{{Identical|Search}}", + "search-table-th-output": "Search header for output options.", + "search-table-tr-countries": "Search label for setting country filter options.\n{{Identical|Countries}}", + "search-table-tr-languages": "Search label for setting language filter options.\n{{Identical|Languages}}", + "search-table-tr-name": "Search label for setting options for the \"name\" field.\n{{Identical|Name}}", + "search-table-tr-address": "Search label for setting options for the \"address\" field.\n{{Identical|Address}}", + "search-table-tr-municipality": "Search label for setting options for the \"municipality\" field.", + "search-table-tr-coordinates": "Search label for setting options for coordinates.\n{{Identical|Coordinates}}", + "search-table-tr-images": "Search label for setting options for the \"image\" field.\n{{Identical|Images}}", + "search-table-tr-output-language": "Search label for selecting output language.", + "search-table-tr-output-format": "Search label for selecting output format.", + "search-table-checkbox-only-images": "Checkbox to search only monuments with images.", + "search-table-button-search": "Execute button in seach interface\n{{Identical|Search}}", "filter-all-countries": "Entry for the countries filter selecting all countries.", "filter-all-languages": "Entry for the language filter selecting all languages.\n{{Identical|All languages}}", "db-field-country": "Translation of the field \"country\" in the monuments database.\n{{Identical|Country}}", -- To view, visit https://gerrit.wikimedia.org/r/297190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35d9ebfec4b125649ba770cacd041dad377a5fe3 Gerrit-PatchSet: 1 Gerrit-Project: labs/tools/heritage Gerrit-Branch: master Gerrit-Owner: Lokal Profil <lokal.pro...@gmail.com> Gerrit-Reviewer: Jean-Frédéric <jeanfrederic.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits