From 72d077dafa263a05a3e2d61ba7ca3b943d48a968 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stig-=C3=98rjan=20Smelror?= Date: Wed, 14 Feb 2024 15:10:44 +0100 Subject: [PATCH] en_US: Cleaning up array --- include/qsgen2/lang/en_US | 122 ++++++++++++++++++++------------------ include/qsgen2/lang/nb_NO | 2 +- 2 files changed, 64 insertions(+), 60 deletions(-) diff --git a/include/qsgen2/lang/en_US b/include/qsgen2/lang/en_US index 0def5b2..d1aec47 100644 --- a/include/qsgen2/lang/en_US +++ b/include/qsgen2/lang/en_US @@ -1,46 +1,48 @@ typeset -A qsgenlang qsgenlang=( -_qsgen2_msg_1 "Usage: qsgen2 add \\"Site Name\\" \\"/path/to/project\\"" _qsgen2_msg_2 "- Forced Update: Generating Everything" _qsgen2_msg_3 "* %SCRIPT_NAME% cannot parse this site. Exiting. *" _qsgen2_msg_4 "Please install Pandoc." _qsgen2_msg_5 "No valid generator found. Are you sure you\'ve selected the correct generator in \'config\'?" -_qsgen2_msg_6 "Using the ${generator} engine for files: ${file_ext}" +_qsgen2_msg_6 "Using the" +_qsgen2_msg_6.1 "-engine for files:" _qsgen2_msg_7 "- Created by kekePower - 2018-" -_qsgen2_msg_8 "- See '${1} help' for more information." +_qsgen2_msg_8 "- See" +_qsgen2_msg_8.1 "for more information." _qsgen2_msg_9 "Contents of the Config file:" -_list_pages_msg_1 "_list_pages: No Pages found with ext ${file_ext}." -_list_pages_msg_2 "_list_pages: Adding file to array: ${file}" +_list_pages_msg_1 "_list_pages: No Pages found with ext" +_list_pages_msg_2 "_list_pages: Adding file to array:" _list_blogs_msg_3 "_list_blogs: No blog files found." -_list_blogs_msg_4 "_list_blogs: Adding file to array: $file" -_blog_cache_msg_1 "_blog_cache: HASH VALUE: ${blog_cache[${name}]}" -_blog_cache_msg_2 "1. _blog_cache: ${blog_file}" -_blog_cache_msg_3 "2. _blog_cache: current_cache: ${current_hash}" -_blog_cache_msg_4 "3. _blog_cache: new_cache_file: ${blog_file}$" -_blog_cache_msg_5 "4. _blog_cache: new_current_cache: ${current_hash}" -_pages_cache_msg_1 "PAGES HASH VALUE: ${pages_cache[${name}]}" -_pages_cache_msg_2 "1. pages_cache: ${pages_cache[$file]}" -_pages_cache_msg_3 "1. _pages_cache: current_cache: ${current_hash}" -_pages_cache_msg_4 "2. _pages_cache: pages_file: ${pages_cache[$file]}" -_pages_cache_msg_5 "2. _pages_cache: current_cache: ${current_hash}" +_list_blogs_msg_4 "_list_blogs: Adding file to array:" +_blog_cache_msg_1 "_blog_cache: HASH VALUE:" +_blog_cache_msg_2 "1. _blog_cache:" +_blog_cache_msg_3 "2. _blog_cache: current_cache:" +_blog_cache_msg_4 "3. _blog_cache: new_cache_file:" +_blog_cache_msg_5 "4. _blog_cache: new_current_cache:" +_pages_cache_msg_1 "PAGES HASH VALUE:" +_pages_cache_msg_2 "1. pages_cache:" +_pages_cache_msg_3 "1. _pages_cache: current_cache:" +_pages_cache_msg_4 "2. _pages_cache: pages_file:" +_pages_cache_msg_5 "2. _pages_cache: current_cache:" _last_updated_msg_1 "_last_updated: Setting date and version in footer" -_last_updated_msg_1 "_last_updated: ${upd_msg}" -_f_last_updated_msg_1 "_f_last_updated: Setting date and version in footer of file ${1}" -_f_last_updated_msg_2 "_f_last_updated: ${upd_msg}" -_f_last_updated_msg_3 "_f_last_updated: File \'${1}\' not found." +_last_updated_msg_1 "_last_updated:" +_f_last_updated_msg_1 "_f_last_updated: Setting date and version in footer of file" +_f_last_updated_msg_2 "_f_last_updated:" +_f_last_updated_msg_3 "_f_last_updated: File" +_f_last_updated_msg_3.1 "not found." _pages_msg_1 "_pages: Running function _pages_cache" _pages_msg_2 "* You do not have any pages *" _pages_msg_3 "Generating Pages" _pages_msg_4 "_pages: pages_array is not empty" _pages_msg_5 "_pages: Setting Pages template" -_pages_msg_6 "Unable to find the Pages template: ${pages}" +_pages_msg_6 "Unable to find the Pages template:" _pages_msg_7 "_pages: Reading Pages template into pages_tpl" -_pages_msg_8 "- Generating Page: ${pages_in_array%.*}.html" -_pages_msg_9 "_pages: Loading page_content once - ${pages_in_array}" +_pages_msg_8 "- Generating Page:" +_pages_msg_9 "_pages: Loading page_content once -" _pages_msg_10 "_pages: Finding page_title" -_pages_msg_11 "_pages: ${page_title}" +_pages_msg_11 "_pages:" _pages_msg_12 "_pages: Removing #title line from page_content" -_pages_msg_13 "_pages: Running engine on ${pages_in_array}" +_pages_msg_13 "_pages: Running engine on" _pages_msg_14 "_pages: Checking for #link, #showimg and #ytvideo in page_content" _pages_msg_15 "_pages: #link is present, run _link: page_content" _pages_msg_16 "_pages: #showimg is present, run _image: page_content" @@ -50,12 +52,12 @@ _pages_msg_19 "_pages: Replacing BODY with page_content in pages_tpl" _pages_msg_20 "_pages: _last_updated in pages_tpl" _pages_msg_21 "_pages: Lowercase filnames, always" _pages_msg_22 "_pages: Running _cleanup" -_pages_msg_23 "- Parsing ${pages_in_array}" -_pages_msg_24 "- blog_in_index = ${blog_in_index}" +_pages_msg_23 "- Parsing" +_pages_msg_24 "- blog_in_index =" _pages_msg_25 "- Listing blog temp file:" _pages_msg_26 "Updating index.html with new blog posts" -_pages_msg_27 "- Parsing ${pages_in_array}" -_pages_msg_28 "- blog_in_index = ${blog_in_index}" +_pages_msg_27 "- Parsing" +_pages_msg_28 "- blog_in_index =" _pages_msg_29 "- Listing blog temp file:" _pages_msg_30 "- No new or updated Pages found" _blogs_msg_1 "_blogs: Running function _list_blogs" @@ -63,54 +65,56 @@ _blogs_msg_2 "* You do not have any blogs *" _blogs_msg_3 "Generating Blogs" _blogs_msg_4 "_blogs: Running function _blog_cache" _blogs_msg_5 "Unable to find theme template for Blogs." -_blogs_msg_6 "_blogs: Processing pre-data for ${blog}" +_blogs_msg_6 "_blogs: Processing pre-data for" _blogs_msg_7 "_blogs: Looking for DATE: Found" _blogs_msg_8 "_blogs: Looking for BLOG_TITLE: Found" -_blogs_msg_9 "* _blogs: DATE metadata missing in ${blog}." -_blogs_msg_10 "* _blogs: BLOG_TITLE metadata missing in ${blog}." -_blogs_msg_11 "_blogs: Adding data for ${blog} to array to export" -_blogs_msg_12 "_blogs: Processing ${blog}" -_blogs_msg_13 "- Generating Blog: ${blog_index}.html" -_blogs_msg_14 "_blogs: Processing substitutes in ${blog}" -_blogs_msg_15 "_blogs: Running function $engine for ${blog}" +_blogs_msg_9 "* _blogs: DATE metadata missing in" +_blogs_msg_10 "* _blogs: BLOG_TITLE metadata missing in" +_blogs_msg_11 "_blogs: Adding data for" +_blogs_msg_11.1 "to array to export" +_blogs_msg_12 "_blogs: Processing" +_blogs_msg_13 "- Generating Blog:" +_blogs_msg_14 "_blogs: Processing substitutes in" +_blogs_msg_15 "_blogs: Running function $engine for" _blogs_msg_16 "_blogs: Checking for #link, #showimg and #ytvideo in blog_content" _blogs_msg_17 "_blogs: #link is present, run _link: blog_content" _blogs_msg_18 "_blogs: #showimg is present, run _link: blog_content" _blogs_msg_19 "_blogs: #ytvideo is present, run _link: blog_content" _blogs_msg_20 "_blogs: Replacing tagline, sitename and pagetitle" -_blogs_msg_21 "_blogs: Creating directory ${www_root}${blog_dir}" -_blogs_msg_22 "_blogs: Writing blog to disk: ${www_root}${blog_url}" +_blogs_msg_21 "_blogs: Creating directory" +_blogs_msg_22 "_blogs: Writing blog to disk:" _blogs_msg_23 "_blogs: new_updated_blogs=true" _blogs_msg_24 "- No new or updated Blogs found" _blogs_msg_25 "* _blogs: Running _blog_idx_for_index" _blogs_msg_26 "* _blogs: Running _blog_index" -_blog_idx_for_index_msg_1 "- Populating ${project_dir}/blog/index.tmp.html" +_blog_idx_for_index_msg_1 "- Populating" _blog_idx_for_index_msg_2 "_blog_idx_for_index: Initiating function" -_blog_idx_for_index_msg_3 "_blog_idx_for_index: BLOG_META_STR_ARRAY: ${BLOG_META_STR_ARRAY[@]}" +_blog_idx_for_index_msg_3 "_blog_idx_for_index: BLOG_META_STR_ARRAY:" _blog_idx_for_index_msg_4 "_blog_idx_for_index: meta_str from BLOG_META_STR_ARRAY from _blogs" -_blog_idx_for_index_msg_5 "_blog_idx_for_index: ${meta_str}" +_blog_idx_for_index_msg_5 "_blog_idx_for_index:" _blog_idx_for_index_msg_6 "_blog_idx_for_index: Iterate over each component and extract information" -_blog_idx_for_index_msg_7 "_blog_idx_for_index: Running ${engine} on content to catch QStags in Ingress" -_blog_idx_for_index_msg_8 "_blog_idx_for_index: Writing _blog_idx_for_index to file: ${project_dir}/blog/index.tmp.html" -_blog_idx_for_index_msg_9 "_blog_idx_for_index: blog_list_content = ${blog_list_content}" -_blog_index_msg_1 "_blog_index: blog_in_index=${blog_in_index}" -_blog_index_msg_2 "_blog_index: new_updated_blogs=${new_updated_blogs}" +_blog_idx_for_index_msg_7 "_blog_idx_for_index: Running" +_blog_idx_for_index_msg_7.1 "on content to catch QStags in Ingress" +_blog_idx_for_index_msg_8 "_blog_idx_for_index: Writing _blog_idx_for_index to file:" +_blog_idx_for_index_msg_9 "_blog_idx_for_index: blog_list_content =" +_blog_index_msg_1 "_blog_index: blog_in_index=" +_blog_index_msg_2 "_blog_index: new_updated_blogs=" _blog_index_msg_3 "_blog_index: Running function _blog_index" -_blog_index_msg_4 "_blog_index: blog_in_index = ${blog_in_index}" -_blog_index_msg_5 "- Generating Page: ${www_root}/blog/index.html" +_blog_index_msg_4 "_blog_index: blog_in_index =" +_blog_index_msg_5 "- Generating Page:" _blog_index_msg_6 "_blog_index: Replacing sitename and tagline" -_blog_index_msg_7 "_blog_index: Replacing BODY with content of ${project_dir}/blog/index.tmp.html" -_blog_index_msg_8 "_blog_index: Writing ${www_root}/blog/index.html" -_blog_index_msg_9 "_blog_index: Content length of blog_index_content: ${#blog_index_content}" +_blog_index_msg_7 "_blog_index: Replacing BODY with content of" +_blog_index_msg_8 "_blog_index: Writing" +_blog_index_msg_9 "_blog_index: Content length of blog_index_content:" _add_blog_list_to_index_msg_1 "_add_blog_list_to_index: Inserting blog list to index.html" _sitemap_msg_1 "Generating Sitemap" -_sitemap_msg_2 "Sitemap generated at ${sitemap_file}" -_link_msg_1 "_link: URL_MAIN(line): ${line}" -_link_msg_2 "_link_ URL: ${url_dest}" -_link_msg_3 "_link: Text: ${url_txt}" -_image_msg_1 "_image: Processing line: ${line}" -_youtube_msg_1 "_youtube: Processing line: ${line}" +_sitemap_msg_2 "Sitemap generated at" +_link_msg_1 "_link: URL_MAIN(line):" +_link_msg_2 "_link_ URL:" +_link_msg_3 "_link: Text:" +_image_msg_1 "_image: Processing line:" +_youtube_msg_1 "_youtube: Processing line:" _cleanup_msg_1 "_cleanup: Cleaning up tags in content" _html_msg_1 "_html: Converting QStags in content" _zhtml_msg_1 "_zhtml: Converting QStags in content" -) +) \ No newline at end of file diff --git a/include/qsgen2/lang/nb_NO b/include/qsgen2/lang/nb_NO index 6f40842..0c4c33f 100644 --- a/include/qsgen2/lang/nb_NO +++ b/include/qsgen2/lang/nb_NO @@ -114,4 +114,4 @@ _youtube_msg_1 "_youtube: Behandler linje:" _cleanup_msg_1 "_cleanup: Renser opp i merker i innhold" _html_msg_1 "_html: Konverterer QStags i innhold" _zhtml_msg_1 "_zhtml: Konverterer QStags i innhold" -) +) \ No newline at end of file