Skip to content

Commit 45ebb1e

Browse files
qwersykqwersyk
authored
Merge pull request #224 from olivertzeng/upstream-locale
2 parents b3d2678 + 46fbc69 commit 45ebb1e

File tree

16 files changed

+10214
-10210
lines changed

16 files changed

+10214
-10210
lines changed

‎.github/workflows/build-locales.yml‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Rebuild Locales
33
on:
44
push:
55
branches:
6-
- main
6+
- master
77

88
jobs:
99
run-script:
@@ -17,13 +17,17 @@ jobs:
1717

1818
- name: Rebuild locales
1919
run: |
20-
fd -e py >po/POTFILES
21-
xgettext -o po/newelle.pot $(fd -e py)
20+
sudo apt update
21+
sudo apt install gettext
22+
find src -type f -name "*.py" -exec grep -lE '_\(|N\(_' {} \; > po/POTFILES
23+
find data -type f \( -name "*.xml" -o -name "*.in" \) >> po/POTFILES
24+
xgettext -o po/newelle.pot $(cat po/POTFILES)
2225
cd po
23-
for file in $(fd -e po); do
26+
for file in $(ls *.po); do
2427
msgmerge -U "$file" newelle.pot
2528
done
2629
rm -f *~
30+
cd ..
2731
2832
- name: Commit changes
2933
run: |

‎.github/workflows/flatpak-builder.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ name: Flatpak Build
55
jobs:
66
flatpak:
77
name: "Flatpak"
8-
runs-on: ubuntu-24.04
8+
runs-on: ubuntu-latest
99
container:
10-
image: bilelmoussaoui/flatpak-github-actions:gnome-47
10+
image: ghcr.io/flathub-infra/flatpak-github-actions:gnome-48
1111
options: --privileged
1212
steps:
13-
- uses: actions/checkout@v4
14-
- uses: flatpak/flatpak-github-actions/flatpak-builder@master
15-
with:
16-
bundle: io.github.qwersyk.Newelle.flatpak
13+
- uses: actions/checkout@v4
14+
- uses: flatpak/flatpak-github-actions/flatpak-builder@v6
15+
with:
16+
bundle: newelle.flatpak
1717
manifest-path: io.github.qwersyk.Newelle.json
18-
cache-key: flatpak-builder-${{ github.sha }}
18+
cache-key: flatpak-builder-${{ github.sha }}

‎README.md‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
- 🌐 **Website Reading**: Ask any information about any website by writing #https://.. question
4747
- 👤 **Profile Manager**: Create settings profiles and switch between them on the go
4848
- 📁 **Builtin File Manager**: Manage your files with the help of AI
49-
- 📝 **Rich Formatting**: Support for Markdown and LaTeX
49+
- 📝 **Rich Formatting**: Support for Markdown and LaTeX
5050
- ✏️ **Chat editing**: Edit or remove any message and manage your prompts easily
5151

5252
<picture>
@@ -102,11 +102,16 @@ gsettings set org.gnome.mutter center-new-windows true
102102
<img src="https://raw.githubusercontent.com/qwersyk/Assets/main/builder.svg" alt="builder">
103103
</picture>
104104
</a>
105-
106-
1. Install GNOME Builder on your system.
107-
2. Clone the Newelle repository from GitHub.
108-
3. Open the project in GNOME Builder and compile it.
109-
4. Once compiled, you can run the program from the compiled executable.
105+
There are two ways of doing this
106+
* `install.sh`
107+
1. Install the latest Gnome SDK
108+
2. Run `sh install.sh`
109+
3. Profit!
110+
* Gnome Builder
111+
1. Install GNOME Builder on your system.
112+
2. Clone the Newelle repository from GitHub.
113+
3. Open the project in GNOME Builder and compile it.
114+
4. Once compiled, you can run the program from the compiled executable.
110115

111116
<a href="https://nixos.org">
112117
<picture>
@@ -119,7 +124,7 @@ gsettings set org.gnome.mutter center-new-windows true
119124
Run without installing:
120125

121126
1. run `nix run github:qwersyk/Newelle`
122-
127+
123128
For development:
124129

125130
2. Clone the Newelle repository from GitHub.
@@ -134,6 +139,9 @@ For development:
134139
</picture>
135140
</a>
136141

142+
> [!WARNING]
143+
> Localizations will not work on these builds! If you want your language to work, refer to the
144+
> "Builder" section
137145
1. Download the latest release from the [Github Actions](https://github.com/qwersyk/Newelle/actions)
138146
2. Extract the downloaded package.
139147
3. Install a flatpak package.

‎install.sh‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
#!/bin/bash
2+
APPID="io.github.qwersyk.Newelle"
3+
BUNDLENAME="newelle.flatpak"
4+
flatpak-builder --install --user --force-clean flatpak-app "$APPID".json
5+
6+
if [ "$1" = "bundle" ]; then
7+
flatpak build-bundle ~/.local/share/flatpak/repo "$BUNDLENAME" "$APPID"
8+
fi

‎po/POTFILES‎

Lines changed: 49 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,77 +1,77 @@
11
src/window.py
2-
src/extensions.py
32
src/main.py
3+
src/extensions.py
44
src/controller.py
5-
src/ui/settings.py
65
src/constants.py
7-
src/ui/thread_editing.py
6+
src/utility/strings.py
7+
src/utility/util.py
8+
src/ui/settings.py
89
src/ui/presentation.py
9-
src/ui/screenrecorder.py
1010
src/ui/mini_window.py
11-
src/ui/shortcuts.py
12-
src/ui/profile.py
13-
src/integrations/website_reader.py
14-
src/utility/message_chunk.py
15-
src/utility/strings.py
16-
src/integrations/websearch.py
17-
src/utility/audio_recorder.py
1811
src/ui/extension.py
19-
src/utility/util.py
2012
src/ui/widgets/tipscarousel.py
2113
src/ui/widgets/file.py
14+
src/utility/message_chunk.py
15+
src/integrations/website_reader.py
2216
src/ui/widgets/website.py
23-
src/handlers/handler.py
24-
src/ui/widgets/websearch.py
25-
src/ui/widgets/thinking.py
26-
src/ui/widgets/terminal_dialog.py
27-
src/ui/widgets/profilerow.py
17+
src/ui/widgets/barchart.py
18+
src/handlers/llm/openai_handler.py
19+
src/integrations/websearch.py
2820
src/handlers/websearch/tavily.py
29-
src/ui/widgets/multiline.py
30-
src/ui/widgets/markuptextview.py
31-
src/ui/widgets/latex.py
32-
src/ui/widgets/documents_reader.py
21+
src/handlers/llm/gemini_handler.py
3322
src/ui/widgets/copybox.py
23+
src/handlers/llm/claude_handler.py
24+
src/ui/thread_editing.py
25+
src/handlers/llm/openrouter_handler.py
26+
src/ui/widgets/websearch.py
27+
src/ui/shortcuts.py
3428
src/ui/widgets/comborow.py
35-
src/ui/widgets/barchart.py
36-
src/handlers/websearch/duckduckgo_handler.py
29+
src/ui/widgets/multiline.py
30+
src/ui/widgets/terminal_dialog.py
31+
src/handlers/tts/openai_tts_handler.py
32+
src/utility/audio_recorder.py
33+
src/ui/widgets/thinking.py
34+
src/handlers/tts/groq_tts_handler.py
35+
src/handlers/tts/elevenlabs_handler.py
36+
src/handlers/tts/custom_openai_tts.py
37+
src/ui/screenrecorder.py
3738
src/handlers/tts/tts.py
39+
src/handlers/llm/ollama_handler.py
40+
src/ui/widgets/markuptextview.py
41+
src/ui/widgets/latex.py
42+
src/ui/widgets/profilerow.py
3843
src/handlers/tts/custom_handler.py
39-
src/handlers/tts/openai_tts_handler.py
40-
src/handlers/memory/user_summary_handler.py
44+
src/handlers/websearch/duckduckgo_handler.py
45+
src/ui/profile.py
46+
src/handlers/llm/newelle_handler.py
4147
src/handlers/stt/witai_handler.py
42-
src/handlers/memory/summary_memoripy_handler.py
43-
src/handlers/stt/whispercpp_handler.py
4448
src/handlers/stt/openaisr_handler.py
45-
src/handlers/stt/whisper_handler.py
49+
src/handlers/llm/mistral_handler.py
50+
src/ui/widgets/documents_reader.py
4651
src/handlers/stt/groqsr_handler.py
47-
src/handlers/memory/memoripy_handler.py
48-
src/handlers/stt/vosk_handler.py
4952
src/handlers/stt/googlesr_handler.py
50-
src/handlers/stt/custom_handler.py
51-
src/handlers/llm/openrouter_handler.py
52-
src/handlers/stt/sphinx_handler.py
53-
src/handlers/llm/openai_handler.py
54-
src/handlers/tts/custom_openai_tts.py
55-
src/handlers/rag/rag_handler.py
56-
src/handlers/tts/elevenlabs_handler.py
57-
src/handlers/tts/groq_tts_handler.py
58-
src/handlers/llm/newelle_handler.py
59-
src/handlers/rag/llamaindex_handler.py
60-
src/handlers/llm/ollama_handler.py
61-
src/handlers/llm/mistral_handler.py
53+
src/handlers/llm/custom_handler.py
6254
src/handlers/llm/llm.py
6355
src/handlers/llm/groq_handler.py
64-
src/handlers/llm/gpt4all_handler.py
65-
src/handlers/llm/gpt3any_handler.py
66-
src/handlers/llm/gemini_handler.py
56+
src/handlers/stt/whispercpp_handler.py
57+
src/handlers/handler.py
58+
src/handlers/stt/whisper_handler.py
6759
src/handlers/llm/deepseek_handler.py
68-
src/handlers/llm/custom_handler.py
69-
src/handlers/llm/claude_handler.py
60+
src/handlers/stt/vosk_handler.py
7061
src/handlers/embeddings/wordllama_handler.py
71-
src/handlers/embeddings/openai_handler.py
72-
src/handlers/embeddings/ollama_handler.py
62+
src/handlers/stt/sphinx_handler.py
63+
src/handlers/stt/custom_handler.py
64+
src/handlers/llm/gpt4all_handler.py
7365
src/handlers/embeddings/embedding.py
66+
src/handlers/llm/gpt3any_handler.py
7467
src/handlers/embeddings/gemini_handler.py
68+
src/handlers/embeddings/openai_handler.py
69+
src/handlers/embeddings/ollama_handler.py
70+
src/handlers/memory/user_summary_handler.py
71+
src/handlers/memory/summary_memoripy_handler.py
72+
src/handlers/rag/rag_handler.py
73+
src/handlers/memory/memoripy_handler.py
74+
src/handlers/rag/llamaindex_handler.py
7575
data/io.github.qwersyk.Newelle.appdata.xml.in
7676
data/io.github.qwersyk.Newelle.desktop.in
7777
data/io.github.qwersyk.Newelle.gschema.xml

0 commit comments

Comments
 (0)