From 071fdb26b7ccf6ab8d6e64d602f9ac66a3795213 Mon Sep 17 00:00:00 2001 From: kanon-yoneji Date: Thu, 21 May 2026 17:42:39 +0900 Subject: [PATCH 1/3] fix/statistics-report_translation --- modules/weko-admin/weko_admin/config.py | 20 +++--- .../translations/en/LC_MESSAGES/messages.mo | Bin 11715 -> 11902 bytes .../translations/en/LC_MESSAGES/messages.po | 64 ++++++++++-------- .../translations/ja/LC_MESSAGES/messages.mo | Bin 23101 -> 23119 bytes .../translations/ja/LC_MESSAGES/messages.po | 55 +++++++-------- .../weko_admin/translations/messages.pot | 50 +++++++------- modules/weko-admin/weko_admin/utils.py | 3 +- 7 files changed, 96 insertions(+), 96 deletions(-) diff --git a/modules/weko-admin/weko_admin/config.py b/modules/weko-admin/weko_admin/config.py index 32c3af4a02..8863ace702 100644 --- a/modules/weko-admin/weko_admin/config.py +++ b/modules/weko-admin/weko_admin/config.py @@ -156,9 +156,9 @@ """Types for the report""" WEKO_ADMIN_REPORT_HEADERS = { - 'file_download': _('No. Of File Downloads'), - 'file_preview': _('No. Of File Previews'), - 'billing_file_download': _('No. Of Paid File Downloads'), + 'file_download': _('Number of File Downloads'), + 'file_preview': _('Number of File Previews'), + 'billing_file_download': _('Number of Paid File Downloads'), 'index_access': _('Detail Views Per Index'), 'detail_view': _('Detail Views Count'), 'file_using_per_user': _('Usage Count By User'), @@ -170,23 +170,23 @@ """Headers for the report .csv files""" WEKO_ADMIN_REPORT_SUB_HEADERS = { - 'file_download': _('Open-Access No. Of File Downloads'), - 'file_preview': _('Open-Access No. Of File Previews'), + 'file_download': _('Number of Open-Access File Downloads'), + 'file_preview': _('Number of Open-Access File Previews'), 'site_access': _('Access Number Breakdown By Site License'), - 'billing_file_download': _('Open-Access No. Of Paid File Downloads') + 'billing_file_download': _('Number of Open-Access Paid File Downloads') } """Sub-Headers for the report .csv files""" WEKO_ADMIN_REPORT_COLS = { 'file_download': [ _('File Name'), _('Registered Index Name'), - _('No. Of Times Downloaded'), _('Non-Logged In User'), - _('Logged In User'), _('Site License'), _('Admin'), + _('No. Of Times Downloaded'), _('Non-Logged in User'), + _('Logged in User'), _('Site License'), _('Admin'), _('Registrar')], 'file_preview': [ _('File Name'), _('Registered Index Name'), - _('No. Of Times Viewed'), _('Non-Logged In User'), - _('Logged In User'), _('Site License'), _('Admin'), + _('No. Of Times Viewed'), _('Non-Logged in User'), + _('Logged in User'), _('Site License'), _('Admin'), _('Registrar')], 'index_access': [_('Index'), _('No. Of Views')], 'detail_view': [ diff --git a/modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.mo b/modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.mo index 85d1af76b579ac2777bb975d917452cf6109510a..d76ad1730800d6237405ff4748f4e2195e6b06fe 100644 GIT binary patch delta 3697 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 diff --git a/modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.po b/modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.po index a8d84ac7dd..d738795dca 100644 --- a/modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.po +++ b/modules/weko-admin/weko_admin/translations/en/LC_MESSAGES/messages.po @@ -23,26 +23,6 @@ msgstr "" msgid "deny access" msgstr "Denied access" -#: weko_admin/admin.py:291 -msgid "No. Of File Downloads" -msgstr "Number of File Downloads" - -#: weko_admin/admin.py:292 -msgid "Open-Access No. Of File Downloads" -msgstr "Number of Open-Access File Downloads" - -#: weko_admin/admin.py:294 -msgid "No. Of File Previews" -msgstr "Number of File Previews" - -#: weko_admin/admin.py:295 -msgid "Open-Access No. Of File Previews" -msgstr "Number of Open-Access File Previews" - -#: weko_admin/config.py:158 -msgid "Open-Access No. Of Paid File Downloads" -msgstr "Number of Open-Access Paid File Downloads" - #: weko_admin/admin.py:301 msgid "Aggregation Monh" msgstr "" @@ -59,14 +39,6 @@ msgstr "" msgid "No. Of Times Downloaded/Viewed" msgstr "Number of Downloads/Views" -#: weko_admin/admin.py:305 -msgid "Non-Logged In User" -msgstr "Non-Logged in User" - -#: weko_admin/admin.py:306 -msgid "Logged In User" -msgstr "Logged in User" - #: weko_admin/admin.py:306 msgid "Site License" msgstr "" @@ -111,6 +83,42 @@ msgstr "" msgid "Site License Usage Statistics Report" msgstr "" +#: weko_admin/config.py:159 +msgid "Number of File Downloads" +msgstr "Number of File Downloads" + +#: weko_admin/config.py:160 +msgid "Number of File Previews" +msgstr "Number of File Previews" + +#: weko_admin/config.py:161 +msgid "Number of Paid File Downloads" +msgstr "Number of Paid File Downloads" + +#: weko_admin/config.py:173 +msgid "Number of Open-Access File Downloads" +msgstr "Number of Open-Access File Downloads" + +#: weko_admin/config.py:174 +msgid "Number of Open-Access File Previews" +msgstr "Number of Open-Access File Previews" + +#: weko_admin/config.py:175 +msgid "Access Number Breakdown By Site License" +msgstr "Access Number Breakdown By Site License" + +#: weko_admin/config.py:176 +msgid "Number of Open-Access Paid File Downloads" +msgstr "Number of Open-Access Paid File Downloads" + +#: weko_admin/config.py:183 weko_admin/config.py:188 +msgid "Non-Logged in User" +msgstr "Non-Logged in User" + +#: weko_admin/config.py:184 weko_admin/config.py:189 +msgid "Logged in User" +msgstr "Logged in User" + #: weko_admin/config.py:195 msgid "SetSpec" msgstr "" diff --git a/modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.mo b/modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.mo index efbad6874e3db299b312ca05472315b90608fab5..644b0d22a0468466d00f8ab2bd6f947ecbfbecdc 100644 GIT binary patch delta 4672 zcmZ|Sdu&(b9mnyf+)7I+W`r7gE!(9*I27W#vALQ6pk>grhl zGctw_eu8w8ZWP8+Wf3j3=l~Z33%2 zyLlQl{~~H$7xK@Arw|)6@jfg`ah@B_#glX-;BHL9Hk4{jf)>b3HK{dtd;^ zVjOB-J}Qx7jK(FX4b`F&c?$bu2*Yu2s^{;#m5vxXj-z(?4lcy&I0Ez2oJ+)NydO8? z1K5TW@FQfZ8uoqrO#qF~89n}3_qAKC_%J54YK$UC+4#qKN9(E^!-HD(Q zd-Vtu#X2DYLC??eT935n_2F%tiVdMj>N z+l}!n(hqynpJ=9_HZmIZ?2I?da2)M=)Dg5u)_1L3=&3z~O5nFxihsmZOyh~u!#5B0 zwAUg-t{GKa|>t zI=da#zXz4*KGZXD6!q4e!+Y==MqzKZt9Agjfw8EBictwK9!LF^@d`Rr;#H^xH(-AZ zp>EiVO5hM`-W#|FPoWlC%Dbq5b*K$&Kqb_O`o1)w67I16bEtK$JwW|+W6vzVbWx~) z0n~zts08jqmFz(?4^^=e)cgw6hbf4PS7YrpW`p@8YW~w0z^$HLG@~l{dJU^k&%_q%-+@ZF1+~Lh%yv|zj-%$^L?v(sm0%Ko$k8p7tnapSp%R}#1^g5h z&^_cQ7LJ)Thokyup>|M;dg!WgFn$k*pogl+Zu~ZO;AFgwS|@vwA7=@A+Tn8RXg~#M zL@lrjm3b>FvGb_;ov1`^qUL>uG1!+?G;b)DVk$1c4XF9=qVB(hy6@^_>aPXAphG1a z#BZdIA`f-LLL7!w*58PFD?&Ejf(q1%Ic;H0me{ zJT4Sq4XP5)V>134b>jt8BA=l8`%m}hWuX$EjjGgQ)Wa4;EnH{gn^6^e!Nw1u{>$l* z^?Pkx#MAK>>V3V83j7f&fjg)K;&c6{cRXr*73!>ih?=(zRe^)ZX5BGVLU&R3_nF}* zHVSorj<4rtaiI(sq0W9Kj>L_qv)qsR(6n3oO>3V=EqEFAYj_=%(2zX8A}OfEGEx1r zQHfNbD*ZUd>HXivg)-V_ws#M3mZ$|j#QU)ewWASy{(53MD&b620=bxst5F-+iEQ3= zAphJK{81v)X8H-v#Q^KOhq=&=D^MB#1U2zxRK`cm_sv_V9YhuQ_oblb&oUR7)iz#_ zin|N>w74Uv4^S6+I;+$||7l!~3bY+luo?NKbSF`j_#E})(x=GZLBJe}W9d&q-Cu&L z&?2)6BWMRviPWLql4pyke>fL==uidrn{T5^dJ`YTduI9VM)PGb(WiO z6t%j0LRP=sE72Lji;CS0Vbgm zDYSO6wZCgFGrx~%%&SKoWfSW4JkmYR`CsBfnRcQwyN3FNeukSda=!onc+a68s#D0f z#@#~gDEndm$D|S!=LuAtO{nponnzF@yNo)TTNumw?mt}UhCz?`0g}uN>_LAvj=>!3 z52AKnhuT>K>KSQ9?XUyK;d`jKy~_RZfv7kc7{Chb{{4T93r&2=+=9w{Cl1CpFdEOJ zcK8?6{OkBS-nRCu{Mh%UeFF9V{|=SVSsad6F&2AQ`27hLoPPox6Y0>7N>K|`pcYt) z-5(5WqWvstUV5d!gR!V~E^2;}waall?M2q!ZtgaJj@saX$}Im(&(fg)pWB3roQ#jAt0W2P@#7F@g5pY#82{@SE(3Y24!N~&tAzd793 zM?(oIZEZQJOOrx<3r>el&dd*eRTv-ourNAQJ1s7Brm!KjqbND_i-PdbI|XmHO)dH= F=D(>p$!w)4X5bX)38r|wv-Ymz&)u4}r|PM6J@t@%{YyzCZ8J z`}6&NfA-G4u;1?s+xuBhFTpu?eW-Ks7@gwWKupH|n1lVW3Zt+dF)-{wemQ{k0jD>c_tW1N3L5I?u7Tn@L9`uEIXJ0dK=?*aLroV{iu!!IK!kOPGdH z{L%emQ48i^43?r2e*~3SJx1eN496{Lp1;EuI%4T~4YiZs;cPsOcjDM#&fSI6aWt;L z415vC;d{tb7kRfoKOI%kGGxfrVh(P`S@33#j`qp(^2Be(4$=3+YSxu_#(maOkuxX@F(8b`nFa|H768{SI_Cymz8yth7_kR)>%D4h`RQJRyWBpH~65Wcbz$>V?<{;jI-57;mSX^=D05!h>8Y$toQ#zE)wYIF~JX% zgeqkgssd9`uVEP~(I)F(gG#s=wZrGkR#c^4L(M;n+W7@kf-(FdH&-ZG-+5f9#QRYJ zKSBk(j7sbpj>JCq`u!77JD7rc=%!;L&cGyGjH<{6oPuqbjptG8Bv10=l%l5{K4cxW zr~r#l3#>U){eL1>!^4~F%z$$j^ggge3mg2@4}MF z)L#J_=!i!TmEm^O!mX$h9yZm`yj)a&6@T_j%}+EEEzMBV={ zRARBy{QFaVJvV_1Wmt?l``I`Im!Zyb8|p*TYVBWJ`w(iu6R2Oq)2M`c<@puqhe~W9 zs(&IXk$hAIAH@W{|0}uBj<%Yup#jbkwZNZoG@e84D2mVDZJ3Bkcpxf)bWFiHs12+` zHtpJw|J*11Q6i)B{RAgr9P7LLxX_JNsEmJtdN_7i|55Az6cr$%z~4!NnPHZqc2z*>TjF-$X4q zxyY|ju~~+yTqSCQHK?~_RT1?M=i+HPl<_w6O;kzG;ympAfZtwZ?m(6FIO>}o%?G~< zr=k*T!4dc_rs3D91c#RR|Eynt%W1z=LjASF^iqH4S!RJ*je2MvL+xxGMq;zIccK#C zgT1lK#^1+Lv_G{j#btinEvR_Up%(5$ZQvmGMeisVn($Xtz>79;9aYNka({d(YT;^BpdX^n zaycerGwNCDM8*3XYN0Er4ctI&D6Ya^Ckr_`&*gEUKtDz;(1HrkZXQORUAK)VPWJ;0 zMw z9lnj4e;NKcpBW7~`1L;Va>F;O?YJq&z0_7O` zVBikgt57>noaOIeFshx7nxAFuJmleW#n$%B4dyeb4Q|)}>F7gofDQ%tyG{5UmB^Q< zlJ%JFkEeIuNPN9dSW#z3^7OEr{Q8EvK;F{FmozM$U)$&&Tsk^XwlEOtEniXBRA2Y_ zx1Htl>uddyZ{`QD4b2ZL3TCIY2470ujM=oQ2U Rn{#^x|5?z~SzdH2_P_pHIvM}~ diff --git a/modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.po b/modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.po index f49f5db94c..342858808b 100644 --- a/modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.po +++ b/modules/weko-admin/weko_admin/translations/ja/LC_MESSAGES/messages.po @@ -267,23 +267,6 @@ msgstr "統計設定" msgid "Site License Usage Statistics Report" msgstr "サイトライセンス利用統計" -#: weko_admin/config.py:129 -msgid "No. Of File Downloads" -msgstr "ファイルダウンロード回数" - -#: weko_admin/config.py:130 -msgid "No. Of File Previews" -msgstr "ファイルプレビュー数" - -#: weko_admin/config.py:131 -msgid "No. Of Paid File Downloads" -msgstr "課金ファイルダウンロード回数" - -#: weko_admin/config.py:132 -#, fuzzy -msgid "No. Of Paid File Previews" -msgstr "ファイルプレビュー数" - #: weko_admin/config.py:133 msgid "Detail Views Per Index" msgstr "インデックス毎の詳細ビュー" @@ -313,22 +296,34 @@ msgstr "ユーザー所属情報" msgid "Access Count By Site License" msgstr "サイトライセンス別アクセス数" -#: weko_admin/config.py:144 -msgid "Open-Access No. Of File Downloads" +#: weko_admin/config.py:159 +msgid "Number of File Downloads" +msgstr "ファイルダウンロード回数" + +#: weko_admin/config.py:160 +msgid "Number of File Previews" +msgstr "ファイルプレビュー数" + +#: weko_admin/config.py:161 +msgid "Number of Paid File Downloads" +msgstr "課金ファイルダウンロード回数" + +#: weko_admin/config.py:173 +msgid "Number of Open-Access File Downloads" msgstr "オープンアクセスファイルダウンロード数" -#: weko_admin/config.py:145 -msgid "Open-Access No. Of File Previews" +#: weko_admin/config.py:174 +msgid "Number of Open-Access File Previews" msgstr "オープンアクセスファイルプレビュー数" -#: weko_admin/config.py:158 -msgid "Open-Access No. Of Paid File Downloads" -msgstr "オープンアクセス課金ファイルダウンロード数" - -#: weko_admin/config.py:146 +#: weko_admin/config.py:175 msgid "Access Number Breakdown By Site License" msgstr "サイトライセンス別アクセス数内訳" +#: weko_admin/config.py:176 +msgid "Number of Open-Access Paid File Downloads" +msgstr "オープンアクセス課金ファイルダウンロード数" + #: weko_admin/config.py:152 weko_admin/config.py:157 msgid "File Name" msgstr "ファイル名" @@ -341,12 +336,12 @@ msgstr "登録インデックス名" msgid "No. Of Times Downloaded" msgstr "ファイルダウンロード回数" -#: weko_admin/config.py:153 weko_admin/config.py:157 -msgid "Non-Logged In User" +#: weko_admin/config.py:183 weko_admin/config.py:188 +msgid "Non-Logged in User" msgstr "未ログインユーザー" -#: weko_admin/config.py:154 weko_admin/config.py:157 -msgid "Logged In User" +#: weko_admin/config.py:184 weko_admin/config.py:189 +msgid "Logged in User" msgstr "ログインユーザー" #: weko_admin/config.py:154 weko_admin/config.py:159 diff --git a/modules/weko-admin/weko_admin/translations/messages.pot b/modules/weko-admin/weko_admin/translations/messages.pot index 14aacebedc..dce41dda3f 100644 --- a/modules/weko-admin/weko_admin/translations/messages.pot +++ b/modules/weko-admin/weko_admin/translations/messages.pot @@ -280,22 +280,6 @@ msgstr "" msgid "statistics report" msgstr "" -#: weko_admin/config.py:129 -msgid "No. Of File Downloads" -msgstr "" - -#: weko_admin/config.py:130 -msgid "No. Of File Previews" -msgstr "" - -#: weko_admin/config.py:131 -msgid "No. Of Paid File Downloads" -msgstr "" - -#: weko_admin/config.py:132 -msgid "No. Of Paid File Previews" -msgstr "" - #: weko_admin/config.py:133 msgid "Detail Views Per Index" msgstr "" @@ -325,20 +309,32 @@ msgstr "" msgid "Access Count By Site License" msgstr "" -#: weko_admin/config.py:144 -msgid "Open-Access No. Of File Downloads" +#: weko_admin/config.py:159 +msgid "Number of File Downloads" msgstr "" -#: weko_admin/config.py:145 -msgid "Open-Access No. Of File Previews" +#: weko_admin/config.py:160 +msgid "Number of File Previews" msgstr "" -#: weko_admin/config.py:146 +#: weko_admin/config.py:161 +msgid "Number of Paid File Downloads" +msgstr "" + +#: weko_admin/config.py:173 +msgid "Number of Open-Access File Downloads" +msgstr "" + +#: weko_admin/config.py:174 +msgid "Number of Open-Access File Previews" +msgstr "" + +#: weko_admin/config.py:175 msgid "Access Number Breakdown By Site License" msgstr "" -#: weko_admin/config.py:158 -msgid "Open-Access No. Of Paid File Downloads" +#: weko_admin/config.py:176 +msgid "Number of Open-Access Paid File Downloads" msgstr "" #: weko_admin/config.py:152 weko_admin/config.py:157 @@ -353,12 +349,12 @@ msgstr "" msgid "No. Of Times Downloaded" msgstr "" -#: weko_admin/config.py:153 weko_admin/config.py:158 -msgid "Non-Logged In User" +#: weko_admin/config.py:183 weko_admin/config.py:188 +msgid "Non-Logged in User" msgstr "" -#: weko_admin/config.py:154 weko_admin/config.py:159 -msgid "Logged In User" +#: weko_admin/config.py:184 weko_admin/config.py:189 +msgid "Logged in User" msgstr "" #: weko_admin/config.py:154 weko_admin/config.py:159 diff --git a/modules/weko-admin/weko_admin/utils.py b/modules/weko-admin/weko_admin/utils.py index 747fd5e317..4c81462fc0 100644 --- a/modules/weko-admin/weko_admin/utils.py +++ b/modules/weko-admin/weko_admin/utils.py @@ -417,7 +417,8 @@ def package_reports( period = True if not report_date: period = False - report_date = str(year) + '-' + str(month) + dt = datetime(int(year), int(month), 1) + report_date = dt.strftime('%Y-%m') file_format = current_app.config.get('WEKO_ADMIN_OUTPUT_FORMAT', 'tsv').lower() file_name_mapping = current_app.config['WEKO_ADMIN_REPORT_FILE_NAMES'] From 94cd88b5b548d92179c56e9635db6bf37de9e12a Mon Sep 17 00:00:00 2001 From: kanon-yoneji Date: Thu, 21 May 2026 19:49:29 +0900 Subject: [PATCH 2/3] fix/statistics-report_translation_add_UT --- modules/weko-admin/tests/test_utils.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/weko-admin/tests/test_utils.py b/modules/weko-admin/tests/test_utils.py index 3b06bdd432..fb84797334 100644 --- a/modules/weko-admin/tests/test_utils.py +++ b/modules/weko-admin/tests/test_utils.py @@ -625,6 +625,11 @@ def test_package_reports(client, mocker): assert b"logReport_FileDownload_2022-10.tsv" in result.getvalue() mock_make_stats_file.assert_called_once_with("test_stats", "file_download", "2022-10", False) + with patch("weko_admin.utils.make_stats_file", return_value=mock_stream) as mock_make_stats_file: + result = package_reports(all_stats, "2022", "05") + assert b"logReport_FileDownload_2022-05.tsv" in result.getvalue() + mock_make_stats_file.assert_called_once_with("test_stats", "file_download", "2022-05", False) + with patch("weko_admin.utils.make_stats_file", return_value=mock_stream) as mock_make_stats_file: result = package_reports(all_stats, report_date="2022-10-01_2022-10-07") assert b"logReport_FileDownload_2022-10-01_2022-10-07.tsv" in result.getvalue() From b2491d7b7ec96213f3ccad1921ad6d7e2275a419 Mon Sep 17 00:00:00 2001 From: kanon-yoneji Date: Thu, 21 May 2026 20:15:23 +0900 Subject: [PATCH 3/3] remove_hiroba_workaround_creatorNames --- modules/weko-deposit/weko_deposit/api.py | 2 +- modules/weko-records/weko_records/utils.py | 9 --------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/modules/weko-deposit/weko_deposit/api.py b/modules/weko-deposit/weko_deposit/api.py index 6b016ff2ef..93f2d86328 100644 --- a/modules/weko-deposit/weko_deposit/api.py +++ b/modules/weko-deposit/weko_deposit/api.py @@ -2433,7 +2433,7 @@ def _format_creator_to_show_detail(self, language: str, parent_key: str, if lst_value[i] and lst_value[i].get(lang_key) == language: if name_key in lst_value[i]: lst.append(lst_value[i][name_key]) - #break + break def _get_creator_to_show_popup(self, creators: Union[list, dict], language: any, diff --git a/modules/weko-records/weko_records/utils.py b/modules/weko-records/weko_records/utils.py index 7b1a3e060b..9a251c1bc3 100644 --- a/modules/weko-records/weko_records/utils.py +++ b/modules/weko-records/weko_records/utils.py @@ -1464,22 +1464,13 @@ def get_title_option(solst_dict_array): def convert_array_to_dict(solst_dict_array,key): dict = {} idx = 0 - name_list = [] for item in solst_dict_array: if item.get(key): item['idx']=idx dict[item.get(key)] = item - if key == 'creatorNameLang': - name_list.append(item.get('creatorName')) - creator_names = ";".join(name_list) - dict[item.get(key)]['creatorName'] = creator_names else: item['idx']=idx dict['None'] = item - if key == 'creatorNameLang': - name_list.append(item.get('creatorName')) - creator_names = ";".join(name_list) - dict['None']['creatorName'] = creator_names idx=idx+1 return dict