From f5a3fd90721c11f1fa795b130453f4465dbef17a Mon Sep 17 00:00:00 2001 From: David Yonge-Mallo Date: Fri, 12 Jul 2013 08:33:42 +0000 Subject: [PATCH] DATA: Change "PhoneNumberMetaData" to "PhoneNumberMetadata" throughout for consistency --- cpp/CMakeLists.txt | 6 +++--- debian/changelog | 7 +++++++ java/build.xml | 10 +++++----- .../com/google/i18n/phonenumbers/MetadataManager.java | 2 +- java/release_notes.txt | 4 ++++ javascript/README | 2 +- javascript/i18n/phonenumbers/metadata.js | 2 +- javascript/i18n/phonenumbers/metadatafortesting.js | 2 +- javascript/i18n/phonenumbers/metadatalite.js | 2 +- resources/PhoneNumberAlternateFormats.xml | 4 ++-- ...PhoneNumberMetaData.xml => PhoneNumberMetadata.xml} | 0 ...orTesting.xml => PhoneNumberMetadataForTesting.xml} | 2 +- resources/phonemetadata.proto | 2 +- .../i18n/phonenumbers/BuildMetadataProtoFromXml.java | 2 +- 14 files changed, 29 insertions(+), 18 deletions(-) rename resources/{PhoneNumberMetaData.xml => PhoneNumberMetadata.xml} (100%) rename resources/{PhoneNumberMetaDataForTesting.xml => PhoneNumberMetadataForTesting.xml} (99%) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 9bf41d910..564a60472 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -277,7 +277,7 @@ if (${USE_LITE_METADATA} STREQUAL "ON") set (METADATA_TARGET "generate-lite-metadata") add_metadata_gen_target ( ${METADATA_TARGET} - "${RESOURCES_DIR}/PhoneNumberMetaData.xml" + "${RESOURCES_DIR}/PhoneNumberMetadata.xml" "lite_metadata" "metadata" ) @@ -287,7 +287,7 @@ else () set (METADATA_TARGET "generate-metadata") add_metadata_gen_target ( ${METADATA_TARGET} - "${RESOURCES_DIR}/PhoneNumberMetaData.xml" + "${RESOURCES_DIR}/PhoneNumberMetadata.xml" "metadata" "metadata" ) @@ -298,7 +298,7 @@ endif () set (TEST_METADATA_TARGET "generate-test-metadata") add_metadata_gen_target ( ${TEST_METADATA_TARGET} - "${RESOURCES_DIR}/PhoneNumberMetaDataForTesting.xml" + "${RESOURCES_DIR}/PhoneNumberMetadataForTesting.xml" "test_metadata" "metadata" ) diff --git a/debian/changelog b/debian/changelog index 935e2ade5..f9aacf4ed 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +libphonenumber (5.6.1) precise; urgency=low + + * Code changes: + - Rename all instances of PhoneNumberMetadata to PhoneNumberMetadata for consistency. + + -- David Yonge-Mallo Fri, Jul 12 2013 10:26:53 +0200 + libphonenumber (5.6) precise; urgency=low * Code changes: diff --git a/java/build.xml b/java/build.xml index 41bad2f4a..baceb903d 100644 --- a/java/build.xml +++ b/java/build.xml @@ -32,7 +32,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -94,14 +94,14 @@ - + - + @@ -109,7 +109,7 @@ - + diff --git a/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java b/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java index 73e5de937..3817f9002 100644 --- a/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java +++ b/java/libphonenumber/src/com/google/i18n/phonenumbers/MetadataManager.java @@ -33,7 +33,7 @@ import java.util.logging.Logger; /** * Class encapsulating loading of PhoneNumber Metadata information. Currently this is used only for * additional data files such as PhoneNumberAlternateFormats, but in the future it is envisaged it - * would handle the main metadata file (PhoneNumberMetaData.xml) as well. + * would handle the main metadata file (PhoneNumberMetadata.xml) as well. * * @author Lara Rennie */ diff --git a/java/release_notes.txt b/java/release_notes.txt index 21b002024..70389ab1d 100644 --- a/java/release_notes.txt +++ b/java/release_notes.txt @@ -1,3 +1,7 @@ +Jul 12, 2013: libphonenumber-5.6.1 +* Code changes: + - Rename all instances of PhoneNumberMetadata to PhoneNumberMetadata for consistency. + Jun 05, 2013: libphonenumber-5.6 * Code changes: - Fix for as-you-type-formatting bug affecting countries with no national prefix diff --git a/javascript/README b/javascript/README index 76b42cb6b..558ce8758 100644 --- a/javascript/README +++ b/javascript/README @@ -68,7 +68,7 @@ project: mvn -f tools/java/java-build/pom.xml package 2. If the phone number metadata in the XML format has changed - (resources/PhoneNumberMetaData.xml) + (resources/PhoneNumberMetadata.xml) run the following commands to regenerate metadata.js and metadatafortesting.js: diff --git a/javascript/i18n/phonenumbers/metadata.js b/javascript/i18n/phonenumbers/metadata.js index f1efc2d2e..e77ad54a7 100644 --- a/javascript/i18n/phonenumbers/metadata.js +++ b/javascript/i18n/phonenumbers/metadata.js @@ -17,7 +17,7 @@ /** * @fileoverview Generated metadata for file - * ../resources/PhoneNumberMetaData.xml + * ../resources/PhoneNumberMetadata.xml * @author Nikolaos Trogkanis */ diff --git a/javascript/i18n/phonenumbers/metadatafortesting.js b/javascript/i18n/phonenumbers/metadatafortesting.js index fbf72f5f1..336656bc8 100644 --- a/javascript/i18n/phonenumbers/metadatafortesting.js +++ b/javascript/i18n/phonenumbers/metadatafortesting.js @@ -17,7 +17,7 @@ /** * @fileoverview Generated metadata for file - * ../resources/PhoneNumberMetaDataForTesting.xml + * ../resources/PhoneNumberMetadataForTesting.xml * @author Nikolaos Trogkanis */ diff --git a/javascript/i18n/phonenumbers/metadatalite.js b/javascript/i18n/phonenumbers/metadatalite.js index 7a9a2f9d6..48181ab50 100644 --- a/javascript/i18n/phonenumbers/metadatalite.js +++ b/javascript/i18n/phonenumbers/metadatalite.js @@ -17,7 +17,7 @@ /** * @fileoverview Generated metadata for file - * ../resources/PhoneNumberMetaData.xml + * ../resources/PhoneNumberMetadata.xml * @author Nikolaos Trogkanis */ diff --git a/resources/PhoneNumberAlternateFormats.xml b/resources/PhoneNumberAlternateFormats.xml index 5997ac151..9fca11482 100644 --- a/resources/PhoneNumberAlternateFormats.xml +++ b/resources/PhoneNumberAlternateFormats.xml @@ -18,7 +18,7 @@ Additional Phone Number Formatting information, containing alternative formats that are commonly used when writing phone numbers in certain countries. Note that this is in addition to the formatting information - provided by the main PhoneNumberMetaData.xml file - formatting patterns + provided by the main PhoneNumberMetadata.xml file - formatting patterns should not be duplicated. Note also that only the most specific leading-digits pattern is present for @@ -27,7 +27,7 @@ on alternate formatting patterns. For regions that share a country calling code, only the region with - mainCountryForCode set to true in PhoneNumberMetaData.xml should be present + mainCountryForCode set to true in PhoneNumberMetadata.xml should be present here. Note: Territories are in alphabetical order by their IDs, which are based on ISO 3166-1 diff --git a/resources/PhoneNumberMetaData.xml b/resources/PhoneNumberMetadata.xml similarity index 100% rename from resources/PhoneNumberMetaData.xml rename to resources/PhoneNumberMetadata.xml diff --git a/resources/PhoneNumberMetaDataForTesting.xml b/resources/PhoneNumberMetadataForTesting.xml similarity index 99% rename from resources/PhoneNumberMetaDataForTesting.xml rename to resources/PhoneNumberMetadataForTesting.xml index eff33d849..055f471cd 100644 --- a/resources/PhoneNumberMetaDataForTesting.xml +++ b/resources/PhoneNumberMetadataForTesting.xml @@ -16,7 +16,7 @@ MetaData on Phone Number Plan and formatting rules. This file is used solely for the purpose of unittesting, so data in this file is not - necessarily consistent with that of PhoneNumberMetaData.xml. + necessarily consistent with that of PhoneNumberMetadata.xml. --> diff --git a/resources/phonemetadata.proto b/resources/phonemetadata.proto index ecd3ba287..87f4c1e6e 100644 --- a/resources/phonemetadata.proto +++ b/resources/phonemetadata.proto @@ -16,7 +16,7 @@ // Definition of protocol buffer for holding metadata for international // telephone numbers. The fields here correspond exactly to those in -// resources/PhoneNumberMetaData.xml. +// resources/PhoneNumberMetadata.xml. // @author Shaopeng Jia syntax = "proto2"; diff --git a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java index d399d0cf4..452adce2d 100644 --- a/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java +++ b/tools/java/java-build/src/com/google/i18n/phonenumbers/BuildMetadataProtoFromXml.java @@ -71,7 +71,7 @@ public class BuildMetadataProtoFromXml extends Command { "\n" + "Example command line invocation:\n" + CLASS_NAME + " \\\n" + - " --" + INPUT_FILE + "=resources/PhoneNumberMetaData.xml \\\n" + + " --" + INPUT_FILE + "=resources/PhoneNumberMetadata.xml \\\n" + " --" + OUTPUT_DIR + "=java/libphonenumber/src/com/google/i18n/phonenumbers \\\n" + " --" + DATA_PREFIX + "=data/PhoneNumberMetadataProto \\\n" + " --" + MAPPING_CLASS + "=CountryCodeToRegionCodeMap \\\n" +