Rename msgmerge to merge and msgcat to concat

Author: soft-suroleb

babel/messages/frontend.py

@@ -853,7 +853,7 @@ def run(self):
             return
 
 
-class MessageConcatenation(CommandMixin):
+class ConcatenationCatalog(CommandMixin):
     description = 'concatenates and merges the specified PO files'
     user_options = [
         ('input-files', None, ''),
@@ -1000,7 +1000,7 @@ def run(self):
             )
 
 
-class MessageMerge(CommandMixin):
+class MergeCatalog(CommandMixin):
     description='combines two Uniforum-style PO files into one'
     user_options=[
         ('input-files', None, ''),
@@ -1171,17 +1171,17 @@ class CommandLineInterface:
         'extract': 'extract messages from source files and generate a POT file',
         'init': 'create new message catalogs from a POT file',
         'update': 'update existing message catalogs from a POT file',
-        'msgcat': 'concatenates and merges the specified PO files',
-        'msgmerge': 'combines two Uniforum-style PO files into one',
+        'concat': 'concatenates and merges the specified PO files',
+        'merge': 'combines two Uniforum-style PO files into one',
     }
 
     command_classes = {
         'compile': CompileCatalog,
         'extract': ExtractMessages,
         'init': InitCatalog,
         'update': UpdateCatalog,
-        'msgcat': MessageConcatenation,
-        'msgmerge': MessageMerge,
+        'concat': ConcatenationCatalog,
+        'merge': MergeCatalog,
     }
 
     log = None  # Replaced on instance level

tests/messages/test_frontend.py

@@ -715,14 +715,14 @@ def test_supports_width(self):
         assert expected_content == actual_content
 
 
-class ConcatanationMessagesTestCase(unittest.TestCase):
+class ConcatanationCatalogTestCase(unittest.TestCase):
 
     def setUp(self):
         self.olddir = os.getcwd()
         os.chdir(data_dir)
 
         self.dist = Distribution(TEST_PROJECT_DISTRIBUTION_DATA)
-        self.cmd = frontend.MessageConcatenation(self.dist)
+        self.cmd = frontend.ConcatenationCatalog(self.dist)
         self.cmd.initialize_options()
 
         self.temp1 = f'{i18n_dir}/msgcat_temp1.po'
@@ -902,15 +902,15 @@ def test_more_than(self):
         assert expected_content == actual_content
 
 
-class MergeMessagesTestCase(unittest.TestCase):
+class MergeCatalogTestCase(unittest.TestCase):
 
     @freeze_time("1994-11-11")
     def setUp(self):
         self.olddir = os.getcwd()
         os.chdir(data_dir)
 
         self.dist = Distribution(TEST_PROJECT_DISTRIBUTION_DATA)
-        self.cmd = frontend.MessageMerge(self.dist)
+        self.cmd = frontend.MergeCatalog(self.dist)
         self.cmd.initialize_options()
 
         self.temp_def = f'{i18n_dir}/msgmerge_def.po'