place.sh

@@ -3,11 +3,11 @@
 cd $(dirname "${BASH_SOURCE[0]}")
 git fetch && git pull
 
+rm -r ../public
 rm -r ../templates
 
-cp dist/public/assets/css/theme-yigit-auto.css ../public/assets/css/theme-yigit-auto.css
-cp dist/public/assets/css/theme-yigit-dark.css ../public/assets/css/theme-yigit-dark.css
-cp dist/public/assets/css/theme-yigit-light.css ../public/assets/css/theme-yigit-light.css
+mkdir ../public
+cp -r dist/public/* ../public
 
 chown gitea:gitea -R ../public
 service gitea restart

src/options/locale/locale_en-US.ini

@@ -372,7 +372,7 @@ invalid_password = Your password does not match the password that was used to cr
 reset_password_helper = Recover Account
 reset_password_wrong_user = You are signed in as %s, but the account recovery link is for %s
 password_too_short = Password length cannot be less than %d characters.
-non_local_account = Non-local users cannot update their password through the yiGit web interface.
+non_local_account = Non-local users cannot update their password through the Gitea web interface.
 verify = Verify
 scratch_code = Scratch code
 use_scratch_code = Use a scratch code
@@ -677,7 +677,7 @@ new_password = New Password
 retype_new_password = Re-Type New Password
 password_incorrect = The current password is incorrect.
 change_password_success = Your password has been updated. Sign in using your new password from now on.
-password_change_disabled = Non-local users cannot update their password through the yiGit web interface.
+password_change_disabled = Non-local users cannot update their password through the Gitea web interface.
 
 emails = Email Addresses
 manage_emails = Manage Email Addresses
@@ -872,11 +872,11 @@ webauthn_delete_key = Remove Security Key
 webauthn_delete_key_desc = If you remove a security key you can no longer sign in with it. Continue?
 
 manage_account_links = Manage Linked Accounts
-manage_account_links_desc = These external accounts are linked to your yiGit account.
-account_links_not_available = There are currently no external accounts linked to your yiGit account.
+manage_account_links_desc = These external accounts are linked to your Gitea account.
+account_links_not_available = There are currently no external accounts linked to your Gitea account.
 link_account = Link Account
 remove_account_link = Remove Linked Account
-remove_account_link_desc = Removing a linked account will revoke its access to your yiGit account. Continue?
+remove_account_link_desc = Removing a linked account will revoke its access to your Gitea account. Continue?
 remove_account_link_success = The linked account has been removed.
 
 hooks.desc = Add webhooks which will be triggered for <strong>all repositories</strong> owned by this user.
@@ -1741,7 +1741,7 @@ pulls.closed_at = `closed this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a
 pulls.reopened_at = `reopened this pull request <a id="%[1]s" href="#%[1]s">%[2]s</a>`
 pulls.merge_instruction_hint = `You can also view <a class="show-instruction">command line instructions</a>.`
 pulls.merge_instruction_step1_desc = From your project repository, check out a new branch and test the changes.
-pulls.merge_instruction_step2_desc = Merge the changes and update on yiGit.
+pulls.merge_instruction_step2_desc = Merge the changes and update on Gitea.
 pulls.clear_merge_message = Clear merge message
 pulls.clear_merge_message_hint = Clearing the merge message will only remove the commit message content and keep generated git trailers such as "Co-Authored-By …".
 
@@ -2029,8 +2029,8 @@ settings.trust_model.collaborator = Collaborator
 settings.trust_model.collaborator.long = Collaborator: Trust signatures by collaborators
 settings.trust_model.collaborator.desc = Valid signatures by collaborators of this repository will be marked "trusted" - (whether they match the committer or not). Otherwise, valid signatures will be marked "untrusted" if the signature matches the committer and "unmatched" if not.
 settings.trust_model.committer = Committer
-settings.trust_model.committer.long = Committer: Trust signatures that match committers (This matches GitHub and will force yiGit signed commits to have yiGit as the committer)
-settings.trust_model.committer.desc = Valid signatures will only be marked "trusted" if they match the committer, otherwise they will be marked "unmatched". This forces yiGit to be the committer on signed commits with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default yiGit key must match a User in the database.
+settings.trust_model.committer.long = Committer: Trust signatures that match committers (This matches GitHub and will force Gitea signed commits to have Gitea as the committer)
+settings.trust_model.committer.desc = Valid signatures will only be marked "trusted" if they match the committer, otherwise they will be marked "unmatched". This forces Gitea to be the committer on signed commits with the actual committer marked as Co-authored-by: and Co-committed-by: trailer in the commit. The default Gitea key must match a User in the database.
 settings.trust_model.collaboratorcommitter = Collaborator+Committer
 settings.trust_model.collaboratorcommitter.long = Collaborator+Committer: Trust signatures by collaborators which match the committer
 settings.trust_model.collaboratorcommitter.desc = Valid signatures by collaborators of this repository will be marked "trusted" if they match the committer. Otherwise, valid signatures will be marked "untrusted" if the signature matches the committer and "unmatched" otherwise. This will force Gitea to be marked as the committer on signed commits with the actual committer marked as Co-Authored-By: and Co-Committed-By: trailer in the commit. The default Gitea key must match a User in the database.

tools/build.js

@@ -5,6 +5,7 @@ import { buildScss } from './tasks/scss.js';
 import { buildImg } from './tasks/img.js';
 import { buildTemplates } from './tasks/templates.js';
 import { Logger } from './utils/logger.js';
+import { buildFonts } from './tasks/fonts.js';
 import { optimizeCss } from './tasks/optimize-css.js';
 const srcPath = join(cwd(), 'src');
 const distPath = join(cwd(), 'dist');
@@ -15,7 +16,7 @@ function exit(err) {
     if (err) {
         console.error(err);
     } else {
-        console.log('');
+        console.log('')
         logger.info('Build completed successfully');
     }
 
@@ -35,6 +36,7 @@ async function build() {
     await Promise.all([
         buildScss(srcPath, distPath).then(() => optimizeCss(distPath)),
         buildImg(srcPath, distPath),
+        buildFonts(srcPath, distPath),
         buildTemplates(srcPath, distPath),
     ]);
 }

tools/tasks/fonts.js

@@ -0,0 +1,32 @@
+import { copyFileSync, mkdirSync } from 'fs';
+import { join } from 'path';
+import { readFiles } from '../utils/funcs.js';
+import { Logger } from '../utils/logger.js';
+
+const logger = new Logger(buildFonts.name, 'info', 'brightCyan');
+const imgSrc = 'themes/fonts';
+const imgDest = '/public/assets/fonts';
+
+export async function buildFonts(srcHome, distHome) {
+    logger.info('Fonts build has started');
+    const fontsSrcPath = join(srcHome, imgSrc);
+    const fontsDestPath = join(distHome, imgDest);
+
+    mkdirSync(fontsDestPath, { recursive: true });
+
+    const files = readFiles(fontsSrcPath, [
+        '.woff',
+        '.woff2',
+        '.ttf',
+        '.eot',
+        '.svg',
+        '.otf',
+    ]);
+
+    for (const file of files) {
+        // just copy the file
+        copyFileSync(join(fontsSrcPath, file), join(fontsDestPath, file));
+    }
+
+    logger.info('Fonts build has finished');
+}