add support for xtr's add-location option, v0.1.5

- now requires xtr v0.1.5
- bump i18n-config to v0.2.2
- bump i18n-build to v0.3.0

Author: kellpossible

Cargo.lock

@@ -8,7 +8,7 @@ license = "MIT"
 name = "cargo-i18n"
 readme = "README.md"
 repository = "https://github.com/kellpossible/cargo-i18n"
-version = "0.1.4"
+version = "0.1.5"
 
 [badges]
 maintenance = { status = "actively-developed" }
@@ -17,7 +17,7 @@ maintenance = { status = "actively-developed" }
 
 [dependencies]
 i18n-embed = { version = "0.3", path = "./i18n-embed", features = ["desktop-requester"] }
-i18n-build = { version = "0.2", path = "./i18n-build", features = ["localize"] }
+i18n-build = { version = "0.3", path = "./i18n-build", features = ["localize"] }
 i18n-config = { version = "0.2", path = "./i18n-config" }
 anyhow = "1.0"
 gettext = "0.4"

Cargo.toml

@@ -188,6 +188,13 @@ extract_to_parent = false
 # is false.
 collate_extracted_subcrates = false
 
+# (Optional) How much message location information to include in the output.
+# If the type is ‘full’ (the default), it generates the lines with both file
+# name and line number: ‘#: filename:line’. If it is ‘file’, the line number
+# part is omitted: ‘#: filename’. If it is ‘never’, nothing is generated.
+# [possible values: full, file, never].
+add_location = "full"
+
 # (Optional) Whether or not to perform string extraction using the `xtr` tool.
 xtr = true
 

README.md

@@ -1,5 +1,11 @@
 # Changelog for `i18n-build`
 
+## v0.3.0
+
++ Add support for `xtr` `add-location` option.
++ Requires `xtr` version `0.1.5`.
++ Suppress progress output for `msgmerge` using `--silent`.
+
 ## v0.2.1
 
 + Updated link to this changelog in the crate README.

i18n-build/CHANGELOG.md

@@ -8,7 +8,7 @@ license = "MIT"
 name = "i18n-build"
 readme = "README.md"
 repository = "https://github.com/kellpossible/cargo-i18n/tree/master/i18n-build"
-version = "0.2.1"
+version = "0.3.0"
 
 [package.metadata.docs.rs]
 all-features = true

i18n-build/Cargo.toml

@@ -2,35 +2,35 @@ msgid ""
 msgstr ""
 "Project-Id-Version: i18n-build\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-04-10 12:18+0000\n"
+"POT-Creation-Date: 2020-04-17 08:38+0000\n"
 "Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: POEditor.com\n"
 
 #. {0} is the file path, {1} is the item which it is for, {2} is the type of item (file, directory, etc)
-#: i18n-build/src/error.rs:135
+#: i18n-build/src/error.rs:140
 msgid "The path (\"{0}\") for {1} {2} does not have valid a utf-8 encoding."
 msgstr "Путь (\"{0}\") для {1} {2} не имеeт допустимой кодировки utf-8."
 
-#: i18n-build/src/error.rs:142
+#: i18n-build/src/error.rs:147
 msgid "The path \"{0}\" does not exist on the filesystem."
 msgstr "Путь \"{0}\" не существует в файловой системе."
 
 #. {0} can be either "file", or "directory", or "symlink"
 #. {1} is a file path
 #. {2} is more detailed information about the error
 #. Example: Cannot create the file "i18n/ru/something.pot" because "some error occurred"
-#: i18n-build/src/error.rs:150
+#: i18n-build/src/error.rs:155
 msgid "Cannot create the {0} \"{1}\" because: \"{2}\"."
 msgstr "Не удалось создать {0} \"{1}\" так как: \"{2}\"."
 
 #. {0} can be either "file", or "directory", or "symlink"
 #. {1} is a file path
 #. {2} is more detailed information about the error
 #. Example: Cannot delete the file "i18n/ru/something.pot" because "some error occurred"
-#: i18n-build/src/error.rs:160
+#: i18n-build/src/error.rs:165
 msgid "Cannot delete the {0} \"{1}\" because: \"{2}\"."
 msgstr "Не удалось удалить {0} \"{1}\" так как: \"{2}\"."
 
@@ -39,34 +39,34 @@ msgstr "Не удалось удалить {0} \"{1}\" так как: \"{2}\"."
 #. {2} is the new file name
 #. {3} is more detailed information about the error
 #. Example: Cannot rename the file "old.pot" to "new.pot" because "some error occurred"
-#: i18n-build/src/error.rs:171
+#: i18n-build/src/error.rs:176
 msgid "Cannot rename the {0} \"{1}\" to \"{2}\" because {3}."
 msgstr "Не удалось переименовать {0} \"{1}\" в \"{2}\" так как {3}."
 
 #. {0} is a directory path
 #. {1} is the name of the parent directory
 #. {2} is the expected parent of the directory in {0}
 #. Example: The path "i18n/src/po" is not inside the "src" directory: "i18n/src"."
-#: i18n-build/src/error.rs:182
+#: i18n-build/src/error.rs:187
 msgid "The path \"{0}\" is not inside the \"{1}\" directory: \"{2}\"."
 msgstr "Путь \"{0}\" не находится \"{1}\" в каталоге: \"{2}\"."
 
-#: i18n-build/src/gettext_impl/mod.rs:213
+#: i18n-build/src/gettext_impl/mod.rs:215
 msgid "There was a problem executing the \"{0}\" command"
 msgstr "Произошла ошибка при выполнении команды \"{0}\"."
 
-#: i18n-build/src/gettext_impl/mod.rs:438
+#: i18n-build/src/gettext_impl/mod.rs:442
 msgid "There was a problem parsing one of the subcrates: \"{0}\"."
 msgstr "При анализе одного из подкрэйтора произошла ошибка: \"{0}\"."
 
-#: i18n-build/src/util.rs:15
+#: i18n-build/src/util.rs:17
 msgid "The \"{0}\" command was unable to start."
 msgstr "Команду \"{0}\" не удалось запустить."
 
-#: i18n-build/src/util.rs:19
+#: i18n-build/src/util.rs:21
 msgid "The \"{0}\" command had a problem waiting for output."
 msgstr "У команды \"{0}\" возникла проблема при ожидании вывода."
 
-#: i18n-build/src/util.rs:27
+#: i18n-build/src/util.rs:29
 msgid "The \"{0}\" command reported that it was unsuccessful."
 msgstr "Команда \"{0}\" сообщила что она не удалась."

i18n-build/i18n/po/ru/i18n_build.po

@@ -120,6 +120,8 @@ pub fn run_xtr(
             crt.version.as_str(),
             "--default-domain",
             crt.module_name().as_str(),
+            "--add-location",
+            gettext_config.add_location.to_str(),
             "-o",
             pot_file_path.to_str().ok_or(PathError::not_valid_utf8(
                 pot_file_path.clone(),
@@ -315,6 +317,7 @@ pub fn run_msgmerge(
 
         let mut msgmerge = Command::new(msgmerge_command_name);
         msgmerge.args(&[
+            "--silent",
             "--backup=none",
             "--update",
             po_file_path.to_str().ok_or(PathError::not_valid_utf8(

i18n-build/src/gettext_impl/mod.rs

@@ -1,5 +1,9 @@
 # Changelog for `i18n-config`
 
+## v0.2.2
+
++ Add support for `xtr` `add-location` option.
+
 ## v0.2.1
 
 + Updated link to this changelog in the crate README.

i18n-config/CHANGELOG.md

@@ -8,7 +8,7 @@ license = "MIT"
 name = "i18n-config"
 readme = "README.md"
 repository = "https://github.com/kellpossible/cargo-i18n/tree/master/i18n-config"
-version = "0.2.1"
+version = "0.2.2"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 

i18n-config/Cargo.toml

@@ -359,6 +359,28 @@ impl I18nConfig {
     }
 }
 
+#[derive(Deserialize, Debug, Clone)]
+#[serde(rename_all = "lowercase")]
+pub enum GettextAddLocation {
+    Full,
+    File,
+    Never,
+}
+
+impl GettextAddLocation {
+    pub fn to_str(&self) -> &str {
+        match self {
+            GettextAddLocation::Full => "full",
+            GettextAddLocation::File => "file",
+            GettextAddLocation::Never => "never",
+        }
+    }
+}
+
+impl Default for GettextAddLocation {
+    fn default() -> Self { GettextAddLocation::Full }
+}
+
 /// The data structure representing what is stored (and possible to
 /// store) within the `gettext` subsection of a `i18n.toml` file.
 #[derive(Deserialize, Debug, Clone)]
@@ -389,6 +411,13 @@ pub struct GettextConfig {
     pub msgid_bugs_address: Option<String>,
     /// Whether or not to perform string extraction using the `xtr` command.
     pub xtr: Option<bool>,
+    /// Generate ‘#: filename:line’ lines (default) in the pot files when 
+    /// running the `xtr` command. If the type is ‘full’ (the default), 
+    /// it generates the lines with both file name and line number. 
+    /// If it is ‘file’, the line number part is omitted. If it is ‘never’,
+    ///  nothing is generated. [possible values: full, file, never].
+    #[serde(default)]
+    pub add_location: GettextAddLocation,
     /// Path to where the pot files will be written to by the `xtr`
     /// command, and were they will be read from by `msginit` and
     /// `msgmerge`.