Skip to content

Commit 8793a45

Browse files
lenemterlenemter
authored
Aplication -> Application (#8)
1 parent 083a33a commit 8793a45

File tree

4 files changed

+47
-59
lines changed

4 files changed

+47
-59
lines changed

‎po/de.po‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: io.github.elementary-community.app-generator\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2024-10-08 17:09-0500\n"
10+
"POT-Creation-Date: 2024-10-13 09:15+0300\n"
1111
"PO-Revision-Date: 2024-09-19 11:25-0500\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -25,27 +25,27 @@ msgstr ""
2525
msgid "Create an elementary OS app using one of the pre-made app templates"
2626
msgstr ""
2727

28-
#: src/MainWindow.vala:58 src/Views/Developer.vala:39
28+
#: src/MainWindow.vala:58 src/Views/Developer.vala:40
2929
msgid "Developer"
3030
msgstr ""
3131

32-
#: src/MainWindow.vala:59
32+
#: src/MainWindow.vala:59 src/Views/Form.vala:100
3333
msgid "Application"
3434
msgstr ""
3535

3636
#: src/MainWindow.vala:60
3737
msgid "Finalized"
3838
msgstr ""
3939

40-
#: src/Views/Developer.vala:30
40+
#: src/Views/Developer.vala:31
4141
msgid "Next"
4242
msgstr ""
4343

44-
#: src/Views/Developer.vala:43
44+
#: src/Views/Developer.vala:44
4545
msgid "Name:"
4646
msgstr ""
4747

48-
#: src/Views/Developer.vala:45
48+
#: src/Views/Developer.vala:46
4949
msgid "Email:"
5050
msgstr ""
5151

@@ -66,10 +66,6 @@ msgstr ""
6666
msgid "Create Project"
6767
msgstr ""
6868

69-
#: src/Views/Form.vala:100
70-
msgid "Aplication"
71-
msgstr ""
72-
7369
#: src/Views/Form.vala:104
7470
msgid "Project Name:"
7571
msgstr ""
@@ -81,7 +77,7 @@ msgstr ""
8177

8278
#. form_box.append (identifier_description);
8379
#: src/Views/Form.vala:110
84-
msgid "Aplication ID:"
80+
msgid "Application ID:"
8581
msgstr ""
8682

8783
#: src/Views/Form.vala:112

‎po/es.po‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ msgid ""
77
msgstr ""
88
"Project-Id-Version: io.github.elementary-community.app-generator\n"
99
"Report-Msgid-Bugs-To: \n"
10-
"POT-Creation-Date: 2024-10-08 17:09-0500\n"
10+
"POT-Creation-Date: 2024-10-13 09:15+0300\n"
1111
"PO-Revision-Date: 2024-09-19 11:25-0500\n"
1212
"Last-Translator: Automatically generated\n"
1313
"Language-Team: none\n"
@@ -25,27 +25,27 @@ msgstr ""
2525
msgid "Create an elementary OS app using one of the pre-made app templates"
2626
msgstr ""
2727

28-
#: src/MainWindow.vala:58 src/Views/Developer.vala:39
28+
#: src/MainWindow.vala:58 src/Views/Developer.vala:40
2929
msgid "Developer"
3030
msgstr ""
3131

32-
#: src/MainWindow.vala:59
32+
#: src/MainWindow.vala:59 src/Views/Form.vala:100
3333
msgid "Application"
3434
msgstr ""
3535

3636
#: src/MainWindow.vala:60
3737
msgid "Finalized"
3838
msgstr ""
3939

40-
#: src/Views/Developer.vala:30
40+
#: src/Views/Developer.vala:31
4141
msgid "Next"
4242
msgstr ""
4343

44-
#: src/Views/Developer.vala:43
44+
#: src/Views/Developer.vala:44
4545
msgid "Name:"
4646
msgstr ""
4747

48-
#: src/Views/Developer.vala:45
48+
#: src/Views/Developer.vala:46
4949
msgid "Email:"
5050
msgstr ""
5151

@@ -66,10 +66,6 @@ msgstr ""
6666
msgid "Create Project"
6767
msgstr ""
6868

69-
#: src/Views/Form.vala:100
70-
msgid "Aplication"
71-
msgstr ""
72-
7369
#: src/Views/Form.vala:104
7470
msgid "Project Name:"
7571
msgstr ""
@@ -81,7 +77,7 @@ msgstr ""
8177

8278
#. form_box.append (identifier_description);
8379
#: src/Views/Form.vala:110
84-
msgid "Aplication ID:"
80+
msgid "Application ID:"
8581
msgstr ""
8682

8783
#: src/Views/Form.vala:112

‎po/io.github.ecommunity.app-generator.pot‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: io.github.ecommunity.app-generator\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2024-10-08 17:09-0500\n"
11+
"POT-Creation-Date: 2024-10-13 09:15+0300\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1414
"Language-Team: LANGUAGE <[email protected]>\n"
@@ -25,27 +25,27 @@ msgstr ""
2525
msgid "Create an elementary OS app using one of the pre-made app templates"
2626
msgstr ""
2727

28-
#: src/MainWindow.vala:58 src/Views/Developer.vala:39
28+
#: src/MainWindow.vala:58 src/Views/Developer.vala:40
2929
msgid "Developer"
3030
msgstr ""
3131

32-
#: src/MainWindow.vala:59
32+
#: src/MainWindow.vala:59 src/Views/Form.vala:100
3333
msgid "Application"
3434
msgstr ""
3535

3636
#: src/MainWindow.vala:60
3737
msgid "Finalized"
3838
msgstr ""
3939

40-
#: src/Views/Developer.vala:30
40+
#: src/Views/Developer.vala:31
4141
msgid "Next"
4242
msgstr ""
4343

44-
#: src/Views/Developer.vala:43
44+
#: src/Views/Developer.vala:44
4545
msgid "Name:"
4646
msgstr ""
4747

48-
#: src/Views/Developer.vala:45
48+
#: src/Views/Developer.vala:46
4949
msgid "Email:"
5050
msgstr ""
5151

@@ -66,10 +66,6 @@ msgstr ""
6666
msgid "Create Project"
6767
msgstr ""
6868

69-
#: src/Views/Form.vala:100
70-
msgid "Aplication"
71-
msgstr ""
72-
7369
#: src/Views/Form.vala:104
7470
msgid "Project Name:"
7571
msgstr ""
@@ -81,7 +77,7 @@ msgstr ""
8177

8278
#. form_box.append (identifier_description);
8379
#: src/Views/Form.vala:110
84-
msgid "Aplication ID:"
80+
msgid "Application ID:"
8581
msgstr ""
8682

8783
#: src/Views/Form.vala:112

‎src/Views/Form.vala‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
public class Views.Form : Adw.Bin {
77
private Granite.ValidatedEntry project_name_entry;
88
private Granite.ValidatedEntry identifier_entry;
9-
private Gtk.Entry aplication_id_entry;
9+
private Gtk.Entry application_id_entry;
1010
private Gtk.Entry location_entry;
1111
private Granite.Toast toast;
1212

@@ -52,7 +52,7 @@ public class Views.Form : Adw.Bin {
5252
identifier_description.add_css_class (Granite.STYLE_CLASS_DIM_LABEL);
5353
identifier_description.add_css_class (Granite.STYLE_CLASS_SMALL_LABEL);
5454

55-
aplication_id_entry = new Gtk.Entry () {
55+
application_id_entry = new Gtk.Entry () {
5656
margin_top = 6,
5757
editable = false
5858
};
@@ -97,7 +97,7 @@ public class Views.Form : Adw.Bin {
9797
buttons_box.append (create_button);
9898

9999
var form_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
100-
form_box.append (new Gtk.Label (_("Aplication")) {
100+
form_box.append (new Gtk.Label (_("Application")) {
101101
halign = START,
102102
css_classes = { Granite.STYLE_CLASS_H1_LABEL }
103103
});
@@ -107,8 +107,8 @@ public class Views.Form : Adw.Bin {
107107
form_box.append (new Granite.HeaderLabel (_("Organization Identifier:")));
108108
form_box.append (identifier_entry);
109109
// form_box.append (identifier_description);
110-
form_box.append (new Granite.HeaderLabel (_("Aplication ID:")));
111-
form_box.append (aplication_id_entry);
110+
form_box.append (new Granite.HeaderLabel (_("Application ID:")));
111+
form_box.append (application_id_entry);
112112
form_box.append (new Granite.HeaderLabel (_("Location:")));
113113
form_box.append (location_entry);
114114
form_box.append (buttons_box);
@@ -132,12 +132,12 @@ public class Views.Form : Adw.Bin {
132132
child = overlay;
133133

134134
project_name_entry.changed.connect (() => {
135-
aplication_id_entry.text = identifier_entry.text + "." + project_name_entry.text;
135+
application_id_entry.text = identifier_entry.text + "." + project_name_entry.text;
136136
create_button.sensitive = project_name_entry.is_valid && identifier_entry.is_valid && location_entry.text.length > 0;
137137
});
138138

139139
identifier_entry.changed.connect (() => {
140-
aplication_id_entry.text = identifier_entry.text + "." + project_name_entry.text;
140+
application_id_entry.text = identifier_entry.text + "." + project_name_entry.text;
141141
create_button.sensitive = project_name_entry.is_valid && identifier_entry.is_valid && location_entry.text.length > 0;
142142
});
143143

@@ -168,19 +168,19 @@ public class Views.Form : Adw.Bin {
168168
});
169169

170170
create_button.clicked.connect (() => {
171-
clone_repo_async (location_entry.text, project_name_entry.text, aplication_id_entry.text, button_stack);
171+
clone_repo_async (location_entry.text, project_name_entry.text, application_id_entry.text, button_stack);
172172
});
173173
}
174174

175-
public void clone_repo_async (string destination_folder, string project_name, string aplication_id, Gtk.Stack button_stack) {
175+
public void clone_repo_async (string destination_folder, string project_name, string application_id, Gtk.Stack button_stack) {
176176
button_stack.visible_child_name = "spinner";
177177
string[] command = { "git", "-C", destination_folder, "clone", "-b", "blank", REPOSITORY_TEMPLATE_URL, project_name };
178178
GLib.Subprocess process = new GLib.Subprocess.newv (command, SubprocessFlags.STDOUT_PIPE | SubprocessFlags.STDERR_PIPE);
179179

180180
process.wait_check_async.begin (null, (obj, res) => {
181181
try {
182182
process.wait_check_async.end (res);
183-
set_project_values (destination_folder, project_name, aplication_id);
183+
set_project_values (destination_folder, project_name, application_id);
184184
} catch (Error e) {
185185
string stdout_buf;
186186
string stderr_buf;
@@ -192,31 +192,31 @@ public class Views.Form : Adw.Bin {
192192
});
193193
}
194194

195-
private void set_project_values (string destination_folder, string project_name, string aplication_id) {
195+
private void set_project_values (string destination_folder, string project_name, string application_id) {
196196
string project_folder = GLib.Path.build_filename (destination_folder, project_name);
197-
string aplication_id_schema = aplication_id.replace (".", "/");
197+
string application_id_schema = application_id.replace (".", "/");
198198

199199
// Readme File
200200
string readme_file = GLib.Path.build_filename (project_folder, "README.md");
201-
set_file_content (readme_file, "{{APPLICATION_ID}}", aplication_id);
201+
set_file_content (readme_file, "{{APPLICATION_ID}}", application_id);
202202

203203
// Meson File
204204
string meson_file = GLib.Path.build_filename (project_folder, "meson.build");
205-
set_file_content (meson_file, "{{APPLICATION_ID}}", aplication_id);
205+
set_file_content (meson_file, "{{APPLICATION_ID}}", application_id);
206206
set_file_content (meson_file, "{{PROJECT_NAME}}", project_name);
207207

208208
// Flatpak File
209209
string flatpak_file = GLib.Path.build_filename (project_folder, "{{APPLICATION_ID}}.yml");
210-
string new_flatpak_file = GLib.Path.build_filename (project_folder, aplication_id + ".yml");
210+
string new_flatpak_file = GLib.Path.build_filename (project_folder, application_id + ".yml");
211211
rename_file (flatpak_file, new_flatpak_file);
212-
set_file_content (new_flatpak_file, "{{APPLICATION_ID}}", aplication_id);
212+
set_file_content (new_flatpak_file, "{{APPLICATION_ID}}", application_id);
213213
set_file_content (new_flatpak_file, "{{PROJECT_NAME}}", project_name);
214214

215215
// AppData Files
216216
string appdata_file = GLib.Path.build_filename (project_folder, "data", "{{PROJECT_NAME}}.appdata.xml.in");
217217
string new_appdata_file = GLib.Path.build_filename (project_folder, "data", project_name + ".appdata.xml.in");
218218
rename_file (appdata_file, new_appdata_file);
219-
set_file_content (new_appdata_file, "{{APPLICATION_ID}}", aplication_id);
219+
set_file_content (new_appdata_file, "{{APPLICATION_ID}}", application_id);
220220
set_file_content (new_appdata_file, "{{PROJECT_NAME}}", project_name);
221221
set_file_content (new_appdata_file, "{{DEVELOPER_NAME}}", developer_name);
222222
set_file_content (new_appdata_file, "{{DEVELOPER_EMAIL}}", developer_email);
@@ -225,37 +225,37 @@ public class Views.Form : Adw.Bin {
225225
string desktop_file = GLib.Path.build_filename (project_folder, "data", "{{PROJECT_NAME}}.desktop.in");
226226
string new_desktop_file = GLib.Path.build_filename (project_folder, "data", project_name + ".desktop.in");
227227
rename_file (desktop_file, new_desktop_file);
228-
set_file_content (new_desktop_file, "{{APPLICATION_ID}}", aplication_id);
228+
set_file_content (new_desktop_file, "{{APPLICATION_ID}}", application_id);
229229
set_file_content (new_desktop_file, "{{PROJECT_NAME}}", project_name);
230230

231231
// Gresource Files
232232
string gresource_file = GLib.Path.build_filename (project_folder, "data", "{{PROJECT_NAME}}.gresource.xml");
233233
string new_gresource_file = GLib.Path.build_filename (project_folder, "data", project_name + ".gresource.xml");
234234
rename_file (gresource_file, new_gresource_file);
235-
set_file_content (new_gresource_file, "{{APPLICATION_ID_GSCHEMA}}", aplication_id_schema);
235+
set_file_content (new_gresource_file, "{{APPLICATION_ID_GSCHEMA}}", application_id_schema);
236236

237237
// Gschema Files
238238
string gschema_file = GLib.Path.build_filename (project_folder, "data", "{{PROJECT_NAME}}.gschema.xml");
239239
string new_gschema_file = GLib.Path.build_filename (project_folder, "data", project_name + ".gschema.xml");
240240
rename_file (gschema_file, new_gschema_file);
241-
set_file_content (new_gschema_file, "{{APPLICATION_ID_GSCHEMA}}", aplication_id_schema);
242-
set_file_content (new_gschema_file, "{{APPLICATION_ID}}", aplication_id);
241+
set_file_content (new_gschema_file, "{{APPLICATION_ID_GSCHEMA}}", application_id_schema);
242+
set_file_content (new_gschema_file, "{{APPLICATION_ID}}", application_id);
243243

244244
// data meson
245245
string data_meson_file = GLib.Path.build_filename (project_folder, "data", "meson.build");
246246
set_file_content (data_meson_file, "{{PROJECT_NAME}}", project_name);
247247

248248
// src app
249249
string src_application_file = GLib.Path.build_filename (project_folder, "src", "Application.vala");
250-
set_file_content (src_application_file, "{{APPLICATION_ID_GSCHEMA}}", aplication_id_schema);
251-
set_file_content (src_application_file, "{{APPLICATION_ID}}", aplication_id);
250+
set_file_content (src_application_file, "{{APPLICATION_ID_GSCHEMA}}", application_id_schema);
251+
set_file_content (src_application_file, "{{APPLICATION_ID}}", application_id);
252252
set_file_content (new_appdata_file, "{{DEVELOPER_NAME}}", developer_name);
253253
set_file_content (new_appdata_file, "{{DEVELOPER_EMAIL}}", developer_email);
254254

255255
// src window
256256
string src_window_file = GLib.Path.build_filename (project_folder, "src", "MainWindow.vala");
257-
set_file_content (src_window_file, "{{APPLICATION_ID_GSCHEMA}}", aplication_id_schema);
258-
set_file_content (src_window_file, "{{APPLICATION_ID}}", aplication_id);
257+
set_file_content (src_window_file, "{{APPLICATION_ID_GSCHEMA}}", application_id_schema);
258+
set_file_content (src_window_file, "{{APPLICATION_ID}}", application_id);
259259
set_file_content (new_appdata_file, "{{DEVELOPER_NAME}}", developer_name);
260260
set_file_content (new_appdata_file, "{{DEVELOPER_EMAIL}}", developer_email);
261261

@@ -265,7 +265,7 @@ public class Views.Form : Adw.Bin {
265265
public void reset_form () {
266266
project_name_entry.text = "";
267267
identifier_entry.text = "";
268-
aplication_id_entry.text = "";
268+
application_id_entry.text = "";
269269
}
270270

271271
private void set_file_content (string filename, string key, string value) {

0 commit comments

Comments
 (0)