Merge pull request #3 from m-xim/dev

Dev

Author: m-xim

CHANGELOG.md

@@ -1,11 +1,47 @@
-## [1.1.1](https://github.com/m-xim/fluentus/compare/v1.1.0...v1.1.1) (2025-01-05)
+# [1.2.0-dev.4](https://github.com/m-xim/fluentus/compare/v1.2.0-dev.3...v1.2.0-dev.4) (2025-01-09)
+
+
+### Bug Fixes
+
+* **fluent_api:** replace `fluent.runtime` error handling with ParseError from `fluent.syntax` ([51b2be3](https://github.com/m-xim/fluentus/commit/51b2be3a3ef9014872fa2b36dd24459bcfc498d0))
+
+# [1.2.0-dev.3](https://github.com/m-xim/fluentus/compare/v1.2.0-dev.2...v1.2.0-dev.3) (2025-01-09)
+
+
+### Bug Fixes
+
+* **fluent_api:** enable uploading of files from subdirectories ([d25ad11](https://github.com/m-xim/fluentus/commit/d25ad11cd54f66dbb4391ee2c10a5998ad2c47f9))
+
+# [1.2.0-dev.2](https://github.com/m-xim/fluentus/compare/v1.2.0-dev.1...v1.2.0-dev.2) (2025-01-09)
 
 
 ### Bug Fixes
 
+* **table_manager:** change dict to defaultdict ([4798cdd](https://github.com/m-xim/fluentus/commit/4798cddfdda5e7e5857566dab3da6ed8f39552e1))
+
+# [1.2.0-dev.1](https://github.com/m-xim/fluentus/compare/v1.1.1-dev.3...v1.2.0-dev.1) (2025-01-07)
+
+
+### Features
+
+* **table:** display all translations in the table ([41e2670](https://github.com/m-xim/fluentus/commit/41e26708bbdc5260984a8dca855b7c565a3676e1))
+
+## [1.1.1-dev.3](https://github.com/m-xim/fluentus/compare/v1.1.1-dev.2...v1.1.1-dev.3) (2025-01-07)
+
+
+### Bug Fixes
+
+* **api:** ensure translations are properly cleared ([1514859](https://github.com/m-xim/fluentus/commit/1514859fe6b7be5affd08874f85c6159f7b514b6))
 * **editor:** cursor position ([2f8f078](https://github.com/m-xim/fluentus/commit/2f8f078735e05b9f19ef48df33d0bd3354468b67))
 * **fluent_api:** fix whitespace (\n,\s,\t,...) characters at end of text, refactor code and add translation types ([9de7e6d](https://github.com/m-xim/fluentus/commit/9de7e6d12889ab43db7d4383599e40b71b67c1fb))
 
+## [1.1.1](https://github.com/m-xim/fluentus/compare/v1.1.0...v1.1.1) (2025-01-05)
+
+
+### Bug Fixes
+
+* **fluent_api:** enable uploading of files from subdirectories ([d25ad11](https://github.com/m-xim/fluentus/commit/d25ad11cd54f66dbb4391ee2c10a5998ad2c47f9))
+
 ## [1.1.1-dev.2](https://github.com/m-xim/fluentus/compare/v1.1.1-dev.1...v1.1.1-dev.2) (2025-01-05)
 
 

README.md

@@ -1,20 +1,21 @@
 # fluentus
 [![GitHub release (latest by date)](https://img.shields.io/github/v/release/m-xim/fluentus)](https://github.com/m-xim/fluentus/releases/latest)
-![Deployment Status](https://img.shields.io/github/actions/workflow/status/m-xim/fluentus/release.yml?branch=main&label=build%20main)
-![Deployment Status](https://img.shields.io/github/actions/workflow/status/m-xim/fluentus/release.yml?branch=dev&label=build%20dev)
-![GitHub License](https://img.shields.io/github/license/m-xim/fluentus)
+[![Deployment Status](https://img.shields.io/github/actions/workflow/status/m-xim/fluentus/release.yml?branch=main&label=build%20main)](https://github.com/m-xim/fluentus/actions)
+[![Deployment Status](https://img.shields.io/github/actions/workflow/status/m-xim/fluentus/release.yml?branch=dev&label=build%20dev)](https://github.com/m-xim/fluentus/actions)
+[![GitHub License](https://img.shields.io/github/license/m-xim/fluentus)](https://github.com/m-xim/fluentus/blob/main/LICENSE)
 
 [//]: # (## About)
-Fluent is a powerful tool designed to edit the Fluent localization files from [Project Fluent](https://projectfluent.org/)
+Fluentus is a powerful tool designed to edit the Fluent localization files from [Project Fluent](https://projectfluent.org)
 
 > [!WARNING]
 > Fluentus is currently in beta stage. Please proceed with caution and ensure to back up your localization files before using Fluentus.
 
+<img src="images/preview.png" alt="Preview Fluentus program" width="600">
+
 ## Usage
 To run the project, download the latest release from the [Releases](https://github.com/m-xim/fluentus/releases) page. Choose the version for your platform (Windows, macOS, Linux) and run the downloaded file.
 
 <details>
-
 <summary>Run from source</summary>
 
 To run the project from source, follow these steps:
@@ -24,20 +25,34 @@ To run the project from source, follow these steps:
 4. Run the project: `python src/app.py`
 </details>
 
-## Example Localization Files
-Download the `example_locales` folder from the repository. This folder contains the localization files that you can use to test and understand how Fluentus works.
+## Localization Files Structure
+The localization files are organized into language-specific directories. Each directory contains Fluent Translation List (FTL) files and subdirectories as needed.
+
+```plaintext
+locales/
+├── en/       # English localization files
+│   ├── example.ftl
+│   └── subfolder/
+│       └── another_example.ftl
+├── ru/       # Russian localization files
+│   ├── example.ftl
+│   └── subfolder/
+│       └── another_example.ftl
+└── ...       # Other language
+```
 
-## Contributing  
-We welcome contributions! To contribute:  
-1. Fork the repository.  
-2. Create a new branch:  
-   `git checkout -b feature/your-feature-name`  
+> [!TIP]
+> Download the `example_locales` folder from the repository. This folder contains the localization files that you can use to test and understand how Fluentus works.
+
+## Contributing
+We welcome contributions! To contribute:
+1. Fork the repository.
+2. Create a new branch: 
+   `git checkout -b feature/your-feature-name`
 3. Make your changes and submit a pull request.
 
 ## Development
-
 <details>
-
 <summary>Building</summary>
 
 To building the project, follow these steps:

images/preview.png

@@ -1,4 +1,4 @@
 PyQt6~=6.8.0
-pydantic~=2.10.4
+pydantic~=2.10.5
 fluent.syntax~=0.19.0
 loguru~=0.7.3

requirements.txt

@@ -8,4 +8,9 @@ name = "Fluentus"
 projects = "projects"
 
 [ftl_field]
-check = "check"
+check = "check"
+
+[table_column]
+icon = ""
+variable = "Variable"
+translation = "Translation"

src/config.toml

@@ -20,7 +20,8 @@ def __init__(self, folder: Optional[str] = None):
         super().__init__()
 
         self.window_editor = None
-        self.fluent_api = FluentAPI()
+        self.fluent_api = None
+        self.table_manager = None
 
         # Load UI
         uic.loadUi(resource_path('resource/ui/editor_window.ui'), self)
@@ -45,9 +46,6 @@ def __init__(self, folder: Optional[str] = None):
         self.lang_1.activated.connect(self.on_language_changed)
         self.lang_2.activated.connect(self.on_language_changed)
 
-        # Initialize table manager
-        self.table_manager = TableManager(self.table, self.fluent_api, self.load_variable)
-
         # Connect save button
         self.save_button.clicked.connect(self.save_all_changes)
 
@@ -64,17 +62,20 @@ def __init__(self, folder: Optional[str] = None):
 
     def on_language_changed(self) -> None:
         """Handle language selection changes."""
-        # TODO: Instead of creating a new table, update the current ones
-        self.load_table()
         self.load_variable()
 
     def _initialize_folder(self, folder: str) -> None:
         """Initializes the editor with a specified folder."""
-        self.fluent_api.load_ftl_files(folder)
+        self.fluent_api = FluentAPI(folder)
+
+        # Initialize table manager
+        self.table_manager = TableManager(self.table, self.fluent_api, self.load_variable)
+
         self.folder_text.setText(folder)
         self.refresh_editing_state()
         self.set_language_selectors()
-        self.load_table()
+
+        self.table_manager.populate_table()
 
     def save_all_changes(self):
         """Save all changes and notify the user."""
@@ -103,30 +104,16 @@ def set_language_selectors(self):
         self.lang_1.setCurrentIndex(0)
         self.lang_2.setCurrentIndex(1 if len(languages) >= 2 else 0)
 
-    def set_current_item(self):
-        lang1, lang2 = self.lang_1.currentText(), self.lang_2.currentText()
-        if not lang1 or not lang2:
-            return
-
-        self.table_manager.set_current_item(lang1, lang2)
-
     def load_table(self):
         """Update the table based on selected languages."""
-        lang1, lang2 = self.lang_1.currentText(), self.lang_2.currentText()
-        if not lang1 or not lang2:
-            return
 
-        self.table_manager.populate_table(lang1, lang2)
+        self.table_manager.populate_table()
 
     def load_variable(self):
-        variable, attribute = self.table_manager.get_variable()
+        variable, attribute = self.table_manager.get_selected_names()
         if not variable:
             return
 
-        selected_items = self.table.selectedItems()
-        if selected_items:
-            self.table_manager.current_item = selected_items[0]
-
         for editor, field, lang in self.editors:
             language = lang.currentText()
             data = self.fluent_api.get_translation(variable, language)
@@ -175,14 +162,14 @@ def _open_start_window(self):
     def update_cache(self, editor: Union[QPlainTextEdit, QCheckBox], field: str, lang: QComboBox):
         """Update the cache when an editor field is modified."""
 
-        variable, attribute = self.table_manager.get_variable()
+        variable, attribute = self.table_manager.get_selected_names()
         if not variable:
             return
 
         new_content = editor.toPlainText() if isinstance(editor, QPlainTextEdit) else editor.isChecked()
 
         if self.fluent_api.update(variable, lang.currentText(), field, new_content, attribute):
-            self.set_current_item()
+            self.table_manager.set_current_item(lang.currentText())
 
         self.load_variable()