Skip to content

Commit ddc2cca

Browse files
committed
locales: drop source line numbers from translation template
build_gettext.sh now runs xgettext with --add-location=file, so locales/po/cacti.pot records only the file name for each string, not the file:line. Line-numbered locations churn on almost every code change, which repeatedly breaks the 'Verify translation template is up to date' CI check on unrelated PRs. Filename-only locations still tell translators which file a string lives in but stay stable when surrounding lines move. Regenerated cacti.pot with the updated script; only location comments changed (no msgids added or removed).
1 parent 167ef6e commit ddc2cca

2 files changed

Lines changed: 51 additions & 52 deletions

File tree

‎locales/build_gettext.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fi
5252
echo "Updating Cacti language gettext language file..."
5353
cd ${BASE_PATH}
5454

55-
${XGETTEXT_BIN} --no-wrap --copyright-holder="The Cacti Group" --package-name="Cacti" --package-version=`cat include/cacti_version` --msgid-bugs-address="developers@cacti.net" -F -k__gettext -k__ -k__n:1,2 -k__x:1c,2 -k__xn:1c,2,3 -k__esc -k__esc_n:1,2 -k__esc_x:1c,2 -k__esc_xn:1c,2,3 -k__date -o locales/po/cacti.pot `find . -maxdepth 2 -name \*.php | sort`
55+
${XGETTEXT_BIN} --no-wrap --add-location=file --copyright-holder="The Cacti Group" --package-name="Cacti" --package-version=`cat include/cacti_version` --msgid-bugs-address="developers@cacti.net" -F -k__gettext -k__ -k__n:1,2 -k__x:1c,2 -k__xn:1c,2,3 -k__esc -k__esc_n:1,2 -k__esc_x:1c,2 -k__esc_xn:1c,2,3 -k__date -o locales/po/cacti.pot `find . -maxdepth 2 -name \*.php | sort`
5656

5757
sed -i 's/FULL NAME <EMAIL@ADDRESS\>/Howard Jones <howie@thingy.com>/g' locales/po/cacti.pot
5858
sed -i 's/LANGUAGE <LL@li.org>/Howard Jones <howie@thingy.com>/g' locales/po/cacti.pot

‎locales/po/cacti.pot‎

Lines changed: 50 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Cacti \n"
1010
"Report-Msgid-Bugs-To: developers@cacti.net\n"
11-
"POT-Creation-Date: 2026-09-27 11:16-0400\n"
11+
"POT-Creation-Date: 2026-09-28 15:38-0400\n"
1212
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1313
"Last-Translator: Howard Jones <howie@thingy.com>>\n"
1414
"Language-Team: Howard Jones <howie@thingy.com>\n"
@@ -17,202 +17,201 @@ msgstr ""
1717
"Content-Type: text/plain; charset=UTF-8\n"
1818
"Content-Transfer-Encoding: 8bit\n"
1919

20-
#: quicktree.php:37 quicktree.php:349
20+
#: quicktree.php
2121
msgid "Save To New Tree"
2222
msgstr ""
2323

24-
#: quicktree.php:38 quicktree.php:350
24+
#: quicktree.php
2525
msgid "Save To Branch"
2626
msgstr ""
2727

28-
#: quicktree.php:39
28+
#: quicktree.php
2929
msgid "Clear All Graphs"
3030
msgstr ""
3131

32-
#: quicktree.php:86
32+
#: quicktree.php
3333
msgid "Graph Added to QuickTree"
3434
msgstr ""
3535

36-
#: quicktree.php:87
36+
#: quicktree.php
3737
#, php-format
3838
msgid "Graph %s added to QuickTree. Goto the QuickTree page to move all Graphs to a new or existing Tree."
3939
msgstr ""
4040

41-
#: quicktree.php:90
41+
#: quicktree.php
4242
msgid "Graph Not Added to QuickTree"
4343
msgstr ""
4444

45-
#: quicktree.php:91
45+
#: quicktree.php
4646
#, php-format
4747
msgid "Graph %s was NOT added to QuickTree as it's already there waiting to be placed on a Tree. Goto the QuickTree page to move all Graphs to a new or existing Tree."
4848
msgstr ""
4949

50-
#: quicktree.php:95
50+
#: quicktree.php
5151
msgid "Graph Not Specified. Not added to QuickTree"
5252
msgstr ""
5353

54-
#: quicktree.php:96
54+
#: quicktree.php
5555
msgid "No Graph was added to QuickTree as no Graph was specified."
5656
msgstr ""
5757

58-
#: quicktree.php:108
58+
#: quicktree.php
5959
msgid "Click 'Continue' to Add the following Tree."
6060
msgstr ""
6161

62-
#: quicktree.php:114 quicktree.php:158
62+
#: quicktree.php
6363
msgid "Tree Name"
6464
msgstr ""
6565

66-
#: quicktree.php:117
66+
#: quicktree.php
6767
msgid "New Tree"
6868
msgstr ""
6969

70-
#: quicktree.php:123 quicktree.php:175
70+
#: quicktree.php
7171
msgid "Branch Name"
7272
msgstr ""
7373

74-
#: quicktree.php:126 quicktree.php:178 quicktree.php:335 setup.php:285
75-
#: setup.php:292 setup.php:299 setup.php:306 setup.php:313 setup.php:320
74+
#: quicktree.php setup.php
7675
msgid "QuickTree"
7776
msgstr ""
7877

79-
#: quicktree.php:134 quicktree.php:186
78+
#: quicktree.php
8079
msgid "Add To Branch"
8180
msgstr ""
8281

83-
#: quicktree.php:134 quicktree.php:186
82+
#: quicktree.php
8483
msgid "Cancel"
8584
msgstr ""
8685

87-
#: quicktree.php:134 quicktree.php:186
86+
#: quicktree.php
8887
msgid "Continue"
8988
msgstr ""
9089

91-
#: quicktree.php:150
90+
#: quicktree.php
9291
msgid "Click 'Continue' to Add the following Tree Branch."
9392
msgstr ""
9493

95-
#: quicktree.php:152
94+
#: quicktree.php
9695
msgid "Add to which Graph Tree?"
9796
msgstr ""
9897

99-
#: quicktree.php:288
98+
#: quicktree.php
10099
msgid "QuickTree has Created Tree and/or Branch and added Graphs"
101100
msgstr ""
102101

103-
#: quicktree.php:302
102+
#: quicktree.php
104103
msgid "QuickTree has no Graphs Queued"
105104
msgstr ""
106105

107-
#: quicktree.php:338
106+
#: quicktree.php
108107
msgid "Information/Directions"
109108
msgstr ""
110109

111-
#: quicktree.php:348
110+
#: quicktree.php
112111
msgid "The Graphs below are Queue to be added to a Cacti Tree. You may keep them here for as long as you like, or you can perform one of the following actions"
113112
msgstr ""
114113

115-
#: quicktree.php:349
114+
#: quicktree.php
116115
msgid "Save your selection to a new Graph Tree so you can keep them for later and work on something new."
117116
msgstr ""
118117

119-
#: quicktree.php:350
118+
#: quicktree.php
120119
msgid "Save your selection as a branch to an existing tree so that they appear in a specific section of an existing tree."
121120
msgstr ""
122121

123-
#: quicktree.php:351
122+
#: quicktree.php
124123
msgid "Clear all graphs"
125124
msgstr ""
126125

127-
#: quicktree.php:351
126+
#: quicktree.php
128127
msgid "Clear the Graphs on this page from the Graphs Queue so that you have a blank QuickTree ready for new selections"
129128
msgstr ""
130129

131-
#: quicktree.php:352
130+
#: quicktree.php
132131
msgid "You can manage the individual graphs that appear here by clicking:"
133132
msgstr ""
134133

135-
#: quicktree.php:353
134+
#: quicktree.php
136135
msgid "Add"
137136
msgstr ""
138137

139-
#: quicktree.php:353
138+
#: quicktree.php
140139
msgid "Graph View Page"
141140
msgstr ""
142141

143-
#: quicktree.php:353
142+
#: quicktree.php
144143
#, php-format
145144
msgid "This icon is next to a Graph on the %s tab."
146145
msgstr ""
147146

148-
#: quicktree.php:354
147+
#: quicktree.php
149148
msgid "Delete"
150149
msgstr ""
151150

152-
#: quicktree.php:354
151+
#: quicktree.php
153152
msgid "This icon next to the Graphs below to remove them from the QuickTree Queue."
154153
msgstr ""
155154

156-
#: quicktree.php:355
155+
#: quicktree.php
157156
msgid "Note:"
158157
msgstr ""
159158

160-
#: quicktree.php:356
159+
#: quicktree.php
161160
msgid "Adding, removing or clearing on this page does not affect any other parts of Cacti (only Creating/Saving does)"
162161
msgstr ""
163162

164-
#: quicktree.php:373
163+
#: quicktree.php
165164
msgid "Actions"
166165
msgstr ""
167166

168-
#: quicktree.php:397
167+
#: quicktree.php
169168
msgid "Remove This Graph From QuickTree"
170169
msgstr ""
171170

172-
#: quicktree.php:408
171+
#: quicktree.php
173172
msgid "No Graphs Added Yet"
174173
msgstr ""
175174

176-
#: setup.php:61
175+
#: setup.php
177176
msgid "QuickTree Management"
178177
msgstr ""
179178

180-
#: setup.php:106
179+
#: setup.php
181180
msgid "Misc"
182181
msgstr ""
183182

184-
#: setup.php:110 setup.php:191
183+
#: setup.php
185184
msgid "Quicktree"
186185
msgstr ""
187186

188-
#: setup.php:114
187+
#: setup.php
189188
msgid "Page Style"
190189
msgstr ""
191190

192-
#: setup.php:115
191+
#: setup.php
193192
msgid "Where to display the QuickTree page"
194193
msgstr ""
195194

196-
#: setup.php:118
195+
#: setup.php
197196
msgid "Tab"
198197
msgstr ""
199198

200-
#: setup.php:119
199+
#: setup.php
201200
msgid "Console Menu"
202201
msgstr ""
203202

204-
#: setup.php:120
203+
#: setup.php
205204
msgid "Both Tab and Console Menu"
206205
msgstr ""
207206

208-
#: setup.php:219
207+
#: setup.php
209208
msgid "Add this graph to QuickTree"
210209
msgstr ""
211210

212-
#: setup.php:242
211+
#: setup.php
213212
msgid "Management"
214213
msgstr ""
215214

216-
#: setup.php:242
215+
#: setup.php
217216
msgid "QuickTree Trees"
218217
msgstr ""

0 commit comments

Comments
 (0)